Merge tag 'upstream/3.23.2'

Upstream version 3.23.2

207 files changed, 16724 insertions, 10594 deletions

diff --git a/NEWS b/NEWS
index b9cfb82..b20175c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+Overview of changes in simple-scan 3.23.2
+
+  * Add optional tags in PDF output to be more PDF/A compliant
+  * Don't use GtkHeaderBar in Cinnamon
+
 Overview of changes in simple-scan 3.22.0.1
 
   * Stop icon name in .desktop file being translated
diff --git a/config.guess b/config.guess
index 0967f2a..2e9ad7f 100755
--- a/config.guess
+++ b/config.guess
@@ -2,7 +2,7 @@
 # Attempt to guess a canonical system name.
 #   Copyright 1992-2016 Free Software Foundation, Inc.
 
-timestamp='2016-04-02'
+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
@@ -186,9 +186,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
+	# to ELF recently (or will in the future) and ABI.
 	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax)
+	    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__
@@ -997,6 +1000,9 @@ 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 ;;
@@ -1029,6 +1035,9 @@ EOF
     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 ;;
@@ -1408,18 +1417,17 @@ esac
 cat >&2 <<EOF
 $0: unable to guess system type
 
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
+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 the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
+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
 
diff --git a/config.sub b/config.sub
index 8d39c4b..dd2ca93 100755
--- a/config.sub
+++ b/config.sub
@@ -2,7 +2,7 @@
 # Configuration validation subroutine script.
 #   Copyright 1992-2016 Free Software Foundation, Inc.
 
-timestamp='2016-03-30'
+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
@@ -117,7 +117,7 @@ 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* | \
+  kopensolaris*-gnu* | cloudabi*-eabi* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -301,6 +301,7 @@ case $basic_machine in
 	| open8 | or1k | or1knd | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
+	| pru \
 	| pyramid \
 	| riscv32 | riscv64 \
 	| rl78 | rx \
@@ -428,6 +429,7 @@ case $basic_machine in
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+	| pru-* \
 	| pyramid-* \
 	| riscv32-* | riscv64-* \
 	| rl78-* | romp-* | rs6000-* | rx-* \
@@ -643,6 +645,14 @@ case $basic_machine in
 		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
@@ -1022,7 +1032,7 @@ case $basic_machine in
 	ppc-* | ppcbe-*)
 		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
+	ppcle | powerpclittle)
 		basic_machine=powerpcle-unknown
 		;;
 	ppcle-* | powerpclittle-*)
@@ -1032,7 +1042,7 @@ case $basic_machine in
 		;;
 	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+	ppc64le | powerpc64little)
 		basic_machine=powerpc64le-unknown
 		;;
 	ppc64le-* | powerpc64little-*)
@@ -1389,7 +1399,7 @@ case $os in
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* \
 	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+	      | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
 	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
@@ -1399,7 +1409,7 @@ case $os in
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
 	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
-	      | -onefs* | -tirtos*)
+	      | -onefs* | -tirtos* | -phoenix* | -fuchsia*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
diff --git a/configure b/configure
index 717d9b5..8fcfc39 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for simple-scan 3.22.0.1.
+# Generated by GNU Autoconf 2.69 for simple-scan 3.23.2.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -637,8 +637,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='simple-scan'
 PACKAGE_TARNAME='simple-scan'
-PACKAGE_VERSION='3.22.0.1'
-PACKAGE_STRING='simple-scan 3.22.0.1'
+PACKAGE_VERSION='3.23.2'
+PACKAGE_STRING='simple-scan 3.23.2'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1415,7 +1415,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures simple-scan 3.22.0.1 to adapt to many kinds of systems.
+\`configure' configures simple-scan 3.23.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1486,7 +1486,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of simple-scan 3.22.0.1:";;
+     short | recursive ) echo "Configuration of simple-scan 3.23.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1617,7 +1617,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-simple-scan configure 3.22.0.1
+simple-scan configure 3.23.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1915,7 +1915,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by simple-scan $as_me 3.22.0.1, which was
+It was created by simple-scan $as_me 3.23.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2779,7 +2779,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='simple-scan'
- VERSION='3.22.0.1'
+ VERSION='3.23.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -8374,7 +8374,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by simple-scan $as_me 3.22.0.1, which was
+This file was extended by simple-scan $as_me 3.23.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -8431,7 +8431,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-simple-scan config.status 3.22.0.1
+simple-scan config.status 3.23.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 6950507..6900f76 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(simple-scan, 3.22.0.1)
+AC_INIT(simple-scan, 3.23.2)
 AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign])
 AM_SILENT_RULES([yes])
 AM_MAINTAINER_MODE
diff --git a/help/Makefile.am b/help/Makefile.am
index 4438106..ff23a12 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -23,4 +23,4 @@ HELP_FILES = index.page \
              scanner.page \
              scanning.page
 
-HELP_LINGUAS = ar bg cs de en_GB es eu fi fr hu it ja nb nl pl pt_BR ru sk sl sr uk zh_TW
+HELP_LINGUAS = ar bg cs de en_GB es eu fi fr hr hu it ja nb nl pl pt_BR ru sk sl sr uk zh_TW
diff --git a/help/Makefile.in b/help/Makefile.in
index b1e7d81..226bc25 100644
--- a/help/Makefile.in
+++ b/help/Makefile.in
@@ -285,7 +285,7 @@ HELP_FILES = index.page \
              scanner.page \
              scanning.page
 
-HELP_LINGUAS = ar bg cs de en_GB es eu fi fr hu it ja nb nl pl pt_BR ru sk sl sr uk zh_TW
+HELP_LINGUAS = ar bg cs de en_GB es eu fi fr hr hu it ja nb nl pl pt_BR ru sk sl sr uk zh_TW
 all: all-am
 
 .SUFFIXES:
diff --git a/help/ar/ar.po b/help/ar/ar.po
index 6e9dd54..189ddfc 100644
--- a/help/ar/ar.po
+++ b/help/ar/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-05-07 04:36+0000\n"
-"X-Generator: Launchpad (build 18025)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
diff --git a/help/bg/bg.po b/help/bg/bg.po
index 26e0598..a508c47 100644
--- a/help/bg/bg.po
+++ b/help/bg/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-05-07 04:36+0000\n"
-"X-Generator: Launchpad (build 18025)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
diff --git a/help/cs/cs.po b/help/cs/cs.po
index fe60073..13d2afd 100644
--- a/help/cs/cs.po
+++ b/help/cs/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-05-07 04:36+0000\n"
-"X-Generator: Launchpad (build 18025)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
diff --git a/help/de/de.po b/help/de/de.po
index 0019e59..2016f04 100644
--- a/help/de/de.po
+++ b/help/de/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-10 05:20+0000\n"
-"X-Generator: Launchpad (build 18115)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
diff --git a/help/en_GB/en_GB.po b/help/en_GB/en_GB.po
index fb3afc8..0f0b213 100644
--- a/help/en_GB/en_GB.po
+++ b/help/en_GB/en_GB.po
@@ -9,20 +9,20 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2016-04-25 14:55+0200\n"
 "PO-Revision-Date: 2013-04-02 20:45+0000\n"
-"Last-Translator: Anthony Harrington <untaintableangel@ubuntu.com>\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-05-07 04:36+0000\n"
-"X-Generator: Launchpad (build 18025)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:53+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  Anthony Harrington https://launchpad.net/~untaintableangel"
+"  Anthony Harrington 😁 https://launchpad.net/~untaintableangel"
 
 #. (itstool) path: credit/name
 #: C/index.page:7
diff --git a/help/es/adf.page b/help/es/adf.page
index b20d27a..9e1a343 100644
--- a/help/es/adf.page
+++ b/help/es/adf.page
@@ -7,44 +7,36 @@
 
 	<title>Usar un 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>
+    <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>Use a Keyboard Shortcut</title>
+	<title>Usar un atajo de teclado</title>
 	<item>
-	  <p>Press <keyseq><key>Ctrl</key><key>F</key></keyseq></p>
+	  <p>Pulsar <keyseq><key>Ctrl</key><key>F</key></keyseq></p>
 	</item>      
       </steps>
       
       <steps>
-	<title>Use a Menu</title>
+	<title>Usar un menú</title>
 	<item>
-	  <p>Navigate to <guiseq><gui>Document</gui>
-	  <gui>Scan</gui><gui>All Pages From Feeder</gui></guiseq>.
-	  </p>
+	  <p>Navegar a <guiseq><gui>Documento</gui> <gui>Escanear</gui><gui>Todas las páginas del alimentador</gui></guiseq>.</p>
 	</item>
       </steps>
       
       <steps>
-	<title>Use the Toolbar Buttons</title>
+	<title>Usar la barra de botones</title>
 	<item>
-	  <p>Click on the arrow to the right of the "Scan" button.</p>
+	  <p>Pulsar en la flecha a la derecha del botón «Escanear».</p>
 	</item>
 	<item>
-	  <p>Choose "All Pages From Feeder".</p>
+	  <p>Elija «Todas las páginas del alimentador».</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>
+    <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>
     
diff --git a/help/es/brightness-contrast.page b/help/es/brightness-contrast.page
index 0fd63a6..08c719d 100644
--- a/help/es/brightness-contrast.page
+++ b/help/es/brightness-contrast.page
@@ -5,7 +5,7 @@
         <link type="guide" xref="index#acquire"/>
     </info>
 
-	<title>Setting brightness and Contrast</title>
+	<title>Establecer el brillo y el contraste</title>
 
     <p>
     Some scanners allow the user to adjust the brightness and contrast when scanning.
diff --git a/help/es/crop.page b/help/es/crop.page
index 776cdb4..d26f648 100644
--- a/help/es/crop.page
+++ b/help/es/crop.page
@@ -15,30 +15,28 @@
     </p>
     
     <steps>
-      <title>Use a Right Click</title>
-      <item><p>Right click anywhere on the image area and select "Crop".</p></item>
+      <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>Use a Menu</title>
+      <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>Use the Toolbar</title>
+      <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>Drag the borders of the frame to set the desired dimensions and position.</p></item>
+      <item><p>Arrastre los bordes del marco para establecer las dimensiones y posición deseadas.</p></item>
 
     </steps>
     
-    <note><p>
-    Each new scanned page will use the previous crop.
-    </p></note>
+    <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
index bc2b1a7..c1e39e8 100644
--- a/help/es/dpi.page
+++ b/help/es/dpi.page
@@ -19,32 +19,32 @@
     
     <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>
+		<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 dpi (draft)</p></td>
-		<td><p>75 dpi (draft)</p></td>
+		<td><p>75 ppp (borrador)</p></td>
+		<td><p>75 ppp (borrador)</p></td>
 	</tr>
 	<tr>
-		<td><p>150 dpi (default)</p></td>
-		<td><p>150 dpi</p></td>
+		<td><p>150 ppp (predeterminado)</p></td>
+		<td><p>150 ppp</p></td>
 	</tr>
 	<tr>
-		<td><p>300 dpi</p></td>
-		<td><p>300 dpi (default)</p></td>
+		<td><p>300 ppp</p></td>
+		<td><p>300 ppp (predeterminado)</p></td>
 	</tr>
 	<tr>
-		<td><p>600 dpi</p></td>
-		<td><p>600 dpi</p></td>
+		<td><p>600 ppp</p></td>
+		<td><p>600 ppp</p></td>
 	</tr>
 	<tr>
-		<td><p>1200 dpi (high resolution)</p></td>
-		<td><p>1200 dpi (high resolution)</p></td>
+		<td><p>1200 ppp (alta resolución)</p></td>
+		<td><p>1200 ppp (alta resolución)</p></td>
 	</tr>
 	<tr>
-		<td><p>2400 dpi</p></td>
-		<td><p>2400 dpi</p></td>
+		<td><p>2400 ppp</p></td>
+		<td><p>2400 ppp</p></td>
 	</tr>
     </table>
     
diff --git a/help/es/es.po b/help/es/es.po
index e983eeb..467a836 100644
--- a/help/es/es.po
+++ b/help/es/es.po
@@ -8,14 +8,14 @@ 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-03-25 14:09+0000\n"
-"Last-Translator: Adolfo Jayme <fitoschido@gmail.com>\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-05-07 04:36+0000\n"
-"X-Generator: Launchpad (build 18025)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:53+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -23,6 +23,7 @@ msgid "translator-credits"
 msgstr ""
 "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
@@ -33,7 +34,7 @@ msgstr "Robert Ancell"
 #. (itstool) path: credit/name
 #: C/index.page:11
 msgid "Ali Shtarbanov"
-msgstr ""
+msgstr "Ali Shtarbanov"
 
 #. (itstool) path: title/media
 #. This is a reference to an external file such as an image or video. When
@@ -45,11 +46,13 @@ 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
@@ -69,7 +72,7 @@ msgstr "Usar el documento"
 #. (itstool) path: section/title
 #: C/index.page:32
 msgid "Simple Scan Shortcuts"
-msgstr ""
+msgstr "Atajos de Simple Scan"
 
 #. (itstool) path: page/title
 #: C/adf.page:9
@@ -82,23 +85,26 @@ 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 ""
+"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:"
 
 #. (itstool) path: steps/title
 #: C/adf.page:17
 msgid "Use a Keyboard Shortcut"
-msgstr ""
+msgstr "Usar un atajo de teclado"
 
 #. (itstool) path: item/p
 #: C/adf.page:19
 msgid "Press <keyseq><key>Ctrl</key><key>F</key></keyseq>"
-msgstr ""
+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
 msgid "Use a Menu"
-msgstr ""
+msgstr "Usar un menú"
 
 #. (itstool) path: item/p
 #: C/adf.page:26
@@ -106,21 +112,23 @@ msgid ""
 "Navigate to <guiseq><gui>Document</gui> <gui>Scan</gui><gui>All Pages From "
 "Feeder</gui></guiseq>."
 msgstr ""
+"Navegar a <guiseq><gui>Documento</gui> <gui>Escanear</gui><gui>Todas las "
+"páginas del alimentador</gui></guiseq>."
 
 #. (itstool) path: steps/title
 #: C/adf.page:33
 msgid "Use the Toolbar Buttons"
-msgstr ""
+msgstr "Usar la barra de botones"
 
 #. (itstool) path: item/p
 #: C/adf.page:35
 msgid "Click on the arrow to the right of the \"Scan\" button."
-msgstr ""
+msgstr "Pulsar en la flecha a la derecha del botón «Escanear»."
 
 #. (itstool) path: item/p
 #: C/adf.page:38
 msgid "Choose \"All Pages From Feeder\"."
-msgstr ""
+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
@@ -134,6 +142,8 @@ 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
@@ -142,6 +152,9 @@ msgid ""
 "capability. You can choose single side scanning from the "
 "<guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
 msgstr ""
+"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>."
 
 #. (itstool) path: note/media
 #. (itstool) path: page/media
@@ -156,11 +169,12 @@ 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 "Establecer el brillo y el contraste"
 
 #. (itstool) path: page/p
 #: C/brightness-contrast.page:11
@@ -190,12 +204,14 @@ msgstr ""
 #. (itstool) path: steps/title
 #: C/crop.page:19
 msgid "Use a Right Click"
-msgstr ""
+msgstr "Usar un clic del botón secundario"
 
 #. (itstool) path: item/p
 #: 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/crop.page:21
@@ -225,7 +241,7 @@ msgstr ""
 #. (itstool) path: steps/title
 #: C/crop.page:34
 msgid "Use the Toolbar"
-msgstr ""
+msgstr "Usar la barra de botones"
 
 #. (itstool) path: item/p
 #: C/crop.page:35
@@ -244,11 +260,13 @@ msgstr ""
 msgid ""
 "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: note/p
 #: C/crop.page:42
 msgid "Each new scanned page will use the previous crop."
-msgstr ""
+msgstr "Cada nueva página escaneada usará el recorte previo."
 
 #. (itstool) path: page/title
 #: C/dpi.page:9
@@ -274,56 +292,56 @@ msgstr ""
 #. (itstool) path: td/p
 #: C/dpi.page:23
 msgid "<em>Text Resolution</em>"
-msgstr ""
+msgstr "<em>Resolución de texto</em>"
 
 #. (itstool) path: td/p
 #: C/dpi.page:24
 msgid "<em>Photo Resolution</em>"
-msgstr ""
+msgstr "<em>Resolución de fotos</em>"
 
 #. (itstool) path: td/p
 #: C/dpi.page:27
 #: C/dpi.page:28
 msgid "75 dpi (draft)"
-msgstr ""
+msgstr "75 ppp (borrador)"
 
 #. (itstool) path: td/p
 #: C/dpi.page:31
 msgid "150 dpi (default)"
-msgstr ""
+msgstr "150 ppp (predeterminado)"
 
 #. (itstool) path: td/p
 #: C/dpi.page:32
 msgid "150 dpi"
-msgstr ""
+msgstr "150 ppp"
 
 #. (itstool) path: td/p
 #: C/dpi.page:35
 msgid "300 dpi"
-msgstr ""
+msgstr "300 ppp"
 
 #. (itstool) path: td/p
 #: C/dpi.page:36
 msgid "300 dpi (default)"
-msgstr ""
+msgstr "300 ppp (predeterminado)"
 
 #. (itstool) path: td/p
 #: C/dpi.page:39
 #: C/dpi.page:40
 msgid "600 dpi"
-msgstr ""
+msgstr "600 ppp"
 
 #. (itstool) path: td/p
 #: C/dpi.page:43
 #: C/dpi.page:44
 msgid "1200 dpi (high resolution)"
-msgstr ""
+msgstr "1200 ppp (alta resolución)"
 
 #. (itstool) path: td/p
 #: C/dpi.page:47
 #: C/dpi.page:48
 msgid "2400 dpi"
-msgstr ""
+msgstr "2400 ppp"
 
 #. (itstool) path: note/p
 #: C/dpi.page:52
@@ -405,7 +423,7 @@ msgstr ""
 #. (itstool) path: steps/title
 #: C/print.page:17
 msgid "To Print a Document"
-msgstr ""
+msgstr "Para imprimir un documento"
 
 #. (itstool) path: item/p
 #: C/print.page:19
@@ -425,7 +443,7 @@ msgstr ""
 #. (itstool) path: page/title
 #: C/quality.page:9
 msgid "Setting the Image Quality"
-msgstr ""
+msgstr "Establecer la calidad de la imagen"
 
 #. (itstool) path: page/p
 #: C/quality.page:11
@@ -463,7 +481,7 @@ msgstr ""
 #. (itstool) path: page/title
 #: C/rotate.page:9
 msgid "Rotating a Page"
-msgstr ""
+msgstr "Rotar una página"
 
 #. (itstool) path: page/p
 #: C/rotate.page:11
@@ -484,6 +502,7 @@ msgstr ""
 #: 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
@@ -516,12 +535,12 @@ msgstr ""
 #. (itstool) path: steps/title
 #: C/rotate.page:34
 msgid "Use Shortcuts"
-msgstr ""
+msgstr "Usar atajos"
 
 #. (itstool) path: item/p
 #: C/rotate.page:36
 msgid "Press one of the following shortcut keys:"
-msgstr ""
+msgstr "Pulsar uno de los siguientes aceleradores de teclado:"
 
 #. (itstool) path: td/p
 #: C/rotate.page:39
@@ -536,22 +555,22 @@ msgstr ""
 #. (itstool) path: td/p
 #: C/rotate.page:43
 msgid "Rotate Left"
-msgstr ""
+msgstr "Rotar a la Izquierda"
 
 #. (itstool) path: td/p
 #: C/rotate.page:44
 msgid "<key>[</key> (left bracket)"
-msgstr ""
+msgstr "<key>[</key> (corchete izquierdo)"
 
 #. (itstool) path: td/p
 #: C/rotate.page:47
 msgid "Rotate Right"
-msgstr ""
+msgstr "Rotar a la Derecha"
 
 #. (itstool) path: td/p
 #: C/rotate.page:48
 msgid "<key>]</key> (right bracket)"
-msgstr ""
+msgstr "<key>]</key> (corchete derecho)"
 
 #. (itstool) path: note/p
 #: C/rotate.page:54
@@ -580,27 +599,27 @@ msgstr ""
 #. (itstool) path: item/p
 #: C/save.page:23
 msgid "Press the \"Save\" button."
-msgstr ""
+msgstr "Pulsar el botón «Guardar»."
 
 #. (itstool) path: table/title
 #: C/save.page:29
 msgid "Supported File Types"
-msgstr ""
+msgstr "Tipos de archivos soportados"
 
 #. (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>Breve descripción</em>"
 
 #. (itstool) path: td/p
 #: C/save.page:35
 msgid "PDF"
-msgstr ""
+msgstr "PDF"
 
 #. (itstool) path: td/p
 #: C/save.page:36
@@ -650,7 +669,7 @@ msgstr ""
 #. (itstool) path: td/p
 #: C/save.page:61
 msgid "TIFF"
-msgstr ""
+msgstr "TIFF"
 
 #. (itstool) path: td/p
 #: C/save.page:62
diff --git a/help/es/index.page b/help/es/index.page
index db341ca..1950447 100644
--- a/help/es/index.page
+++ b/help/es/index.page
@@ -13,7 +13,7 @@
 		<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
 	</info>
 
-	<title><media type="image" src="figures/icon.png"/> Simple Scan Manual</title>
+	<title><media type="image" src="figures/icon.png"/> Manual de Simple Scan</title>
     
     <section id="acquire" style="2column">
         <title>Escanear páginas</title>
@@ -28,6 +28,6 @@
     </section>
 
     <section id="shortcuts" style="2column">
-	<title>Simple Scan Shortcuts</title>
+	<title>Atajos de Simple Scan</title>
     </section>
 </page>
diff --git a/help/es/print.page b/help/es/print.page
index ff69c75..822efad 100644
--- a/help/es/print.page
+++ b/help/es/print.page
@@ -13,7 +13,7 @@
     Scan</app> a very convenient tool for making copies of documents or photos. 
     </p>
     <steps>
-      <title>To Print a Document</title>
+      <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>.
diff --git a/help/es/quality.page b/help/es/quality.page
index 64d9a36..00ed492 100644
--- a/help/es/quality.page
+++ b/help/es/quality.page
@@ -5,7 +5,7 @@
         <link type="guide" xref="index#use"/>
     </info>
 
-	<title>Setting the Image Quality</title>
+	<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.
diff --git a/help/es/rotate.page b/help/es/rotate.page
index b4485e0..9188ef8 100644
--- a/help/es/rotate.page
+++ b/help/es/rotate.page
@@ -5,7 +5,7 @@
         <link type="guide" xref="index#modify"/>
     </info>
   
-	<title>Rotating a Page</title>
+	<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.
@@ -14,7 +14,7 @@
     
     <steps>
       <title>Use Toolbar Buttons</title>
-      <item><p>Select the page you want to rotate by clicking on it once.</p></item>
+      <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>
@@ -24,27 +24,27 @@
     </steps>
     
     <steps>
-      <title>Use a Menu</title>
-      <item><p>Select the page you want to rotate by clicking on it once.</p></item>
+      <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>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>
+      <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>Rotate Left</p></td>
-		<td><p><key>[</key> (left bracket)</p></td>
+		<td><p>Rotar a la Izquierda</p></td>
+		<td><p><key>[</key> (corchete izquierdo)</p></td>
 	</tr>
 	<tr>
-		<td><p>Rotate Right</p></td>
-		<td><p><key>]</key> (right bracket)</p></td>
+		<td><p>Rotar a la Derecha</p></td>
+		<td><p><key>]</key> (corchete derecho)</p></td>
 	</tr>
 	</table>
       </item>
diff --git a/help/es/save.page b/help/es/save.page
index 51c8fdf..a3d3b96 100644
--- a/help/es/save.page
+++ b/help/es/save.page
@@ -19,16 +19,16 @@
 	</p>
       </item>
       <item>
-	<p>Press the "Save" button.</p>
+	<p>Pulsar el botón «Guardar».</p>
       </item>
     </steps>
     
     
 <table frame="bottom left right top" rules="rows cols" shade="rows">
-	<title>Supported File Types</title>
+	<title>Tipos de archivos soportados</title>
 	<tr>
-		<td><p><em>Type</em></p></td>
-		<td><p><em>Brief Description</em></p></td>
+		<td><p><em>Tipo</em></p></td>
+		<td><p><em>Breve descripción</em></p></td>
 	</tr>
 	<tr>
 		<td><p>PDF</p></td>
diff --git a/help/eu/eu.po b/help/eu/eu.po
index 121034f..3b9e554 100644
--- a/help/eu/eu.po
+++ b/help/eu/eu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-05-07 04:36+0000\n"
-"X-Generator: Launchpad (build 18025)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
diff --git a/help/fi/fi.po b/help/fi/fi.po
index 7af185f..2c57938 100644
--- a/help/fi/fi.po
+++ b/help/fi/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-05-07 04:36+0000\n"
-"X-Generator: Launchpad (build 18025)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
diff --git a/help/fr/fr.po b/help/fr/fr.po
index 07661ff..81b6f60 100644
--- a/help/fr/fr.po
+++ b/help/fr/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-05-24 05:40+0000\n"
-"X-Generator: Launchpad (build 18053)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
diff --git a/help/hr/adf.page b/help/hr/adf.page
new file mode 100644
index 0000000..4129f76
--- /dev/null
+++ b/help/hr/adf.page
@@ -0,0 +1,43 @@
+<?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
new file mode 100644
index 0000000..07148da
--- /dev/null
+++ b/help/hr/brightness-contrast.page
@@ -0,0 +1,11 @@
+<?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
new file mode 100644
index 0000000..e7bc434
--- /dev/null
+++ b/help/hr/crop.page
@@ -0,0 +1,39 @@
+<?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
new file mode 100644
index 0000000..c20d88b
--- /dev/null
+++ b/help/hr/dpi.page
@@ -0,0 +1,56 @@
+<?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
new file mode 100644
index 0000000..7fb6f2d
--- /dev/null
+++ b/help/hr/email.page
@@ -0,0 +1,23 @@
+<?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
new file mode 100644
index 0000000..3472ed8
--- /dev/null
+++ b/help/hr/hr.po
@@ -0,0 +1,753 @@
+# Croatian 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-04-25 14:55+0200\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-11-26 05:31+0000\n"
+"X-Generator: Launchpad (build 18282)\n"
+
+#. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
+msgctxt "_"
+msgid "translator-credits"
+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"
+msgstr "Upotreba automatskog uvlakača dokumenta"
+
+#. (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 ""
+"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:"
+
+#. (itstool) path: steps/title
+#: C/adf.page:17
+msgid "Use a Keyboard Shortcut"
+msgstr "Upotrebom prečaca tipkovnice"
+
+#. (itstool) path: item/p
+#: C/adf.page:19
+msgid "Press <keyseq><key>Ctrl</key><key>F</key></keyseq>"
+msgstr "Pritisnite <keyseq><key>Ctrl</key><key>F</key></keyseq>"
+
+#. (itstool) path: steps/title
+#: C/adf.page:24
+#: C/crop.page:27
+#: C/rotate.page:28
+msgid "Use a Menu"
+msgstr "Upotrebom izbornika"
+
+#. (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 ""
+"Idite u <guiseq><gui>Dokument</gui> <gui>Skeniraj</gui><gui>Sve stranice iz "
+"uvlakača</gui></guiseq>."
+
+#. (itstool) path: steps/title
+#: C/adf.page:33
+msgid "Use the Toolbar Buttons"
+msgstr "Upotrebom tipka alatne trake"
+
+#. (itstool) path: item/p
+#: C/adf.page:35
+msgid "Click on the arrow to the right of the \"Scan\" button."
+msgstr "Kliknite strelicu na \"Skeniraj\" tipki."
+
+#. (itstool) path: item/p
+#: C/adf.page:38
+msgid "Choose \"All Pages From Feeder\"."
+msgstr "Odaberite \"Sve stranice iz uvlakača\"."
+
+#. (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 ""
+"vanjsko 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 ""
+"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>."
+
+#. (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:49
+#: C/dpi.page:16
+#: C/scanner.page:14
+msgctxt "_"
+msgid ""
+"external ref='figures/preferences.png' md5='b9f6350ad552c954e8538596c7b42ac5'"
+msgstr ""
+"vanjsko ref='figures/preferences.png' md5='b9f6350ad552c954e8538596c7b42ac5'"
+
+#. (itstool) path: page/title
+#: C/brightness-contrast.page:9
+msgid "Setting brightness and Contrast"
+msgstr "Postavljanje svjetline i kontrasta"
+
+#. (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 ""
+"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>."
+
+#. (itstool) path: page/title
+#: C/crop.page:9
+msgid "Cropping"
+msgstr "Izrezivanje"
+
+#. (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 ""
+"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:"
+
+#. (itstool) path: steps/title
+#: C/crop.page:19
+msgid "Use a Right Click"
+msgstr "Upotrebom desnog klika"
+
+#. (itstool) path: item/p
+#: C/crop.page:20
+msgid "Right click anywhere on the image area and select \"Crop\"."
+msgstr "Desno kliknite bilo gdje na sliku i odaberite \"Izreži\"."
+
+#. (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 ""
+
+#. (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 ""
+
+#. (itstool) path: item/p
+#: C/crop.page:28
+msgid "Navigate to the <guiseq><gui>Page</gui><gui>Crop</gui></guiseq> menu."
+msgstr ""
+
+#. (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 ""
+
+#. (itstool) path: steps/title
+#: C/crop.page:34
+msgid "Use the Toolbar"
+msgstr ""
+
+#. (itstool) path: item/p
+#: C/crop.page:35
+msgid "Click the \"<gui>Crop</gui>\" button in the toolbar."
+msgstr ""
+
+#. (itstool) path: note/p
+#: C/crop.page:36
+msgid ""
+"This is the same as choosing \"Custom\" in step 2 of the aforementioned "
+"methods."
+msgstr ""
+
+#. (itstool) path: item/p
+#: C/crop.page:38
+msgid ""
+"Drag the borders of the frame to set the desired dimensions and position."
+msgstr ""
+
+#. (itstool) path: note/p
+#: C/crop.page:42
+msgid "Each new scanned page will use the previous crop."
+msgstr ""
+
+#. (itstool) path: page/title
+#: C/dpi.page:9
+msgid "Setting the Scan Resolution"
+msgstr ""
+
+#. (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 ""
+
+#. (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 ""
+
+#. (itstool) path: td/p
+#: C/dpi.page:23
+msgid "<em>Text Resolution</em>"
+msgstr ""
+
+#. (itstool) path: td/p
+#: C/dpi.page:24
+msgid "<em>Photo Resolution</em>"
+msgstr ""
+
+#. (itstool) path: td/p
+#: C/dpi.page:27
+#: C/dpi.page:28
+msgid "75 dpi (draft)"
+msgstr ""
+
+#. (itstool) path: td/p
+#: C/dpi.page:31
+msgid "150 dpi (default)"
+msgstr ""
+
+#. (itstool) path: td/p
+#: C/dpi.page:32
+msgid "150 dpi"
+msgstr ""
+
+#. (itstool) path: td/p
+#: C/dpi.page:35
+msgid "300 dpi"
+msgstr ""
+
+#. (itstool) path: td/p
+#: C/dpi.page:36
+msgid "300 dpi (default)"
+msgstr ""
+
+#. (itstool) path: td/p
+#: C/dpi.page:39
+#: C/dpi.page:40
+msgid "600 dpi"
+msgstr ""
+
+#. (itstool) path: td/p
+#: C/dpi.page:43
+#: C/dpi.page:44
+msgid "1200 dpi (high resolution)"
+msgstr ""
+
+#. (itstool) path: td/p
+#: C/dpi.page:47
+#: C/dpi.page:48
+msgid "2400 dpi"
+msgstr ""
+
+#. (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 ""
+
+#. (itstool) path: page/title
+#: C/email.page:9
+msgid "Sending via Email"
+msgstr ""
+
+#. (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 ""
+
+#. (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 ""
+
+#. (itstool) path: p/link
+#: C/legal.xml:4
+msgid "Creative Commons Attribution-Share Alike 3.0 Unported License"
+msgstr ""
+
+#. (itstool) path: license/p
+#: C/legal.xml:3
+msgid "This work is licensed under a <_:link-1/>."
+msgstr ""
+
+#. (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 ""
+
+#. (itstool) path: page/title
+#: C/print.page:9
+msgid "Printing"
+msgstr ""
+
+#. (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: steps/title
+#: C/print.page:17
+msgid "To Print a Document"
+msgstr ""
+
+#. (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: page/title
+#: C/quality.page:9
+msgid "Setting the Image Quality"
+msgstr ""
+
+#. (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 ""
+
+#. (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 ""
+
+#. (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 ""
+
+#. (itstool) path: steps/title
+#: C/rotate.page:17
+msgid "Use Toolbar Buttons"
+msgstr ""
+
+#. (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 ""
+
+#. (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 ""
+
+#. (itstool) path: steps/title
+#: C/rotate.page:22
+msgid "Use Right Click"
+msgstr ""
+
+#. (itstool) path: item/p
+#: C/rotate.page:23
+msgid "Right click on the page you want to rotate."
+msgstr ""
+
+#. (itstool) path: item/p
+#: C/rotate.page:24
+msgid "From the context menu choose \"Rotate Left\" or \"Rotate Right\"."
+msgstr ""
+
+#. (itstool) path: item/p
+#: 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 ""
+
+#. (itstool) path: item/p
+#: C/rotate.page:36
+msgid "Press one of the following shortcut keys:"
+msgstr ""
+
+#. (itstool) path: td/p
+#: C/rotate.page:39
+msgid "<em>Command</em>"
+msgstr ""
+
+#. (itstool) path: td/p
+#: C/rotate.page:40
+msgid "<em>Shortcut Key</em>"
+msgstr ""
+
+#. (itstool) path: td/p
+#: C/rotate.page:43
+msgid "Rotate Left"
+msgstr ""
+
+#. (itstool) path: td/p
+#: C/rotate.page:44
+msgid "<key>[</key> (left bracket)"
+msgstr ""
+
+#. (itstool) path: td/p
+#: C/rotate.page:47
+msgid "Rotate Right"
+msgstr ""
+
+#. (itstool) path: td/p
+#: C/rotate.page:48
+msgid "<key>]</key> (right bracket)"
+msgstr ""
+
+#. (itstool) path: note/p
+#: C/rotate.page:54
+msgid "Each new scanned page will use the previous rotation."
+msgstr ""
+
+#. (itstool) path: page/title
+#: C/save.page:9
+msgid "Saving to a File"
+msgstr ""
+
+#. (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 ""
+
+#. (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 ""
+
+#. (itstool) path: item/p
+#: C/save.page:23
+msgid "Press the \"Save\" button."
+msgstr ""
+
+#. (itstool) path: table/title
+#: C/save.page:29
+msgid "Supported File Types"
+msgstr ""
+
+#. (itstool) path: td/p
+#: C/save.page:31
+msgid "<em>Type</em>"
+msgstr ""
+
+#. (itstool) path: td/p
+#: C/save.page:32
+msgid "<em>Brief Description</em>"
+msgstr ""
+
+#. (itstool) path: td/p
+#: C/save.page:35
+msgid "PDF"
+msgstr ""
+
+#. (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 ""
+
+#. (itstool) path: td/p
+#: C/save.page:43
+msgid "JPEG"
+msgstr ""
+
+#. (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 ""
+
+#. (itstool) path: td/p
+#: C/save.page:53
+msgid "PNG"
+msgstr ""
+
+#. (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 ""
+
+#. (itstool) path: td/p
+#: C/save.page:61
+msgid "TIFF"
+msgstr ""
+
+#. (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 ""
+
+#. (itstool) path: page/title
+#: C/scanner.page:9
+msgid "Selecting a Scanner"
+msgstr ""
+
+#. (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: info/title
+#: C/scanning.page:6
+msgctxt "sort"
+msgid "0"
+msgstr ""
+
+#. (itstool) path: page/title
+#: C/scanning.page:10
+msgid "Scanning a Page"
+msgstr ""
+
+#. (itstool) path: page/p
+#: C/scanning.page:12
+msgid "To scan a document from your scanner:"
+msgstr ""
+
+#. (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 ""
+
+#. (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/p
+#: C/scanning.page:21
+msgid ""
+"Click the \"Scan\" button on the toolbar (or press "
+"<keyseq><key>Ctrl</key><key>1</key></keyseq>)."
+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."
+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."
+msgstr ""
diff --git a/help/hr/hr.stamp b/help/hr/hr.stamp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/help/hr/hr.stamp
diff --git a/help/hr/index.page b/help/hr/index.page
new file mode 100644
index 0000000..f22d349
--- /dev/null
+++ b/help/hr/index.page
@@ -0,0 +1,33 @@
+<?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
new file mode 100644
index 0000000..46a7e88
--- /dev/null
+++ b/help/hr/legal.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<license xmlns="http://projectmallard.org/1.0/" href="http://creativecommons.org/licenses/by-sa/3.0/">
+<p>This work is licensed under a
+<link href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons
+Attribution-Share Alike 3.0 Unported License</link>.</p>
+<p>As a special exception, the copyright holders give you permission to copy,
+modify, and distribute the example code contained in this document under the
+terms of your choosing, without restriction.</p>
+</license>
diff --git a/help/hr/print.page b/help/hr/print.page
new file mode 100644
index 0000000..c85ad2e
--- /dev/null
+++ b/help/hr/print.page
@@ -0,0 +1,29 @@
+<?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
new file mode 100644
index 0000000..9e8305c
--- /dev/null
+++ b/help/hr/quality.page
@@ -0,0 +1,16 @@
+<?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
new file mode 100644
index 0000000..6664996
--- /dev/null
+++ b/help/hr/reorder.page
@@ -0,0 +1,20 @@
+<?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
new file mode 100644
index 0000000..f372c24
--- /dev/null
+++ b/help/hr/rotate.page
@@ -0,0 +1,56 @@
+<?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
new file mode 100644
index 0000000..479b6eb
--- /dev/null
+++ b/help/hr/save.page
@@ -0,0 +1,69 @@
+<?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
new file mode 100644
index 0000000..d49fb9d
--- /dev/null
+++ b/help/hr/scanner.page
@@ -0,0 +1,19 @@
+<?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
new file mode 100644
index 0000000..9e3ba51
--- /dev/null
+++ b/help/hr/scanning.page
@@ -0,0 +1,34 @@
+<?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/hu.po b/help/hu/hu.po
index 8ebffdc..9732396 100644
--- a/help/hu/hu.po
+++ b/help/hu/hu.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-05-07 04:36+0000\n"
-"X-Generator: Launchpad (build 18025)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 "Language: hu\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
diff --git a/help/it/it.po b/help/it/it.po
index 49938ab..d088760 100644
--- a/help/it/it.po
+++ b/help/it/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-05-07 04:36+0000\n"
-"X-Generator: Launchpad (build 18025)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
diff --git a/help/ja/ja.po b/help/ja/ja.po
index b290838..846ae81 100644
--- a/help/ja/ja.po
+++ b/help/ja/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-05-07 04:36+0000\n"
-"X-Generator: Launchpad (build 18025)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:53+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
diff --git a/help/nb/nb.po b/help/nb/nb.po
index 885c700..4a84119 100644
--- a/help/nb/nb.po
+++ b/help/nb/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-05-07 04:36+0000\n"
-"X-Generator: Launchpad (build 18025)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:53+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
diff --git a/help/nl/nl.po b/help/nl/nl.po
index bf6eda3..1ccb188 100644
--- a/help/nl/nl.po
+++ b/help/nl/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-05-07 04:36+0000\n"
-"X-Generator: Launchpad (build 18025)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
diff --git a/help/pl/adf.page b/help/pl/adf.page
index c87826d..01a1e02 100644
--- a/help/pl/adf.page
+++ b/help/pl/adf.page
@@ -13,14 +13,14 @@
     </p>
       <steps>
 	<title/>
-	<title>Use a Keyboard Shortcut</title>
+	<title>Użyj skrótu klawiszowego</title>
 	<item>
-	  <p>Press <keyseq><key>Ctrl</key><key>F</key></keyseq></p>
+	  <p>Wciśnij <keyseq><key>Ctrl</key><key>F</key></keyseq></p>
 	</item>      
       </steps>
       
       <steps>
-	<title>Use a Menu</title>
+	<title>Użyj menu</title>
 	<item>
 	  <p>Navigate to <guiseq><gui>Document</gui>
 	  <gui>Scan</gui><gui>All Pages From Feeder</gui></guiseq>.
@@ -34,7 +34,7 @@
 	  <p>Click on the arrow to the right of the "Scan" button.</p>
 	</item>
 	<item>
-	  <p>Choose "All Pages From Feeder".</p>
+	  <p>Wybierz "Wszystkie strony z podajnika".</p>
 	  <media type="image" src="figures/scan_toolbar.png"/>
 	</item>
       </steps>
diff --git a/help/pl/crop.page b/help/pl/crop.page
index aa3a5a9..6c41246 100644
--- a/help/pl/crop.page
+++ b/help/pl/crop.page
@@ -15,7 +15,7 @@
     </p>
     
     <steps>
-      <title>Use a Right Click</title>
+      <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>
@@ -23,7 +23,7 @@
     </steps>
     
     <steps>
-      <title>Use a Menu</title>
+      <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>
diff --git a/help/pl/index.page b/help/pl/index.page
index 000f69d..14dc6ad 100644
--- a/help/pl/index.page
+++ b/help/pl/index.page
@@ -13,7 +13,7 @@
 		<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
 	</info>
 
-	<title><media type="image" src="figures/icon.png"/> Simple Scan Manual</title>
+	<title><media type="image" src="figures/icon.png"/> Podręcznik Prostego skanowania</title>
     
     <section id="acquire" style="2column">
         <title>Skanowanie stron</title>
@@ -28,6 +28,6 @@
     </section>
 
     <section id="shortcuts" style="2column">
-	<title>Simple Scan Shortcuts</title>
+	<title>Skróty Prostego skanowania</title>
     </section>
 </page>
diff --git a/help/pl/pl.po b/help/pl/pl.po
index f998306..918bbfb 100644
--- a/help/pl/pl.po
+++ b/help/pl/pl.po
@@ -8,14 +8,14 @@ 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: 2015-12-01 07:55+0000\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-05-07 04:36+0000\n"
-"X-Generator: Launchpad (build 18025)\n"
+"X-Launchpad-Export-Date: 2016-11-19 05:44+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -33,7 +33,7 @@ msgstr "Robert Ancell"
 #. (itstool) path: credit/name
 #: C/index.page:11
 msgid "Ali Shtarbanov"
-msgstr ""
+msgstr "Ali Shtarbanov"
 
 #. (itstool) path: title/media
 #. This is a reference to an external file such as an image or video. When
@@ -45,11 +45,14 @@ 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
@@ -69,7 +72,7 @@ msgstr "Używanie dokumentu"
 #. (itstool) path: section/title
 #: C/index.page:32
 msgid "Simple Scan Shortcuts"
-msgstr ""
+msgstr "Skróty Prostego skanowania"
 
 #. (itstool) path: page/title
 #: C/adf.page:9
@@ -86,19 +89,19 @@ msgstr ""
 #. (itstool) path: steps/title
 #: C/adf.page:17
 msgid "Use a Keyboard Shortcut"
-msgstr ""
+msgstr "Użyj skrótu klawiszowego"
 
 #. (itstool) path: item/p
 #: C/adf.page:19
 msgid "Press <keyseq><key>Ctrl</key><key>F</key></keyseq>"
-msgstr ""
+msgstr "Wciśnij <keyseq><key>Ctrl</key><key>F</key></keyseq>"
 
 #. (itstool) path: steps/title
 #: C/adf.page:24
 #: C/crop.page:27
 #: C/rotate.page:28
 msgid "Use a Menu"
-msgstr ""
+msgstr "Użyj menu"
 
 #. (itstool) path: item/p
 #: C/adf.page:26
@@ -120,7 +123,7 @@ msgstr ""
 #. (itstool) path: item/p
 #: C/adf.page:38
 msgid "Choose \"All Pages From Feeder\"."
-msgstr ""
+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
@@ -134,6 +137,8 @@ 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
@@ -156,6 +161,7 @@ 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
@@ -190,7 +196,7 @@ msgstr ""
 #. (itstool) path: steps/title
 #: C/crop.page:19
 msgid "Use a Right Click"
-msgstr ""
+msgstr "Użyj prawego przycisku myszy"
 
 #. (itstool) path: item/p
 #: C/crop.page:20
diff --git a/help/pl/rotate.page b/help/pl/rotate.page
index c6aa591..e96a127 100644
--- a/help/pl/rotate.page
+++ b/help/pl/rotate.page
@@ -24,7 +24,7 @@
     </steps>
     
     <steps>
-      <title>Use a Menu</title>
+      <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>
diff --git a/help/pt_BR/pt_BR.po b/help/pt_BR/pt_BR.po
index e807351..4c463bf 100644
--- a/help/pt_BR/pt_BR.po
+++ b/help/pt_BR/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-05-07 04:36+0000\n"
-"X-Generator: Launchpad (build 18025)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:53+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
diff --git a/help/ru/ru.po b/help/ru/ru.po
index 7d67e28..01ed1ce 100644
--- a/help/ru/ru.po
+++ b/help/ru/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-05-07 04:36+0000\n"
-"X-Generator: Launchpad (build 18025)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:53+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
diff --git a/help/sk/sk.po b/help/sk/sk.po
index 25264a9..6a5cf45 100644
--- a/help/sk/sk.po
+++ b/help/sk/sk.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-08-17 05:26+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:53+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
diff --git a/help/sl/sl.po b/help/sl/sl.po
index 150c341..1598119 100644
--- a/help/sl/sl.po
+++ b/help/sl/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-05-07 04:36+0000\n"
-"X-Generator: Launchpad (build 18025)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:53+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
diff --git a/help/sr/sr.po b/help/sr/sr.po
index 908fedb..b0e3276 100644
--- a/help/sr/sr.po
+++ b/help/sr/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-05-07 04:36+0000\n"
-"X-Generator: Launchpad (build 18025)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:53+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
diff --git a/help/uk/uk.po b/help/uk/uk.po
index b3cee84..a0e55d7 100644
--- a/help/uk/uk.po
+++ b/help/uk/uk.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-05-07 04:36+0000\n"
-"X-Generator: Launchpad (build 18025)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:53+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 "Language: uk\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
diff --git a/help/zh_TW/zh_TW.po b/help/zh_TW/zh_TW.po
index 4a4eaec..5c020f7 100644
--- a/help/zh_TW/zh_TW.po
+++ b/help/zh_TW/zh_TW.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-05-07 04:36+0000\n"
-"X-Generator: Launchpad (build 18025)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:53+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
diff --git a/po/af.gmo b/po/af.gmo
index aa95810..10946ad 100644
--- a/po/af.gmo
+++ b/po/af.gmo
diff --git a/po/af.po b/po/af.po
index d693dbd..076b1d5 100644
--- a/po/af.po
+++ b/po/af.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2012-09-03 08:13+0000\n"
-"Last-Translator: Dawid de Jager <dawid.dejager@gmail.com>\n"
+"Last-Translator: Dawid de Jager <Unknown>\n"
 "Language-Team: Afrikaans <af@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "Teks"
 msgid "Photo"
 msgstr "Foto"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr ""
 
@@ -207,7 +207,7 @@ msgstr "Skandeer"
 msgid "Save document to a file"
 msgstr "Stoor dokument na 'n lêer"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "Stoor"
 
@@ -248,8 +248,7 @@ msgstr "Snoei die gekose bladsy"
 msgid "Crop"
 msgstr "Insny"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "Voorkeure"
 
@@ -322,157 +321,191 @@ msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#: src/scanner.vala:841
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Geen skandeerders is beskikbaar nie. Koppel asb.'n skandeerder."
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Kan nie aan skandeerder koppel nie"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Nie in staat om te begin skandeer nie"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr ""
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr ""
 
-#: src/simple-scan.vala:24
+#. Help string for command line --debug flag
+#: ../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 ""
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Skandering het misluk"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
-#: src/simple-scan.vala:632
+#. 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
+#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr ""
 
-#: src/ui.vala:327
+#. 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 ""
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr ""
 
-#: src/ui.vala:377
+#. 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 ""
 
-#: src/ui.vala:382
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#: src/ui.vala:384
+#. Instructions to install driver software
+#: ../src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "Stoor as..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr ""
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr ""
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Geskandeerde dokument.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "Beeldlêers"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "Alle lêers"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr ""
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr ""
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr ""
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Kon nie die leêr stoor nie"
 
-#: src/ui.vala:673
+#. 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/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr ""
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr ""
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr ""
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr ""
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr ""
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr ""
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr ""
 
-#: src/ui.vala:1472
+#. 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"
@@ -488,187 +521,212 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Aangaande Simple Scan"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Arthur Rilke https://launchpad.net/~arthurrilke\n"
 "  Chris Mostert https://launchpad.net/~cvmostert\n"
-"  Dawid de Jager https://launchpad.net/~dawiddj\n"
+"  Dawid de Jager https://launchpad.net/~gggk\n"
 "  Jacques Botha https://launchpad.net/~jacquesb\n"
 "  Johann-jlconradie https://launchpad.net/~johann-jlconradie\n"
 "  Launchpad Translations Administrators https://launchpad.net/~rosetta\n"
 "  Willem van der Colff https://launchpad.net/~wilalla"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr ""
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr ""
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#: src/ui.vala:1581
+#. 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 ""
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#: src/ui.vala:1587
+#. 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 ""
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#: src/ui.vala:1598
+#. 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 ""
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#: src/ui.vala:1676
+#. 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 ""
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (verstek resolusie)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (hoë resolusie)"
 
-#: src/ui.vala:1793
+#. 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
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr ""
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr ""
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr ""
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr ""
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr ""
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr ""
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Verander _skandeerder"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr ""
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr ""
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr ""
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr ""
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr ""
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr ""
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr ""
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr ""
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/am.gmo b/po/am.gmo
index b2fde04..a8dec41 100644
--- a/po/am.gmo
+++ b/po/am.gmo
diff --git a/po/am.po b/po/am.po
index 1491e7f..6f2ddc7 100644
--- a/po/am.po
+++ b/po/am.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "ጽሁፍ"
 msgid "Photo"
 msgstr "ፎቶ"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "ገጾች መመዝገቢያ"
 
@@ -207,7 +207,7 @@ msgstr "ማሰሻ"
 msgid "Save document to a file"
 msgstr "ሰነድ ወደ ፋይል ማስቀመጫ"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "ማስቀመጫ"
 
@@ -248,8 +248,7 @@ msgstr "የተመረጠውን ገጽ መከርከሚያ"
 msgid "Crop"
 msgstr "መከርከሚያ"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "ምርጫዎች"
 
@@ -322,157 +321,191 @@ msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#: src/scanner.vala:841
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr ""
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr ""
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr ""
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "የተለቀቀውን እትም ማሳያ"
 
-#: src/simple-scan.vala:24
+#. Help string for command line --debug flag
+#: ../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 ""
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "ማሰስ አልተቻለም"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
-#: src/simple-scan.vala:632
+#. 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 --እርዳታ'  ዝግጁ የሆኑ የትእዛዝ መስመሮችን ለማየት"
 
-#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
+#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr "_መዝጊያ"
 
-#: src/ui.vala:327
+#. 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'"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "ምንም ማሰሻ አልተገኘም"
 
-#: src/ui.vala:377
+#. 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 ""
 
-#: src/ui.vala:382
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#: src/ui.vala:384
+#. Instructions to install driver software
+#: ../src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "ማስቀመጫ እንደ..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr "_መሰረዣ"
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr "_ማሰቀመጫ"
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "የምስል ፋይሎች"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "ሁሉንም ፋይሎች"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (በርካት-ገጽ ሰነድ)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (የታመቀ)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (ያልታመቀ)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "ፋይሉን ማስቀመጥ አልተቻለም"
 
-#: src/ui.vala:673
+#. 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/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "የ አሁኑን ሰነድ ላስቀምጠው?"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "ለውጦቹን ማስወገጃ"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr ""
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr ""
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr ""
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr ""
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr ""
 
-#: src/ui.vala:1472
+#. 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"
@@ -488,181 +521,206 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "ሰለ ቀላል ማሰሻ"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "የ ቀላል ሰነድ ማሰሻ መሳሪያ"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  samson https://launchpad.net/~sambelet"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr ""
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr ""
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#: src/ui.vala:1581
+#. 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 ""
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#: src/ui.vala:1587
+#. 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 ""
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#: src/ui.vala:1598
+#. 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 ""
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#: src/ui.vala:1676
+#. 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 ""
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (ነባር)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
-#: src/ui.vala:1793
+#. 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
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr "አዲስ ሰነድ"
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr "ሰነድ"
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr "ኢሜይል..."
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr "ማተሚያ..."
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr "እርዳታ"
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr "ስለ"
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr "ማጥፊያ"
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "_ማሰሻ መቀየሪያ"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "ራሱ በራሱ"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr ""
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr ""
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr "ትንሽ"
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr "ተጨማሪ"
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr "አነስተኛ"
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr ""
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr ""
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/ar.gmo b/po/ar.gmo
index b4d6cd6..d4ab913 100644
--- a/po/ar.gmo
+++ b/po/ar.gmo
diff --git a/po/ar.po b/po/ar.po
index 45cafc7..a985734 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "نص"
 msgid "Photo"
 msgstr "صورة"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr ""
 
@@ -207,7 +207,7 @@ msgstr "امسح"
 msgid "Save document to a file"
 msgstr "احفظ المستند في ملف"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "احفظ"
 
@@ -248,8 +248,7 @@ msgstr "اقتص الصفحة المحددة"
 msgid "Crop"
 msgstr "اقتصاص"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "التفضيلات"
 
@@ -322,157 +321,191 @@ msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#: src/scanner.vala:841
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "لا توجد أي ماسحات. من فضلك وصّل ماسحة."
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "تعذّر الاتصال بالماسحة"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "تعذّر بدء المسح"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "خطأ في التواصل مع الماسحة"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "اعرض رقم الإصدارة"
 
-#: src/simple-scan.vala:24
+#. Help string for command line --debug flag
+#: ../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 المولدة باستخدام إصدارات قديمة من الماسحة الضوئية"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "فشل المسح"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[جهاز...] - أداة مسح ضوئي"
 
-#: src/simple-scan.vala:632
+#. 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/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr ""
 
-#: src/ui.vala:327
+#. 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'"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "لم يُعثر على أي ماسحة"
 
-#: src/ui.vala:377
+#. 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 "يرجى التحقق من أنّ الماسحة متصلة وتعمل"
 
-#: src/ui.vala:382
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#: src/ui.vala:384
+#. Instructions to install driver software
+#: ../src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "احفظ كـ..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr ""
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr ""
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "مستند ممسوح.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "ملفات الصور"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "كل الملفات"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF‏ (مستند متعدد الصفحات)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "‏JPEG (مضغوط)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "‏PNG (غير فقود)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "فشل حفظ الملف"
 
-#: src/ui.vala:673
+#. 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/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "أأحفظ المستند الحالي؟"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "ارفض التغيرات"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "تعذّر حفظ الصورة للمعاينة"
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "تعذر فتح معاين الصور"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr ""
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr ""
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "تعذّر فتح ملف المساعدة"
 
-#: src/ui.vala:1472
+#. 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"
@@ -498,15 +531,17 @@ msgstr ""
 "من المفترض أنك تلقيت نسخة من رخصة جنو العمومية مع هذا البرنامج.\n"
 "إذا لم يحدث هذا فانظر <http://www.gnu.org/licenses/>."
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "عن \"الماسحة الضوئية\""
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "أداة بسيطة لمسح المستندات"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -522,167 +557,190 @@ msgstr ""
 "  hitham https://launchpad.net/~hitham-mil\n"
 "  rashed alhazimi https://launchpad.net/~linex"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "هل ترغب بحفظ المستند قبل الخروج؟"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "أُخرج دون حفظ"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#: src/ui.vala:1581
+#. 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 ""
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#: src/ui.vala:1587
+#. 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 ""
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#: src/ui.vala:1598
+#. 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 ""
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#: src/ui.vala:1676
+#. 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 ""
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d نقطة\\بوصة (مبدئي)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d نقطة\\بوصة (مسودة)"
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d نقطة\\بوصة (دقة عالية)"
 
-#: src/ui.vala:1793
+#. 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
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr ""
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr ""
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr ""
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr ""
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr ""
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr ""
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "غيّر _الماسحة"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "آلي"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr ""
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr ""
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr ""
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr ""
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr ""
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr ""
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr "يحفظ المستند..."
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "يحفظ الصفحة %d من أصل %d"
diff --git a/po/ast.gmo b/po/ast.gmo
index 679e9e8..286a410 100644
--- a/po/ast.gmo
+++ b/po/ast.gmo
diff --git a/po/ast.po b/po/ast.po
index 9771a1b..1b562b1 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "Testu"
 msgid "Photo"
 msgstr "Semeya"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Reordenar les páxines"
 
@@ -207,7 +207,7 @@ msgstr ""
 msgid "Save document to a file"
 msgstr ""
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr ""
 
@@ -248,8 +248,7 @@ msgstr ""
 msgid "Crop"
 msgstr ""
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "Preferencies"
 
@@ -322,159 +321,193 @@ msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#: src/scanner.vala:841
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Nun puede coneutase col escáner"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Nun puede anicase l'escáner"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Fallu de comunicación col escáner"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Amosar versión"
 
-#: src/simple-scan.vala:24
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Amosar mensaxes de depuración"
 
-#: src/simple-scan.vala:26
+#: ../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"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Falló al escanerr"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[PRESÉU...] - Utilidá d'escanéu"
 
-#: src/simple-scan.vala:632
+#. 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 ""
 "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:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr "_Zarrar"
 
-#: src/ui.vala:327
+#. 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 "Requierse nome d'usuariu y contraseña p'acceder a '%s'"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Nun se deteutó dengún escáner"
 
-#: src/ui.vala:377
+#. 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 "Por favor comprueba que l'escáner ta coneutáu y activáu"
 
-#: src/ui.vala:382
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#: src/ui.vala:384
+#. Instructions to install driver software
+#: ../src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "Guardar como..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Encaboxar"
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr "_Guardar"
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Documentu Escaneáu.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr ""
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr ""
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr ""
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr ""
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr ""
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Falló al guardar el ficheru"
 
-#: src/ui.vala:673
+#. 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/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr ""
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr ""
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Nun pudo guardase la imaxe de previsualización"
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr ""
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Combinar llaos"
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Combinar llaos (inversu)"
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr "Inversu"
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Caltener ensin cambeos"
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr ""
 
-#: src/ui.vala:1472
+#. 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"
@@ -502,15 +535,17 @@ msgstr ""
 "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/>."
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Tocante a Simple Scan"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Una cenciella ferramienta pa escanear documentos"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -519,167 +554,190 @@ msgstr ""
 "  Xuacu Saturio https://launchpad.net/~xuacusk8\n"
 "  ivarela https://launchpad.net/~ivarela"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr ""
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr ""
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#: src/ui.vala:1581
+#. 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 ""
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#: src/ui.vala:1587
+#. 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 ""
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#: src/ui.vala:1598
+#. 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 ""
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#: src/ui.vala:1676
+#. 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 ""
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
-#: src/ui.vala:1793
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: src/ui.vala:1835
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr "Documentu nuevu"
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr "Documentu"
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr "Corréu-e..."
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr "Imprentar..."
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr "Ayuda"
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr "Tocante a"
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr "Quitar"
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr ""
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr ""
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr "Más escuru"
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr "Más claru"
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr "Menos"
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr "Más"
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr "Mínimu"
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr "Máximu"
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Guardando documentu..."
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, 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
index 5dd7126..02bcf6a 100644
--- a/po/az.gmo
+++ b/po/az.gmo
diff --git a/po/az.po b/po/az.po
index dd920c7..1a41ed9 100644
--- a/po/az.po
+++ b/po/az.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "Mətn"
 msgid "Photo"
 msgstr ""
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr ""
 
@@ -207,7 +207,7 @@ msgstr ""
 msgid "Save document to a file"
 msgstr ""
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr ""
 
@@ -248,8 +248,7 @@ msgstr "Seçilmiş səhifəni kəs"
 msgid "Crop"
 msgstr "Kəs"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr ""
 
@@ -322,157 +321,191 @@ msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#: src/scanner.vala:841
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr ""
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr ""
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr ""
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr ""
 
-#: src/simple-scan.vala:24
+#. Help string for command line --debug flag
+#: ../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 ""
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr ""
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
-#: src/simple-scan.vala:632
+#. 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
+#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr ""
 
-#: src/ui.vala:327
+#. 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 ""
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr ""
 
-#: src/ui.vala:377
+#. 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 ""
 
-#: src/ui.vala:382
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#: src/ui.vala:384
+#. Instructions to install driver software
+#: ../src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr ""
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr ""
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr ""
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr ""
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr ""
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr ""
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr ""
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr ""
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr ""
 
-#: src/ui.vala:673
+#. 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/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr ""
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr ""
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr ""
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr ""
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr ""
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr ""
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr ""
 
-#: src/ui.vala:1472
+#. 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"
@@ -488,182 +521,207 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr ""
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Emin Mastizada https://launchpad.net/~emin25\n"
 "  Nicat Məmmədov https://launchpad.net/~nicat455"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr ""
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr ""
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#: src/ui.vala:1581
+#. 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 ""
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#: src/ui.vala:1587
+#. 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 ""
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#: src/ui.vala:1598
+#. 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 ""
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#: src/ui.vala:1676
+#. 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 ""
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
-#: src/ui.vala:1793
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: src/ui.vala:1835
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr ""
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr ""
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr ""
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr ""
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr ""
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr ""
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr ""
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr ""
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr ""
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr ""
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr ""
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr ""
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr ""
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr ""
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr ""
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/bg.gmo b/po/bg.gmo
index c6ead3b..3b1bca1 100644
--- a/po/bg.gmo
+++ b/po/bg.gmo
diff --git a/po/bg.po b/po/bg.po
index 4549aef..d444f83 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "Текст"
 msgid "Photo"
 msgstr "Снимка"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr ""
 
@@ -207,7 +207,7 @@ msgstr "Сканирай"
 msgid "Save document to a file"
 msgstr "Съхрани документа като файл"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "Съхрани"
 
@@ -248,8 +248,7 @@ msgstr "Изрежи избраната страница"
 msgid "Crop"
 msgstr "Изрежи"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "Настройки"
 
@@ -322,158 +321,192 @@ msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#: src/scanner.vala:841
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Няма налични скенери. Моля свържете скенер."
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Не може да се осъществи връзка със скенера"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Сканирането не може да бъде стартирано"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Грешка при комуникацията със скенера"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Покажи версията"
 
-#: src/simple-scan.vala:24
+#. Help string for command line --debug flag
+#: ../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"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Неусшно сканиране"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Инструмент за сканиране"
 
-#: src/simple-scan.vala:632
+#. 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/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr "_Затвори"
 
-#: src/ui.vala:327
+#. 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'"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Не са открити скенери"
 
-#: src/ui.vala:377
+#. 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 "Моля проверете дали скенерът ви е свързан и включен"
 
-#: src/ui.vala:382
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#: src/ui.vala:384
+#. Instructions to install driver software
+#: ../src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "Съхрани като..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Отмени"
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr "_Съхрани"
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Сканиран документ.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "Файлове с изображения"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "Всички файлове"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (документ с много страници)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (компресирани)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (без загуби на качеството)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Неусшно съхраняване на файла"
 
-#: src/ui.vala:673
+#. 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/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "Да съхраним ли текущия документ?"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Откажи промените"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Изображението не може да бъде запазено за предварителен преглед"
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Невъзможно е отварянето на приложение за преглед на изображението"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr ""
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr ""
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Помощния файл не може да бъде отворен"
 
-#: src/ui.vala:1472
+#. 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"
@@ -503,15 +536,17 @@ msgstr ""
 "заедно с тази програма. Ако това не е така, вижте "
 "<http://www.gnu.org/licenses/>."
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "За програмата"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Инструмент за опростено сканиране на документи"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -523,167 +558,190 @@ msgstr ""
 "  i.raynov https://launchpad.net/~ivaylo-raynov\n"
 "  Филип Андонов https://launchpad.net/~vonodna"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Да съхраня ли документа, преди да затворите програмата?"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Излез без запазване"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#: src/ui.vala:1581
+#. 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 ""
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#: src/ui.vala:1587
+#. 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 ""
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#: src/ui.vala:1598
+#. 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 ""
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#: src/ui.vala:1676
+#. 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 ""
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (по подразбиране)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (чернова)"
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (висока разделителна способност)"
 
-#: src/ui.vala:1793
+#. 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
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr ""
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr ""
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr ""
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr ""
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr ""
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr ""
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Смени _скенера"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "Автоматично"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr "Тъмно"
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr "Светло"
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr "Малко"
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr "Много"
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr "Минимално"
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr "Максимално"
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Съхраняване на документа..."
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Съхраняване на страница %d от %d"
diff --git a/po/bo.gmo b/po/bo.gmo
index ea48783..47ea16b 100644
--- a/po/bo.gmo
+++ b/po/bo.gmo
diff --git a/po/bo.po b/po/bo.po
index 9c353c2..74da281 100644
--- a/po/bo.po
+++ b/po/bo.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "ཡི་གེ"
 msgid "Photo"
 msgstr "པར"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr ""
 
@@ -207,7 +207,7 @@ msgstr "པར་བཤུ"
 msgid "Save document to a file"
 msgstr "ཡི་གེ་ཡིག་ཆའི་ནང་གསོག་ཉར"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "གསོག་ཉར"
 
@@ -248,8 +248,7 @@ msgstr "བདམས་ཟིན་པའི་ཤོག་ལེབ་གཅད
 msgid "Crop"
 msgstr "གཅད"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "རང་མོས་སྒྲིག་བཟོ"
 
@@ -322,157 +321,191 @@ msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#: src/scanner.vala:841
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "པར་བཤུ་ཆས་བསྒྲིགས་མི་འདུག པར་བཤུ་ཆས་ཞིག་སྒྲིགས་རོགས"
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "པར་བཤུ་ཆས་དང་སྦྲེལ་མ་ཐུབ"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "པར་བཤུ་འགོ་འཛུགས་མ་ཐུབ"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "པར་བཤུ་ཆས་དང་འབྲེལ་གཏུགས་མ་ཐུབ་པའི་ནོར་འཁྲུལ"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr ""
 
-#: src/simple-scan.vala:24
+#. Help string for command line --debug flag
+#: ../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 ""
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "པར་བཤུ་བྱེད་མ་ཐུབ་པ"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
-#: src/simple-scan.vala:632
+#. 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
+#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr ""
 
-#: src/ui.vala:327
+#. 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'མཁོ་སྤྱོད་བྱེད་པར་སྤྱོད་མཁན་མིང་དང་གསང་གྲངས་དགོས་པ"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "པར་བཤུ་ཆས་རྙེད་མ་བྱུང་"
 
-#: src/ui.vala:377
+#. 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 "ཁྱོད་ཀྱི་པར་བཤུ་ཆས་སྦྲེལ་ཡོད་པ་དང་གློག་བཏང་ཡོད་པར་དག་བཤེར་བྱེད་རོགས"
 
-#: src/ui.vala:382
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#: src/ui.vala:384
+#. Instructions to install driver software
+#: ../src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "ཉར་སྟངས་་་"
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr ""
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr ""
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "པར་བཤུས་ཡིག་ཆ.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "གཟུགས་བརྙན་ཡིག་ཆ"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "ཡིག་ཆ་ཡོངས་རྫོགས"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF(ཤོག་ལེབ་མང་པོའི་ཡིག་ཆ)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (བསྡུ་འཇུག)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (བོར་བརླག་མ་ཤོར་བ)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "ཡིག་ཆ་གསོག་འཇོག་བྱེད་མ་ཐུབ"
 
-#: src/ui.vala:673
+#. 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/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "དང་ཐོག་གི་ཡིག་ཆ་ཉར་ཚགས"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "བཟོ་བཅོས་རྣམས་འདོར་བ"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr ""
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "སྔོན་ལྟ་ཉེར་སྤྱོད་ཁ་ཕྱེ་མ་ཐུབ་པ"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr ""
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr ""
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "རོགས་འདེགས་ཡིག་ཆ་ཁ་ཕྱེ་མ་ཐུབ"
 
-#: src/ui.vala:1472
+#. 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"
@@ -500,182 +533,207 @@ msgstr ""
 "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/>."
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "པར་བཤུ་བ་དཀྱུས་མའི་སྐོར"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "ཡིག་ཆ་པར་བཤུ་ཆས་དཀྱུས་མ"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Rockworld https://launchpad.net/~rockrock2222222\n"
 "  Tennom https://launchpad.net/~tennomyathog"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "ཕྱིར་འཐེན་མ་བྱས་གོང་གསོག་འཇོག་བྱེད་པ"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "གསོག་འཇོག་མ་བྱས་པར་ཕྱིར་འཐེན"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#: src/ui.vala:1581
+#. 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 ""
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#: src/ui.vala:1587
+#. 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 ""
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#: src/ui.vala:1598
+#. 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 ""
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#: src/ui.vala:1676
+#. 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 ""
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (སྔོན་འཛུགས)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (ཟིན་བྲིས)"
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (སྤུས་ཚད་མཐོན་པོ)"
 
-#: src/ui.vala:1793
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: src/ui.vala:1835
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr ""
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr ""
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr ""
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr ""
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr ""
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr ""
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "པར་བཤུ་ཆས་བརྗེ་བ_S"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "ར་ང་འགུལ་ངང"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr ""
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr ""
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr ""
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr ""
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr ""
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr ""
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr ""
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/ca.gmo b/po/ca.gmo
index aea0692..73a4feb 100644
--- a/po/ca.gmo
+++ b/po/ca.gmo
diff --git a/po/ca.po b/po/ca.po
index 6e72abc..38d3437 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2016-06-07 16:16+0000\n"
-"Last-Translator: David Planella <david.planella@ubuntu.com>\n"
+"Last-Translator: David Planella <david.planella@gmail.com>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "Text"
 msgid "Photo"
 msgstr "Foto"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Reordena les pàgines"
 
@@ -207,7 +207,7 @@ msgstr "Escaneja"
 msgid "Save document to a file"
 msgstr "Desa el document en un fitxer"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "Desa"
 
@@ -248,8 +248,7 @@ msgstr "Escapça la pàgina seleccionada"
 msgid "Crop"
 msgstr "Escapça"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "Preferències"
 
@@ -328,160 +327,194 @@ msgstr ""
 "El Simple Scan fa servir l'entorn SANE per donar suport a la major part dels "
 "escàners existents."
 
-#: src/scanner.vala:841
+#. 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."
 
-#: src/scanner.vala:871
+#. 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"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "No s'ha pogut iniciar l'escaneig"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. 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"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Mostra la versió de llançament"
 
-#: src/simple-scan.vala:24
+#. 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
+#: ../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"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Ha fallat l'escaneig"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DISPOSITIU...] - Utilitat d'escaneig"
 
-#: src/simple-scan.vala:632
+#. 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
+#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr "_Tanca"
 
-#: src/ui.vala:327
+#. 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»"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "No s'ha detectat cap escàner"
 
-#: src/ui.vala:377
+#. 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 "Comproveu que l'escàner està connectat i engegat"
 
-#: src/ui.vala:382
+#. 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"
 
-#: src/ui.vala:384
+#. 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."
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "Anomena i desa..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Cancel·la"
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr "De_sa"
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Document escanejat.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "Fitxers d'imatge"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "Tots els fitxers"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (document multipàgina)."
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimit)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (sense pèrdua)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr "Format del fitxer:"
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "No s'ha pogut desar el fitxer"
 
-#: src/ui.vala:673
+#. 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 no ho deseu, els canvis es perdran per sempre més."
 
-#: src/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "Voleu desar el document actual?"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Descarta els canvis"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "No s'ha pogut desar la imatge per previsualitzar-la"
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "No s'ha pogut obrir l'aplicació de previsualització d'imatges"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Combina els costats"
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Combina els costats (inrevès)"
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr "Reverteix"
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Mantingues sense canvi"
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "No s'ha pogut obrir el fitxer d'ajuda"
 
-#: src/ui.vala:1472
+#. 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"
@@ -512,15 +545,17 @@ msgstr ""
 "GPL)\n"
 "juntament amb aquest programa. Si no, mireu <http://www.gnu.org/licenses/>."
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Quant a l'escaneig senzill"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Eina senzilla d'escaneig de documents"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -535,19 +570,23 @@ msgstr ""
 "  Walter Garcia-Fontes https://launchpad.net/~walter-garcia\n"
 "  pancake https://launchpad.net/~pancake"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Voleu desar el document abans de sortir?"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Surt sense desar"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "Sembla que teniu un escàner Brother"
 
-#: src/ui.vala:1581
+#. 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>."
@@ -555,11 +594,13 @@ msgstr ""
 "Hi ha controladors disponibles a la <a "
 "href=\"http://support.brother.com\">pàgina web de Brother</a>."
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "Sembla que teniu un escàner Samsung."
 
-#: src/ui.vala:1587
+#. 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>."
@@ -567,15 +608,18 @@ msgstr ""
 "Hi ha controladors disponibles a la <a "
 "href=\"http://samsung.com/support\">pàgina web de Samsung</a>."
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "Sembla que teniu un escàner HP."
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "Sembla que teniu un escàner Epson."
 
-#: src/ui.vala:1598
+#. 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>."
@@ -583,125 +627,139 @@ msgstr ""
 "Hi ha controladors disponibles a la <a "
 "href=\"http://samsung.com/support\">pàgina web d'Epson</a>."
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr "Instal·la els controladors"
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Un cop instal·lat haureu de reiniciar el Simple Scan."
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "S'estan instal·lant els controladors..."
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "La instal·lació dels controladors ha estat reeixida!"
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Ha fallat la instal·lació dels controladorse (codi d'error %d)."
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "No s'han pogut instal·lar els controladors."
 
-#: src/ui.vala:1676
+#. 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 "Heu d'instal·lar el(s) paquet(s) %s."
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (predeterminat)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (esborrany)"
 
-#: src/ui.vala:1790
+#. 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/ui.vala:1793
+#. 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
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr "Document nou"
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr "Document"
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr "Envia per correu electrònic..."
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr "Imprimeix..."
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr "Ajuda"
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr "Quant a"
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr "Surt"
 
-#: src/ui.vala:1889
+#. 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/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "_Instal·la els controladors"
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automàtic"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr "Més fosc"
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr "Més clar"
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr "Menys"
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr "Més"
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr "Mínim"
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr "Màxim"
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr "S'està desant el document..."
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "S'està desant la pàgina %d de %d"
diff --git a/po/ca@valencia.gmo b/po/ca@valencia.gmo
index 4373648..64bb08e 100644
--- a/po/ca@valencia.gmo
+++ b/po/ca@valencia.gmo
diff --git a/po/ca@valencia.po b/po/ca@valencia.po
index 59c22de..2de739f 100644
--- a/po/ca@valencia.po
+++ b/po/ca@valencia.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:46+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "Text"
 msgid "Photo"
 msgstr "Foto"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr ""
 
@@ -207,7 +207,7 @@ msgstr "Escaneja"
 msgid "Save document to a file"
 msgstr "Guarda el document en un fitxer"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "Guarda"
 
@@ -248,8 +248,7 @@ msgstr "Escapça la pàgina seleccionada"
 msgid "Crop"
 msgstr "Escapça"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "Preferències"
 
@@ -322,160 +321,194 @@ msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#: src/scanner.vala:841
+#. 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."
 
-#: src/scanner.vala:871
+#. 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"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "No s'ha pogut iniciar l'escaneig"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. 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"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Mostra la versió de llançament"
 
-#: src/simple-scan.vala:24
+#. 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
+#: ../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"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Ha fallat l'escaneig"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DISPOSITIU...] - Utilitat d'escaneig"
 
-#: src/simple-scan.vala:632
+#. 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
+#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr "_Tanca"
 
-#: src/ui.vala:327
+#. 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»"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "No s'ha detectat cap escàner"
 
-#: src/ui.vala:377
+#. 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 "Comproveu que l'escàner està connectat i engegat"
 
-#: src/ui.vala:382
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#: src/ui.vala:384
+#. Instructions to install driver software
+#: ../src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "Anomena i guarda..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Cancel·la"
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr "Al_ça"
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Document escanejat.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "Fitxers d'imatge"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "Tots els fitxers"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (document multipàgina)."
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimit)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (sense pèrdua)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "No s'ha pogut guardar el fitxer"
 
-#: src/ui.vala:673
+#. 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 no ho guardeu, els canvis es perdran per sempre més."
 
-#: src/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "Voleu guardar el document actual?"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Descarta els canvis"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "No s'ha pogut guardar la imatge per previsualitzar-la"
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "No s'ha pogut obrir l'aplicació de previsualització d'imatges"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr ""
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr ""
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "No s'ha pogut obrir el fitxer d'ajuda"
 
-#: src/ui.vala:1472
+#. 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"
@@ -506,182 +539,207 @@ msgstr ""
 "GPL)\n"
 "juntament amb este programa. Si no, mireu <http://www.gnu.org/licenses/>."
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Quant a l'escaneig senzill"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Eina senzilla d'escaneig de documents"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  David Planella https://launchpad.net/~dpm\n"
 "  Joan Duran https://launchpad.net/~jodufi"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Voleu guardar el document abans d'eixir?"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Ix sense guardar"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#: src/ui.vala:1581
+#. 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 ""
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#: src/ui.vala:1587
+#. 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 ""
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#: src/ui.vala:1598
+#. 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 ""
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#: src/ui.vala:1676
+#. 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 ""
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (predeterminat)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (esborrany)"
 
-#: src/ui.vala:1790
+#. 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/ui.vala:1793
+#. 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
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr ""
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr ""
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr ""
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr ""
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr ""
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr ""
 
-#: src/ui.vala:1889
+#. 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/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automàtic"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr "Més fosc"
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr "Més clar"
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr "Menys"
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr "Més"
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr "Mínim"
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr "Màxim"
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr "S'està guardant el document..."
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "S'està guardant la pàgina %d de %d"
diff --git a/po/ce.gmo b/po/ce.gmo
index 3cda6cd..1f1a808 100644
--- a/po/ce.gmo
+++ b/po/ce.gmo
diff --git a/po/ce.po b/po/ce.po
index aa1d33b..5a1bd5b 100644
--- a/po/ce.po
+++ b/po/ce.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr ""
 msgid "Photo"
 msgstr ""
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr ""
 
@@ -207,7 +207,7 @@ msgstr ""
 msgid "Save document to a file"
 msgstr ""
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr ""
 
@@ -248,8 +248,7 @@ msgstr ""
 msgid "Crop"
 msgstr ""
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr ""
 
@@ -322,157 +321,191 @@ msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#: src/scanner.vala:841
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr ""
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr ""
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr ""
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr ""
 
-#: src/simple-scan.vala:24
+#. Help string for command line --debug flag
+#: ../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 ""
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr ""
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
-#: src/simple-scan.vala:632
+#. 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
+#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr ""
 
-#: src/ui.vala:327
+#. 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 ""
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr ""
 
-#: src/ui.vala:377
+#. 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 ""
 
-#: src/ui.vala:382
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#: src/ui.vala:384
+#. Instructions to install driver software
+#: ../src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr ""
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr ""
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr ""
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr ""
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr ""
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr ""
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr ""
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr ""
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr ""
 
-#: src/ui.vala:673
+#. 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/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr ""
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr ""
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr ""
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr ""
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr ""
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr ""
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr ""
 
-#: src/ui.vala:1472
+#. 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"
@@ -488,179 +521,204 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr ""
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr ""
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr ""
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#: src/ui.vala:1581
+#. 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 ""
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#: src/ui.vala:1587
+#. 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 ""
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#: src/ui.vala:1598
+#. 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 ""
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#: src/ui.vala:1676
+#. 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 ""
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
-#: src/ui.vala:1793
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: src/ui.vala:1835
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr ""
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr ""
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr ""
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr ""
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr ""
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr ""
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr ""
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr ""
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr ""
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr ""
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr ""
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr ""
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr ""
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr ""
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr ""
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/cs.gmo b/po/cs.gmo
index 94d2151..1974ac4 100644
--- a/po/cs.gmo
+++ b/po/cs.gmo
diff --git a/po/cs.po b/po/cs.po
index 9021bce..bd322d8 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "Text"
 msgid "Photo"
 msgstr "Fotografie"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Přeskupit stránky"
 
@@ -207,7 +207,7 @@ msgstr "Skenovat"
 msgid "Save document to a file"
 msgstr "Uložit dokument do souboru"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "Uložit"
 
@@ -248,8 +248,7 @@ msgstr "Oříznout vybranou stránku"
 msgid "Crop"
 msgstr "Oříznout"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "Předvolby"
 
@@ -327,160 +326,194 @@ msgid ""
 msgstr ""
 "Simple Scan používá SANE framework, aby pokryl co největší množství scannerů."
 
-#: src/scanner.vala:841
+#. 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í."
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Nelze navázat spojení se skenerem"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Nelze zahájit skenování"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. 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ě"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Zobrazit verzi vydání"
 
-#: src/simple-scan.vala:24
+#. 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
+#: ../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í"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Skenování selhalo"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ZAŘÍZENÍ...] - Nástroj pro skenování"
 
-#: src/simple-scan.vala:632
+#. 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
+#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr "Z_avřít"
 
-#: src/ui.vala:327
+#. 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"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Nenalezen žádný skener"
 
-#: src/ui.vala:377
+#. 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 "Zkontrolujte prosím, že je váš skener připojen a zapnut"
 
-#: src/ui.vala:382
+#. 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"
 
-#: src/ui.vala:384
+#. 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"
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "Uložit jako..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Zrušit"
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr "_Uložit"
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Naskenovaný dokument.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "Soubory obrázků"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "Všechny soubory"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (vícestránkový dokument)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (komprimovaný)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (bezeztrátový)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr "Typ souboru:"
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Uložení souboru selhalo"
 
-#: src/ui.vala:673
+#. 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/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "Uložit stávající dokument?"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Zahodit změny"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Nezdařilo se uložit obrázek pro náhled"
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Nelze otevřít aplikaci s náhledem obrázku"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Kombinovat strany"
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Kombinovat strany (obráceně)"
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr "Obrátit"
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Zachovat beze změň"
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Nelze otevřít soubor s nápovědou"
 
-#: src/ui.vala:1472
+#. 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"
@@ -509,15 +542,17 @@ msgstr ""
 "programem.\n"
 "Pokud ne, přečtěte si ji na stránce <http://www.gnu.org/licenses/>."
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "O aplikaci Jednoduché skenování"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Jednoduchý nástroj pro skenování dokumentů"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -534,19 +569,23 @@ msgstr ""
 "  Zdeněk Kopš https://launchpad.net/~zdenekkops\n"
 "  la_serpe https://launchpad.net/~tom-mil"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Uložit dokument před ukončením?"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Ukončit bez uložení"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "Vypadá to, že máte scaner Brother"
 
-#: src/ui.vala:1581
+#. 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>."
@@ -554,11 +593,13 @@ msgstr ""
 "Ovladače jsou dostupné na <a href=\"http://support.brother.com\">webu "
 "výrobce</a>."
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "Vypadá to, že máte scaner Samsung"
 
-#: src/ui.vala:1587
+#. 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>."
@@ -566,15 +607,18 @@ msgstr ""
 "Ovladače jsou dostupné na <a href=\"http://samsung.com/support\">webu "
 "výrobce</a>."
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "Vypadá to, že máte scaner HP."
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "Vypadá to, že máte scaner Epson."
 
-#: src/ui.vala:1598
+#. 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>."
@@ -582,125 +626,139 @@ msgstr ""
 "Ovladače jsou dostupné na <a href=\"http://support.epson.com\">webu "
 "výrobce</a>."
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr "Instalace ovladačů"
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Po instlaci je potřeba restartovat Simple Scan"
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "Instalace ovladačů..."
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "Instalace ovladačů byla úspěšná!"
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Instalace ovladačů skončila chybou %d"
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "Instalace ovladačů se nezdařila."
 
-#: src/ui.vala:1676
+#. 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."
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (výchozí)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (náčrt)"
 
-#: src/ui.vala:1790
+#. 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í)"
 
-#: src/ui.vala:1793
+#. 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
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr "Nový dokument"
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr "Dokument"
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr "Email..."
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr "Tisk…"
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr "Nápověda"
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr "O aplikaci"
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr "Ukončit"
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Změnit _skener"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "_Instalovat ovladače"
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automaticky"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr "Tmavší"
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr "Světlejší"
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr "Méně"
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr "Více"
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr "Minimum"
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr "Maximum"
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Ukládání dokumentu..."
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Ukládání strany %d z %d"
diff --git a/po/da.gmo b/po/da.gmo
index b4f8b0f..d812ac1 100644
--- a/po/da.gmo
+++ b/po/da.gmo
diff --git a/po/da.po b/po/da.po
index b23c443..a1503f6 100644
--- a/po/da.po
+++ b/po/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "Tekst"
 msgid "Photo"
 msgstr "Billede"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Sortér sider påny"
 
@@ -207,7 +207,7 @@ msgstr "Skan"
 msgid "Save document to a file"
 msgstr "Gem dokument som en fil"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "Gem"
 
@@ -248,8 +248,7 @@ msgstr "Beskær den markerede side"
 msgid "Crop"
 msgstr "Beskær"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "Indstillinger"
 
@@ -328,159 +327,193 @@ msgstr ""
 "Simpel skanning bruger SANE-rammeværket for at understøtte flest mulige "
 "skannere."
 
-#: src/scanner.vala:841
+#. 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."
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Kunne ikke forbinde til sḱanner"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Kunne ikke starte skanning"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. 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."
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Vis versionsnummer"
 
-#: src/simple-scan.vala:24
+#. 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
+#: ../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"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Skanning mislykkedes"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ENHED...] - Skanningsredskab"
 
-#: src/simple-scan.vala:632
+#. 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
+#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr "_Luk"
 
-#: src/ui.vala:327
+#. 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\""
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Ingen skannere fundet"
 
-#: src/ui.vala:377
+#. 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 "Kontrollér venligst at skanneren er tændt og sluttet til"
 
-#: src/ui.vala:382
+#. 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"
 
-#: src/ui.vala:384
+#. 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."
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "Gem som..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Annullér"
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr "_Gem"
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Skannet dokument.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "Billedfiler"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "Alle filer"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (flersidet dokument)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (komprimeret)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (tabsfri)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr "Filformat:"
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Kunne ikke gemme fil"
 
-#: src/ui.vala:673
+#. 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/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "Gem nuværende dokument?"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Kassér ændringer"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Kan ikke gemme billede for forhåndsvisning"
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Kunne ikke åbne programmet til forhåndsvisning af billeder"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Kombinér sider"
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Kombinér sider (omvendt)"
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr "Omvendt"
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Bevar uændret"
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Kan ikke åbne hjælpefil"
 
-#: src/ui.vala:1472
+#. 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"
@@ -508,15 +541,17 @@ msgstr ""
 "Du burde have modtaget en kopi af GNU General Public License\n"
 "sammen med dette program. Hvis ikke, se <http://www.gnu.org/licenses/>."
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Om Simpel skanning"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Simpelt dokumentskanningsværktøj"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -532,19 +567,23 @@ msgstr ""
 "  TLE https://launchpad.net/~k-nielsen81\n"
 "  Torben Gundtofte-Bruun https://launchpad.net/~torbengb"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Gem dokumentet før der afsluttes?"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Afslut uden at gemme"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "Du ser ud til at have en Brother skanner."
 
-#: src/ui.vala:1581
+#. 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>."
@@ -552,11 +591,13 @@ msgstr ""
 "Der er drivere er tilgængelige til denne på <a "
 "href=\"http://support.brother.com\">Brothers webside</a>."
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "Du ser ud til at have en Samsung-skanner."
 
-#: src/ui.vala:1587
+#. 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>."
@@ -564,139 +605,158 @@ msgstr ""
 "Drivere til dette er tilgængelige på <a "
 "href=\"http://samsung.com/support\">Samsungs hjemmeside</a>."
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "Du ser ud til at have en HP-skanner"
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "Du ser ud til at have en Epson-skanner"
 
-#: src/ui.vala:1598
+#. 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 ""
+"Drivere for denne fås på <a href=\"http://support.epson.com\">Epsons "
+"hjemmeside</a>."
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr "Installér drivere"
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Når de er installeret, så skal du genstarte Simpel skanning."
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "Installerer drivere..."
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "Driver installeret korrekt!"
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Installation af drivere mislykkedes (fejlkode %d)."
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "Installation af drivere mislykkedes."
 
-#: src/ui.vala:1676
+#. 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 "Det er nødvendigt at installere pakken eller pakkerne %s."
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (standard)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (udkast)"
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (høj opløsning)"
 
-#: src/ui.vala:1793
+#. 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
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr "Nyt dokument"
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr "Dokument"
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr "E-post..."
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr "Udskriv..."
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr "Hjælp"
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr "Om"
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr "Afslut"
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Skift _skanner"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "_Installér drivere"
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr "Mørkere"
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr "Lysere"
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr "Mindre"
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr "Mere"
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr "Minimum"
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr "Maksimum"
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Gemmer dokument ..."
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Gemmer side %d ud af %d"
diff --git a/po/de.gmo b/po/de.gmo
index d89ab67..a62ff6c 100644
--- a/po/de.gmo
+++ b/po/de.gmo
diff --git a/po/de.po b/po/de.po
index 1028e67..fa761b8 100644
--- a/po/de.po
+++ b/po/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "Text"
 msgid "Photo"
 msgstr "Foto"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Seiten umsortieren"
 
@@ -207,7 +207,7 @@ msgstr "Scannen"
 msgid "Save document to a file"
 msgstr "Als Datei speichern"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "Speichern"
 
@@ -248,8 +248,7 @@ msgstr "Die gewählte Seite zurechtschneiden"
 msgid "Crop"
 msgstr "Zuschneiden"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "Einstellungen"
 
@@ -329,164 +328,198 @@ msgstr ""
 "Simple Scan verwendet das SANE-Programmiergerüst für die Unterstützung der "
 "meisten verfügbaren Scanner."
 
-#: src/scanner.vala:841
+#. 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."
 
-#: src/scanner.vala:871
+#. 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"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Scanvorgang konnte nicht gestartet werden"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. 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"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Versionsinformation anzeigen"
 
-#: src/simple-scan.vala:24
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Fehlerdiagnosemeldungen anzeigen"
 
-#: src/simple-scan.vala:26
+#: ../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"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Scannen fehlgeschlagen"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[GERÄT …] - Scan-Werkzeug"
 
-#: src/simple-scan.vala:632
+#. 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/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr "S_chließen"
 
-#: src/ui.vala:327
+#. 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 ""
 "Für den Zugriff auf »%s« werden ein Benutzername und ein Passwort benötigt"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Kein Scanner gefunden"
 
-#: src/ui.vala:377
+#. 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 ""
 "Bitte überprüfen Sie, ob Ihr Scanner angeschlossen und eingeschaltet ist"
 
-#: src/ui.vala:382
+#. 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"
 
-#: src/ui.vala:384
+#. 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"
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "Speichern unter …"
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr "Abbre_chen"
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr "_Speichern"
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Gescanntes Dokument.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "Bilddateien"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "Alle Dateitypen"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (Mehrseitiges Dokument)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (Verlustbehaftet)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (Verlustfrei)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr "Dateiformat:"
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Datei konnte nicht gespeichert werden"
 
-#: src/ui.vala:673
+#. 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 ""
 "Wenn Sie nicht speichern, werden die Änderungen unwiderruflich verworfen."
 
-#: src/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "Aktuelles Dokument speichern?"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Änderungen verwerfen"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Vorschaubild kann nicht gespeichert werden"
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Bildvorschauanwendung konnte nicht gestartet werden"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Seiten zusammenfügen"
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Seiten zusammenfügen (umgekehrte Reihenfolge)"
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr "Vertauschen"
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Unverändert lassen"
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Die Hilfedatei konnte nicht geöffnet werden"
 
-#: src/ui.vala:1472
+#. 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"
@@ -519,15 +552,17 @@ msgstr ""
 "ist, finden Sie diese im Internet unter\n"
 "<http://www.gnu.org/licenses/>."
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Über Simple Scan"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Einfaches Werkzeug zum Scannen von Dokumenten"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -573,19 +608,23 @@ msgstr ""
 "  staedtler-przyborski https://launchpad.net/~staedtler-przyborski\n"
 "  tlue https://launchpad.net/~tlueber"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Dokument vor dem Beenden speichern?"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Beenden ohne zu speichern"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "Scheinbar ist ein Brother Scanner angeschlossen."
 
-#: src/ui.vala:1581
+#. 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>."
@@ -593,11 +632,13 @@ msgstr ""
 "Treiber hierfür sind verfügbar auf der <a "
 "href=\"http://support.brother.com\">Brother Webseite</a>."
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "Scheinbar ist ein Samsung Scanner angeschlossen."
 
-#: src/ui.vala:1587
+#. 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>."
@@ -605,15 +646,18 @@ msgstr ""
 "Treiber hierfür sind verfügbar auf der <a "
 "href=\"http://samsung.com/support\">Samsung Webseite</a>."
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "Scheinbar ist ein HP Scanner angeschlossen."
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "Scheinbar ist ein Epson Scanner angeschlossen."
 
-#: src/ui.vala:1598
+#. 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>."
@@ -621,125 +665,139 @@ msgstr ""
 "Treiber hierfür sind auf der <a href=\"http://support.epson.com\">Epson "
 "Webseite</a> verfügbar."
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr "Treiber installieren"
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Nach der Installation müssen Simple Scan erneut starten."
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "Treiber werden installiert…"
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "Treiber wurden erfolgreich installiert!"
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Treiberinstallation fehlgeschlagen (Fehlernummer %d)."
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "Treiberinstallation fehlgeschlagen."
 
-#: src/ui.vala:1676
+#. 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 "Sie müssen %s Paket(e) installieren."
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (Vorgabe)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (Entwurf)"
 
-#: src/ui.vala:1790
+#. 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/ui.vala:1793
+#. 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
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr "Neues Dokument"
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr "Dokument"
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr "E-Mail …"
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr "Drucken …"
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr "Hilfe"
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr "Über"
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr "Beenden"
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "_Scanner wechseln"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "_Treiber installieren"
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr "Dunkler"
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr "Heller"
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr "Weniger"
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr "Mehr"
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr "Niedrig"
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr "Hoch"
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Dokument wird gespeichert …"
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Seite %d von %d wird gespeichert"
diff --git a/po/el.gmo b/po/el.gmo
index 2f46043..1bc4e84 100644
--- a/po/el.gmo
+++ b/po/el.gmo
diff --git a/po/el.po b/po/el.po
index 46ae902..ce4f69b 100644
--- a/po/el.po
+++ b/po/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "ΚΕΙΜΕΝΟ"
 msgid "Photo"
 msgstr "Φωτογραφία"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Επαναδιάταξη σελίδων"
 
@@ -207,7 +207,7 @@ msgstr "Σάρωση"
 msgid "Save document to a file"
 msgstr "Αποθήκευση εγγράφου σε αρχείο"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "Αποθήκευση"
 
@@ -248,8 +248,7 @@ msgstr "Περικοπή της επιλεγμένης σελίδας"
 msgid "Crop"
 msgstr "Περικοπή"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "Προτιμήσεις"
 
@@ -322,163 +321,197 @@ msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#: src/scanner.vala:841
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Δεν υπάρχουν διαθέσιμοι σαρωτές. Παρακαλούμε συνδέστε ένα σαρωτή."
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Αδύνατη η σύνδεση με τον σαρωτή"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Αδύνατη η εκκίνηση της σάρωσης"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Σφάλμα κατά την επικοινωνία με τον σαρωτή"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Προβολή αριθμού έκδοσης"
 
-#: src/simple-scan.vala:24
+#. Help string for command line --debug flag
+#: ../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"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Η σάρωση απέτυχε"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ΣΥΣΚΕΥΗ…] - Εφαρμογή σάρωσης"
 
-#: src/simple-scan.vala:632
+#. 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/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr "_Κλείσιμο"
 
-#: src/ui.vala:327
+#. 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'"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Δεν ανιχνεύθηκαν σαρωτές"
 
-#: src/ui.vala:377
+#. 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 ""
 "Παρακαλούμε βεβαιωθείτε ότι ο σαρωτής σας είναι συνδεδεμένος και σε "
 "λειτουργία"
 
-#: src/ui.vala:382
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#: src/ui.vala:384
+#. Instructions to install driver software
+#: ../src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "Αποθήκευση ως..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Ακύρωση"
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr "Απο_θήκευση"
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Σαρωμένο.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "Αρχεία εικόνων"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "Όλα τα αρχεία"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (έγγραφο πολλαπλών σελίδων)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (συμπιεσμένο)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (δίχως συμπίεση)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Αποτυχία αποθήκευσης του αρχείου"
 
-#: src/ui.vala:673
+#. 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/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "Αποθήκευση του τρέχοντος εγγράφου;"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Απόρριψη αλλαγών"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Αδυναμία αποθήκευσης σελίδας για προεπισκόπηση"
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Αδύνατο το άνοιγμα της εφαρμογής προβολής εικόνων"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr ""
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Διατήρηση αμετάβλητων"
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Αδύνατο το άνοιγμα του αρχείου βοήθειας"
 
-#: src/ui.vala:1472
+#. 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"
@@ -509,15 +542,17 @@ msgstr ""
 "GNU (GNU General Public License) μαζί με αυτό το πρόγραμμα. Εάν όχι, δείτε "
 "εδώ: <http://www.gnu.org/licenses/>."
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Περί Σάρωσης"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Απλό εργαλείο σάρωσης εγγράφων"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -537,167 +572,190 @@ msgstr ""
 "  tomash.ghz https://launchpad.net/~ghz-tomash\n"
 "  trix https://launchpad.net/~panelc"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Αποθήκευση του εγγράφου πριν την έξοδο;"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Έξοδος χωρίς Αποθήκευση"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#: src/ui.vala:1581
+#. 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 ""
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#: src/ui.vala:1587
+#. 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 ""
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#: src/ui.vala:1598
+#. 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 ""
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#: src/ui.vala:1676
+#. 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 ""
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (προεπιλογή)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (πρόχειρο)"
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (υψηλή ανάλυση)"
 
-#: src/ui.vala:1793
+#. 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
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr "Νέο έγγραφο"
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr "Έγγραφο"
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr "Ηλεκτρονική αλληλογραφία..."
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr "Εκτύπωση..."
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr "Βοήθεια"
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr "Περί"
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr "'Εξοδος"
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Αλλαγή _σαρωτή"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "Αυτόματο"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr "Σκοτεινότερο"
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr "Φωτεινότερο"
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr "Λιγότερο"
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr "Περισσότερο"
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr "Ελάχιστο"
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr "Μέγιστο"
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Αποθήκευση εγγράφου..."
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Αποθήκευση σελίδας %d από %d"
diff --git a/po/en_GB.gmo b/po/en_GB.gmo
index 5aeac6b..815a4db 100644
--- a/po/en_GB.gmo
+++ b/po/en_GB.gmo
diff --git a/po/en_GB.po b/po/en_GB.po
index 5938be3..a6ff60c 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -9,13 +9,13 @@ msgstr ""
 "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 <jameslin@inbox.com>\n"
+"Last-Translator: James Thorrold <j.thorrold@virgin.net>\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-07-30 05:46+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "Text"
 msgid "Photo"
 msgstr "Photo"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Reorder Pages"
 
@@ -207,7 +207,7 @@ msgstr "Scan"
 msgid "Save document to a file"
 msgstr "Save document to a file"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "Save"
 
@@ -248,8 +248,7 @@ msgstr "Crop the selected page"
 msgid "Crop"
 msgstr "Crop"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "Preferences"
 
@@ -327,158 +326,192 @@ msgid ""
 msgstr ""
 "Simple Scan uses the SANE framework which supports most existing scanners."
 
-#: src/scanner.vala:841
+#. 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."
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Unable to connect to scanner"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Unable to start scan"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. 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"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Show release version"
 
-#: src/simple-scan.vala:24
+#. 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
+#: ../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"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Failed to scan"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Scanning utility"
 
-#: src/simple-scan.vala:632
+#. 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 ""
 "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:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr "_Close"
 
-#: src/ui.vala:327
+#. 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'"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "No scanners detected"
 
-#: src/ui.vala:377
+#. 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 "Please check your scanner is connected and powered on"
 
-#: src/ui.vala:382
+#. 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"
 
-#: src/ui.vala:384
+#. 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."
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "Save As..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Cancel"
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr "_Save"
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Scanned Document.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "Image Files"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "All Files"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (multi-page document)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (compressed)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (lossless)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr "File format:"
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Failed to save file"
 
-#: src/ui.vala:673
+#. 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/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "Save current document?"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Discard Changes"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Unable to save image for preview"
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Unable to open image preview application"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Combine sides"
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Combine sides (reverse)"
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr "Reverse"
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Keep unchanged"
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Unable to open help file"
 
-#: src/ui.vala:1472
+#. 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"
@@ -506,21 +539,23 @@ msgstr ""
 "You should have received a copy of the GNU General Public Licence\n"
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "About Simple Scan"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Simple document scanning tool"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Alex Denvir https://launchpad.net/~coldfff\n"
 "  Andi Chandler https://launchpad.net/~bing\n"
-"  Anthony Harrington https://launchpad.net/~untaintableangel\n"
+"  Anthony Harrington 😁 https://launchpad.net/~untaintableangel\n"
 "  GeorgeB https://launchpad.net/~solar.george-deactivatedaccount\n"
 "  James Thorrold https://launchpad.net/~jthorrold\n"
 "  Jonathon Hodges https://launchpad.net/~jonblondie\n"
@@ -528,19 +563,23 @@ msgstr ""
 "  Malcolm Parsons https://launchpad.net/~malcolm-parsons\n"
 "  Tomasz Chabowski https://launchpad.net/~tomasz-chabowski-googlemail"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Save document before quitting?"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Quit without Saving"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "You appear to have a Brother scanner."
 
-#: src/ui.vala:1581
+#. 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>."
@@ -548,11 +587,13 @@ msgstr ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "You appear to have a Samsung scanner."
 
-#: src/ui.vala:1587
+#. 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>."
@@ -560,15 +601,18 @@ msgstr ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "You appear to have an HP scanner."
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "You appear to have an Epson scanner."
 
-#: src/ui.vala:1598
+#. 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>."
@@ -576,125 +620,139 @@ msgstr ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr "Install drivers"
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Once installed, you will need to restart Simple Scan."
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "Installing drivers..."
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "Drivers installed successfully!"
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Failed to install drivers (error code %d)."
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "Failed to install drivers."
 
-#: src/ui.vala:1676
+#. 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 "You need to install the %s package(s)."
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (default)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (draft)"
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (high resolution)"
 
-#: src/ui.vala:1793
+#. 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
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr "New Document"
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr "Document"
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr "E-mail..."
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr "Print..."
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr "Help"
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr "About"
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr "Quit"
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Change _Scanner"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "_Install Drivers"
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automatic"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr "Darker"
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr "Lighter"
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr "Less"
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr "More"
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr "Minimum"
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr "Maximum"
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Saving document..."
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Saving page %d out of %d"
diff --git a/po/eo.gmo b/po/eo.gmo
index 9a6aee6..d9fe40a 100644
--- a/po/eo.gmo
+++ b/po/eo.gmo
diff --git a/po/eo.po b/po/eo.po
index d49c8ef..c7ccac4 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 "Language: eo\n"
 
 #. Button to submit authorization dialog
@@ -89,8 +89,8 @@ msgstr "Teksto"
 msgid "Photo"
 msgstr "Foto"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Reordigi paĝojn"
 
@@ -208,7 +208,7 @@ msgstr "Skani"
 msgid "Save document to a file"
 msgstr "Konservi dokumenton en dosiero"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "Konservi"
 
@@ -249,8 +249,7 @@ msgstr "Stuci la elektitan paĝon"
 msgid "Crop"
 msgstr "Stuci"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "Agordoj"
 
@@ -323,158 +322,192 @@ msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#: src/scanner.vala:841
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Neniuj skaniloj disponeblaj.  Bonvolu konekti skanilon."
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Ne povas konekto kun skanilo"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Ne povas komenci skani"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Eraro kiam konektanta kun skanilo"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Montri eldonversion"
 
-#: src/simple-scan.vala:24
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Presi mesaĝojn pri sencimigo"
 
-#: src/simple-scan.vala:26
+#: ../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"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Ne sukcesi skani"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[APARATO...] - Skanutilaĵo"
 
-#: src/simple-scan.vala:632
+#. 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 ""
 "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:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr "_Fermi"
 
-#: src/ui.vala:327
+#. 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 "Salutnomo kaj pasvorto estas necesa aliri '%s'"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Neniuj skaniloj eltrovis"
 
-#: src/ui.vala:377
+#. 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 "Bonvolu kontrolas ke via skanilo estas kenekta kaj kurentŝalta"
 
-#: src/ui.vala:382
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#: src/ui.vala:384
+#. Instructions to install driver software
+#: ../src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "Konservi kiel..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Nuligi"
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr "Kon_servi"
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Skanita Dokumento.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "Bildo-dosieroj"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "Ĉiuj dosieroj"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (multpaĝa dokumento)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (densigita)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (senperda)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Ne sukcesis konservi la dosieron"
 
-#: src/ui.vala:673
+#. 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 vi ne konservas, ŝanĝoj estos perditaj permanente."
 
-#: src/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "Konservi la nunan dokumenton?"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Forlasi Ŝanĝojn"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Ne eblas konservi bildon por antaŭrigardo"
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Ne eblis malfermi bild-dosieron"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Kombini flankojn"
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Kombini flankojn"
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr "Inversigi"
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Konservi senŝanĝa"
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Ne eblis malfermi help-dosieron"
 
-#: src/ui.vala:1472
+#. 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"
@@ -503,15 +536,17 @@ msgstr ""
 "al vi kun ĉi tiu programo; se vi ĝin ne ricevis, turnu vin al "
 "<http://www.gnu.org/licenses/>."
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Pri simpla skani"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Simpla ilo por skanantaj dokumentoj"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -524,167 +559,190 @@ msgstr ""
 "  Robert Ancell https://launchpad.net/~robert-ancell\n"
 "  Tiffany Antopolski https://launchpad.net/~mimico-tiffany"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Konservi dokumenton antaŭe ĉesanta?"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Fini sen konservanta"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#: src/ui.vala:1581
+#. 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 ""
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#: src/ui.vala:1587
+#. 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 ""
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#: src/ui.vala:1598
+#. 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 ""
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#: src/ui.vala:1676
+#. 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 ""
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d punktoj en colo (defaŭlto)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d punktoj en colo (malneto)"
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d punktoj en colo (alta distingivo)"
 
-#: src/ui.vala:1793
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d punktoj en colo"
 
-#: src/ui.vala:1835
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr ""
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr ""
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr ""
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr ""
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr ""
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr ""
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Ŝanĝi _Skanilo"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "Aŭtomata"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr "Pli malhele"
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr "Pli hele"
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr "Malpli"
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr "Pli"
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr "Minimume"
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr "Maksimume"
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Konservado de dokumento..."
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, 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
index 4a82379..893934b 100644
--- a/po/es.gmo
+++ b/po/es.gmo
diff --git a/po/es.po b/po/es.po
index 9118ad5..e91c52b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,14 +8,14 @@ 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-03-25 14:07+0000\n"
-"Last-Translator: Adolfo Jayme <fitoschido@gmail.com>\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,15 +88,15 @@ msgstr "Texto"
 msgid "Photo"
 msgstr "Foto"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Reordenar las páginas"
 
 #. Label on email menu item
 #: data/simple-scan.ui:367
 msgid "_Email"
-msgstr "_Correo"
+msgstr "_Correo electrónico"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
 #: data/simple-scan.ui:430
@@ -207,7 +207,7 @@ msgstr "Escanear"
 msgid "Save document to a file"
 msgstr "Guardar documento a un archivo"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "Guardar"
 
@@ -248,8 +248,7 @@ msgstr "Recortar la página seleccionada"
 msgid "Crop"
 msgstr "Recortar"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "Preferencias"
 
@@ -307,7 +306,7 @@ msgstr "escanear;escáner;plano;adf;"
 
 #: data/simple-scan.desktop.in:8
 msgid "scanner"
-msgstr ""
+msgstr "escáner"
 
 #: data/simple-scan.appdata.xml.in:8
 msgid ""
@@ -328,160 +327,194 @@ msgstr ""
 "Simple Scan emplea el marco SANE para compatibilidad con la mayoría de los "
 "escáneres existentes."
 
-#: src/scanner.vala:841
+#. 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."
 
-#: src/scanner.vala:871
+#. 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"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Incapaz de iniciar el escaneo"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. 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"
 
-#: src/simple-scan.vala:21
+#. 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/simple-scan.vala:24
+#. 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
+#: ../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"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Falló al escanear"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DISPOSITIVO…] - Utilidad de escaneo"
 
-#: src/simple-scan.vala:632
+#. 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 una lista completa de las opciones de línea de "
 "órdenes disponibles."
 
-#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
+#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr "_Cerrar"
 
-#: src/ui.vala:327
+#. 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»"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "No se detectó ningún escáner"
 
-#: src/ui.vala:377
+#. 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 "Compruebe que su escáner está encendido y conectado"
 
-#: src/ui.vala:382
+#. 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"
 
-#: src/ui.vala:384
+#. 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."
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "Guardar como…"
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr "_Guardar"
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Documento escaneado.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "Archivos de imagen"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "Todos los archivos"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (documento multipágina)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimido)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (sin pérdida)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr "Formato de archivo:"
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Falló al guardar el archivo"
 
-#: src/ui.vala:673
+#. 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 "Los cambios se perderán permanentemente si no los guarda."
 
-#: src/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "¿Guardar el documento actual?"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Descartar cambios"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "No se pudo guardar la imagen para previsualización"
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "No se puede abrir la aplicación de previsualización de imágenes"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Combinar lados"
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Combinar lados (invertido)"
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr "Invertir"
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Mantener sin cambios"
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "No se pudo abrir el archivo de ayuda"
 
-#: src/ui.vala:1472
+#. 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"
@@ -496,28 +529,32 @@ 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 es software libre: puede redistribuirlo o modificarlo\n"
-"en los términos de la Licencia Pública General de GNU publicada por la\n"
-"Free Software Foundation, en su versión 3 o, a su elección, cualquiera\n"
-"posterior.\n"
+"Este programa es software libre: puede redistribuirlo o \n"
+"modificarlo en los términos de la Licencia Pública General\n"
+"de GNU publicada por la Free Software Foundation, en su\n"
+"versión 3 o, a su elección, cualquiera posterior.\n"
 "\n"
-"Este programa se distribuye con la esperanza de que sea útil,\n"
-"pero SIN NINGUNA GARANTÍA; ni siquiera la garantía implícita de\n"
-"COMERCIABILIDAD o ADECUACIÓN A UN OBJETIVO PARTICULAR. Vea la\n"
-"Licencia Pública General de GNU para más detalles.\n"
+"Este programa se distribuye con la esperanza de que sea\n"
+"útil, pero SIN NINGUNA GARANTÍA; ni siquiera la garantía\n"
+"implícita de COMERCIABILIDAD o ADECUACIÓN A UN \n"
+"OBJETIVO PARTICULAR. Vea la Licencia Pública General\n"
+"de GNU para más detalles.\n"
 "\n"
-"Debe haber recibido una copia de la Licencia Pública General de GNU\n"
-"con este programa. Si no fuera así, vea <http://www.gnu.org/licenses/>."
+"Debe haber recibido una copia de la Licencia Pública\n"
+"General de GNU con este programa. Si no fuera así,\n"
+"vea  <http://www.gnu.org/licenses/>."
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Acerca de Simple Scan"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Herramienta sencilla para escanear documentos"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -532,6 +569,7 @@ msgstr ""
 "  Fco. Javier Serrador https://launchpad.net/~serrador-tecknolabs\n"
 "  Genesis Bustamante https://launchpad.net/~genmarc\n"
 "  Jonay https://launchpad.net/~jonay-santana\n"
+"  Jose Luis Tirado https://launchpad.net/~txelu70\n"
 "  Julian Alarcon https://launchpad.net/~alarconj\n"
 "  Martin Albisetti https://launchpad.net/~beuno\n"
 "  Monkey https://launchpad.net/~monkey-libre\n"
@@ -546,19 +584,23 @@ msgstr ""
 "  fosk https://launchpad.net/~oscarrdg\n"
 "  hhlp https://launchpad.net/~hhlp-deactivatedaccount"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "¿Guardar el documento antes de salir?"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Salir sin guardar"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "Parece que tiene un escáner Brother."
 
-#: src/ui.vala:1581
+#. 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>."
@@ -566,11 +608,13 @@ msgstr ""
 "En el <a href=\"http://support.brother.com\">sitio web de Brother</a> "
 "encontrará controladores."
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "Parece que tiene un escáner Samsung."
 
-#: src/ui.vala:1587
+#. 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>."
@@ -578,15 +622,18 @@ msgstr ""
 "En el <a href=\"http://samsung.com/support\">sitio web de Samsung</a> "
 "encontrará controladores."
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "Parece que tiene un escáner HP."
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "Parece que tiene un escáner Epson."
 
-#: src/ui.vala:1598
+#. 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>."
@@ -594,125 +641,139 @@ msgstr ""
 "Visite el <a href=\"http://support.epson.com\">sitio web de Epson</a> para "
 "encontrar controladores."
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr "Instalación de controladores"
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Cuando finalice la instalación deberá reiniciar Simple Scan."
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "Instalando los controladores…"
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "Los controladores se instalaron correctamente."
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Falló la instalación de los controladores (cód. de error: %d)"
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "Falló la instalación de los controladores."
 
-#: src/ui.vala:1676
+#. 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 "Necesita instalar el paquete %s."
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (predeterminado)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (borrador)"
 
-#: src/ui.vala:1790
+#. 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ón)"
 
-#: src/ui.vala:1793
+#. 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
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr "Documento nuevo"
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr "Documento"
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr "Correo..."
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr "Imprimir…"
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr "Ayuda"
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr "Acerca de"
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr "Salir"
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Cambiar _escáner"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "_Instalar controladores"
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automático"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr "Más oscuro"
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr "Más claro"
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr "Menos"
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr "Más"
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr "Mínima"
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr "Máxima"
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Guardando el documento…"
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Guardando la página %d de %d"
diff --git a/po/et.gmo b/po/et.gmo
index 628ed14..4e4f039 100644
--- a/po/et.gmo
+++ b/po/et.gmo
diff --git a/po/et.po b/po/et.po
index 3441ab0..ade1727 100644
--- a/po/et.po
+++ b/po/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "Tekst"
 msgid "Photo"
 msgstr "Foto"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr ""
 
@@ -207,7 +207,7 @@ msgstr "Skanni"
 msgid "Save document to a file"
 msgstr "Dokumendi salvestamine faili"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "Salvesta"
 
@@ -248,8 +248,7 @@ msgstr "Valitud lehekülje kärpimine"
 msgid "Crop"
 msgstr "Kärbi"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "Eelistused"
 
@@ -322,157 +321,191 @@ msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#: src/scanner.vala:841
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Skannereid pole saadaval. Palun ühenda skanner arvutiga."
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Skanneriga ei suudetud ühenduda"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Skannimist ei suudetud alustada"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Tõrge skanneriga suhtlemisel"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Versiooninumbri näitamine"
 
-#: src/simple-scan.vala:24
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Näita veasilumise sõnumeid"
 
-#: src/simple-scan.vala:26
+#: ../src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Skannimine nurjus"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
-#: src/simple-scan.vala:632
+#. 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 "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:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr ""
 
-#: src/ui.vala:327
+#. 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' ligipääsuks on vajalik kasutajanimi ja parool"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Ühtegi skannerit ei tuvastatud"
 
-#: src/ui.vala:377
+#. 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 "Kontrolli, kas skanner on ühendatud ja sisse lülitatud"
 
-#: src/ui.vala:382
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#: src/ui.vala:384
+#. Instructions to install driver software
+#: ../src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "Salvesta kui..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr ""
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr ""
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Skannitud dokument.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "Pildifailid"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "Kõik failid"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (mitmeleheküljeline dokument)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (tihendatud)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (kadudeta)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Faili salvestamine nurjus"
 
-#: src/ui.vala:673
+#. 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 "Kui sa ei salvesta, lähevad muudatused jäädavalt kaotsi."
 
-#: src/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "Kas salvestada see dokument?"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Tühista muudatused"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Eelvaate pildi salvestamine ebaõnnestus"
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Pildi eelvaatluse rakendust ei suudetud käivitada"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr ""
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr ""
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Abiteabe faili pole võimalik avada"
 
-#: src/ui.vala:1472
+#. 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"
@@ -501,15 +534,17 @@ msgstr ""
 "Litsentsist; juhul kui sa seda ei saanud, siis vaata "
 "<http://www.gnu.org/licences/>."
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Lihtsast skannijast lähemalt"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Lihtne dokumendi skaneerimise tööriist"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -517,167 +552,190 @@ msgstr ""
 "  Madis Veskimeister https://launchpad.net/~avalikarvamus\n"
 "  mahfiaz https://launchpad.net/~mahfiaz"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Kas salvestada dokument enne väljumist?"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Välju ilma salvestamata"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#: src/ui.vala:1581
+#. 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 ""
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#: src/ui.vala:1587
+#. 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 ""
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#: src/ui.vala:1598
+#. 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 ""
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#: src/ui.vala:1676
+#. 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 ""
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (vaikimisi)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (mustand)"
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (kõrge kvaliteet)"
 
-#: src/ui.vala:1793
+#. 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
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr ""
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr ""
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr ""
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr ""
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr ""
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr ""
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "_Skanneri vahetamine"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automaatne"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr ""
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr ""
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr ""
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr ""
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr ""
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr ""
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Dokumendi salvestamine..."
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/eu.gmo b/po/eu.gmo
index 7e4b163..c774d64 100644
--- a/po/eu.gmo
+++ b/po/eu.gmo
diff --git a/po/eu.po b/po/eu.po
index 874948f..b29cc5f 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "Testua"
 msgid "Photo"
 msgstr "Argazkia"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Berrordenatu orrialdeak"
 
@@ -207,7 +207,7 @@ msgstr "Eskaneatu"
 msgid "Save document to a file"
 msgstr "Gorde dokumentua fitxategi batean"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "Gorde"
 
@@ -248,8 +248,7 @@ msgstr "Moztu hautatutako orrialdea"
 msgid "Crop"
 msgstr "Moztu"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "Hobespenak"
 
@@ -327,158 +326,192 @@ msgstr ""
 "Simple Scan SANE framework erabiltzen du dauden eskaner gehienei sostengua "
 "emateko."
 
-#: src/scanner.vala:841
+#. 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."
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Ezin da eskanerrarekin konektatu"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Ezin da eskanerra abiarazi"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Errorea eskanerrarekin komunikatzean"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Erakutsi bertsioa"
 
-#: src/simple-scan.vala:24
+#. 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
+#: ../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"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Ezin izan da eskaneatu"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Eskaneatze-aplikazioa"
 
-#: src/simple-scan.vala:632
+#. 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
+#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr "_Itxi"
 
-#: src/ui.vala:327
+#. 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"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Ez da eskanerrik detektatu"
 
-#: src/ui.vala:377
+#. 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 "Egiaztatu zure eskanerra konektatuta eta piztuta dagoela"
 
-#: src/ui.vala:382
+#. 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"
 
-#: src/ui.vala:384
+#. 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."
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "Gorde honela..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Utzi"
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr "_Gorde"
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Dokumentu.pdf eskaneatuta"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "Irudi-fitxategiak"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "Fitxategi guztiak"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (orrialde anitzeko dokumentua)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (konprimitua)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (galerarik gabea)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr "Fitxategi-formatua:"
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Ezin izan da fitxategia gorde"
 
-#: src/ui.vala:673
+#. 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 "Gordetzen ez baduzu, aldaketak betiko galduko dira."
 
-#: src/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "Gorde uneko dokumentua?"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Baztertu aldaketak"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Ezin izan da aurrebistarako irudia gorde"
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Ezin izan da ireki irudiaren aurrebistarako aplikazioa"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Konbinatu aldeak"
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Konbinatu aldeak (alderantziz)"
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr "Alderantziz"
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Mantendu aldatu gabe"
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Ezin izan da ireki laguntza-fitxategia"
 
-#: src/ui.vala:1472
+#. 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"
@@ -506,15 +539,17 @@ msgstr ""
 "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/>."
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Simple Scan-i buruz"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Dokumentuak eskaneatzeko tresna sinplea"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -529,19 +564,23 @@ msgstr ""
 "  Robert Ancell https://launchpad.net/~robert-ancell\n"
 "  gorkaazk https://launchpad.net/~gorkaazkarate"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Gorde dokumentua irten baino lehen?"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Irten gorde gabe"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "Brother eskanerra duzuela ematen du."
 
-#: src/ui.vala:1581
+#. 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>."
@@ -549,11 +588,13 @@ msgstr ""
 "Honentzako kontrolatzaileak  <a href=\"http://support.brother.com\">Brother "
 "webgunean</a> erabilgarri daude."
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "Samsung eskanerra duzuela ematen du."
 
-#: src/ui.vala:1587
+#. 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>."
@@ -561,15 +602,18 @@ msgstr ""
 "Honentzako kontrolatzaileak <a href=\"http://samsung.com/support\">Samsung "
 "webgunean</a> erabilgarri daude."
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "HP eskanerra duz uela ematen du."
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "Epson eskanerra duzuela ematen du."
 
-#: src/ui.vala:1598
+#. 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>."
@@ -577,125 +621,139 @@ msgstr ""
 "Honentzako kontrolatzaileak <a href=\"http://support.epson.com\">Epson "
 "webgunean</a> erabilgarri daude."
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr "Instalatu kontrolatzaileak"
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Behin instalatua Simple Scan berabiarazi behar duzu."
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "Kontrolatzaileak instalatzen..."
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "Kontrolatzaileak ondo instalatu dira!"
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Ezin izan dira kontrolatzaileak instalatu (%d errore kodea)."
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "Ezin izan dira kontrolatzaileak instalatu."
 
-#: src/ui.vala:1676
+#. 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 "%s pakete(ak) instalatu behar duzu (dituzu).."
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (lehenetsia)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (zirriborroa)"
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (bereizmen altua)"
 
-#: src/ui.vala:1793
+#. 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
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr "Dokumentu berria"
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr "Dokumentua"
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr "Bidali postaz..."
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr "Inprimatu..."
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr "Laguntza"
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr "Honi buruz"
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr "Irten"
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Aldatu e_skanerra"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "_Instalatu kontrolatzaileak"
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automatikoa"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr "Ilunago"
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr "Argiago"
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr "Gutxiago"
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr "Gehiago"
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr "Minimoa"
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr "Maximoa"
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Dokumentua gordetzen..."
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "%d orria (%d-etik) gordetzen"
diff --git a/po/fi.gmo b/po/fi.gmo
index fcb5b8a..4b0dfe6 100644
--- a/po/fi.gmo
+++ b/po/fi.gmo
diff --git a/po/fi.po b/po/fi.po
index 0828f46..b4c462a 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "Teksti"
 msgid "Photo"
 msgstr "Valokuva"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Järjestä sivut"
 
@@ -207,7 +207,7 @@ msgstr "Lue"
 msgid "Save document to a file"
 msgstr "Tallenna asiakirja tiedostoon"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "Tallenna"
 
@@ -248,8 +248,7 @@ msgstr "Rajaa nykyistä sivua"
 msgid "Crop"
 msgstr "Rajaa"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "Asetukset"
 
@@ -327,157 +326,191 @@ msgstr ""
 "Tämä sovellus käyttää SANE-kehystä tukeakseen useimpia olemassa olevia "
 "kuvanlukijoita."
 
-#: src/scanner.vala:841
+#. 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."
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Kuvanlukijaan ei voi yhdistää"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Kuvanluvun käynnistäminen ei onnistu"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. 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"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Näytä julkaisuversio"
 
-#: src/simple-scan.vala:24
+#. 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
+#: ../src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "Korjaa vanhemmilla Kuvanlukijan versioilla luodut PDF-tiedostot"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Kuvanluku epäonnistui"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[LAITE...] - Skannaus apuohjelma"
 
-#: src/simple-scan.vala:632
+#. 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
+#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr "_Sulje"
 
-#: src/ui.vala:327
+#. 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"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Kuvanlukijoita ei havaittu"
 
-#: src/ui.vala:377
+#. 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 "Varmista että kuvanlukijasi on yhdistetty ja kytketty päälle"
 
-#: src/ui.vala:382
+#. 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"
 
-#: src/ui.vala:384
+#. 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."
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "Tallenna nimellä..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Peru"
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr "_Tallenna"
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Asiakirja kuvanlukijasta.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "Kuvatiedostot"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "Kaikki tiedostot"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (monisivuinen asiakirja)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (pakattu)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (häviötön)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr "Tiedostomuoto:"
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Tiedoston tallennus epäonnistui"
 
-#: src/ui.vala:673
+#. 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 "Jos et tallenna, muutokset katoavat pysyvästi."
 
-#: src/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "Tallennetaanko nykyinen asiakirja?"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Hylkää muutokset"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Esikatselun tallennus epäonnistui"
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Esikatselusovelluksen avaus epäonnistui"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Yhdistä puolet"
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Yhdistä puolet (käänteinen)"
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr "Käänteinen"
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Säilytä muuttumattomana"
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Ohjetiedostoa ei voi avata"
 
-#: src/ui.vala:1472
+#. 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"
@@ -507,15 +540,17 @@ msgstr ""
 "tämän ohjelman mukana. Jos et saanut, katso lisätietoja osoitteesta "
 "<http://www.gnu.org/licenses/>."
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Tietoja sovelluksesta"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Yksinkertainen asiakirjojen kuvanlukutyökalu"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -528,19 +563,23 @@ msgstr ""
 "  Timo Jyrinki https://launchpad.net/~timo-jyrinki\n"
 "  Ville Pilvio https://launchpad.net/~vpilvio"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Tallennetaanko asiakirja ennen sovelluksen sulkemista?"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Sulje tallentamatta"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "Käytössäsi vaikuttaa olevan Brother-kuvanlukija."
 
-#: src/ui.vala:1581
+#. 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>."
@@ -548,11 +587,13 @@ msgstr ""
 "Sen ajurit voi ladata <a href=\"http://support.brother.com\">Brotherin "
 "verkkosivustolta</a>."
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "Käytössäsi vaikuttaa olevan Samsung-kuvanlukija."
 
-#: src/ui.vala:1587
+#. 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>."
@@ -560,15 +601,18 @@ msgstr ""
 "Sen ajurit voi ladata <a href=\"http://samsung.com/support\">Samsungin "
 "verkkosivustolta</a>."
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "Käytössäsi vaikuttaa olevan HP-kuvanlukija."
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "Käytössäsi vaikuttaa olevan Epson-kuvanlukija."
 
-#: src/ui.vala:1598
+#. 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>."
@@ -576,126 +620,140 @@ msgstr ""
 "Sen ajurit voi ladata <a href=\"http://support.epson.com\">Epsonin "
 "verkkosivustolta</a>."
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr "Asenna ajurit"
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 "Kun ajurit on asennettu, kuvanlukusovellus on käynnistettävä uudelleen."
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "Asennetaan ajureita..."
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "Ajurit asennettiin onnistuneesti!"
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Ajurien asentaminen epäonnistui (virhekoodi %d)."
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "Ajurien asentaminen epäonnistui."
 
-#: src/ui.vala:1676
+#. 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 "%s paketti/paketit tulee asentaa."
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (oletus)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (vedos)"
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (korkea tarkkuus)"
 
-#: src/ui.vala:1793
+#. 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
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr "Uusi asiakirja"
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr "Asiakirja"
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr "Sähköposti..."
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr "Tulosta..."
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr "Ohje"
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr "Tietoja"
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr "Lopeta"
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Muuta _kuvanlukijaa"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "_Asenna ajurit"
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automaattinen"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr "Tummempi"
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr "Vaaleampi"
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr "Vähemmän"
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr "Enemmän"
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr "Heikompi"
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr "Parempi"
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Tallennetaan asiakirjaa..."
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Tallennetaan sivua %d/%d"
diff --git a/po/fr.gmo b/po/fr.gmo
index 4dbf713..f676535 100644
--- a/po/fr.gmo
+++ b/po/fr.gmo
diff --git a/po/fr.po b/po/fr.po
index 115b355..db672ef 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,13 +9,13 @@ msgstr ""
 "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"
-"Last-Translator: Anne <anneonyme017@gmail.com>\n"
+"Last-Translator: Anne017 <anneonyme017@openmailbox.org>\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-08-15 05:22+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "Texte"
 msgid "Photo"
 msgstr "Photo"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Réorganiser les pages"
 
@@ -207,7 +207,7 @@ msgstr "Numériser"
 msgid "Save document to a file"
 msgstr "Enregistrer le document dans un fichier"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "Enregistrer"
 
@@ -248,8 +248,7 @@ msgstr "Recadrer la page sélectionnée"
 msgid "Crop"
 msgstr "Recadrer"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "Préférences"
 
@@ -328,164 +327,198 @@ msgstr ""
 "Simple Scan utilise la structure logicielle de SANE pour prendre en charge "
 "la plupart des périphériques de numérisation existants."
 
-#: src/scanner.vala:841
+#. 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."
 
-#: src/scanner.vala:871
+#. 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"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Impossible de démarrer la numérisation"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. 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"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Afficher les informations de version"
 
-#: src/simple-scan.vala:24
+#. 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
+#: ../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"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Échec de la numérisation"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Outil de numérisation"
 
-#: src/simple-scan.vala:632
+#. 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
+#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr "_Fermer"
 
-#: src/ui.vala:327
+#. 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 »"
 
-#: src/ui.vala:375
+#. 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é."
 
-#: src/ui.vala:377
+#. 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."
 
-#: src/ui.vala:382
+#. 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"
 
-#: src/ui.vala:384
+#. 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."
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. 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
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Annuler"
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr "_Enregistrer"
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Document numérisé.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "Fichiers image"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "Tous les fichiers"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (document multipage)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (compressé)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (sans perte)"
 
-#: src/ui.vala:557
+#. 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 :"
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Impossible d'enregistrer le fichier"
 
-#: src/ui.vala:673
+#. 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."
 
-#: src/ui.vala:708
+#. 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 ?"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Abandonner les modifications"
 
-#: src/ui.vala:992
+#. 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"
 
-#: src/ui.vala:1004
+#. 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"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Associer les côtés"
 
-#: src/ui.vala:1216
+#. 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)"
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr "Inverser"
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Maintenir inchangé"
 
-#: src/ui.vala:1451
+#. 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"
 
-#: src/ui.vala:1472
+#. 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"
@@ -514,22 +547,24 @@ msgstr ""
 "en même temps que ce programme ; si ce n'est pas le cas, consultez\n"
 "<http://www.gnu.org/licenses/>."
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "À propos de Simple Scan"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Numériser simplement vos documents"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  65GYgzf https://launchpad.net/~65gygzf\n"
 "  Alexandre Franke https://launchpad.net/~afranke\n"
 "  Alexandre Pliarchopoulos https://launchpad.net/~al-pliar\n"
-"  Anne https://launchpad.net/~anneonyme017\n"
+"  Anne017 https://launchpad.net/~anneonyme017\n"
 "  Antoine Pernot https://launchpad.net/~antoinepernot\n"
 "  Bruno Patri https://launchpad.net/~bruno666-deactivatedaccount\n"
 "  Christophe Herot https://launchpad.net/~tictoc-free\n"
@@ -561,19 +596,23 @@ msgstr ""
 "  londumas https://launchpad.net/~helion331990\n"
 "  torglut https://launchpad.net/~torglut"
 
-#: src/ui.vala:1509
+#. 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 ?"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Quitter sans enregistrer"
 
-#: src/ui.vala:1579
+#. 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."
 
-#: src/ui.vala:1581
+#. 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>."
@@ -581,11 +620,13 @@ msgstr ""
 "Les pilotes sont disponibles sur le <a "
 "href=\"http://support.brother.com\">site Web de Brother</a>."
 
-#: src/ui.vala:1585
+#. 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."
 
-#: src/ui.vala:1587
+#. 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>."
@@ -593,15 +634,18 @@ msgstr ""
 "Les pilotes sont disponibles sur le <a "
 "href=\"http://samsung.com/support\">site Web de Samsung</a>."
 
-#: src/ui.vala:1591
+#. 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."
 
-#: src/ui.vala:1596
+#. 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."
 
-#: src/ui.vala:1598
+#. 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>."
@@ -609,125 +653,139 @@ msgstr ""
 "Les pilotes sont disponibles sur le <a "
 "href=\"http://support.epson.com\">site web d'Epson</a>."
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr "Installer les pilotes"
 
-#: src/ui.vala:1633
+#. 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."
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "Installation des pilotes..."
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "Pilotes installés avec succès !"
 
-#: src/ui.vala:1663
+#. 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)."
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "Impossible d'installer les pilotes."
 
-#: src/ui.vala:1676
+#. 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."
 
-#: src/ui.vala:1784
+#. 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/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (brouillon)"
 
-#: src/ui.vala:1790
+#. 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/ui.vala:1793
+#. 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
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr "Nouveau document"
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr "Document"
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr "Courriel..."
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr "Imprimer..."
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr "Aide"
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr "À propos"
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr "Quitter"
 
-#: src/ui.vala:1889
+#. 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"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "_Installer les pilotes"
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automatique"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr "Plus foncé"
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr "Plus clair"
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr "Moins"
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr "Plus"
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr "Minimum"
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr "Maximum"
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Enregistrement du document..."
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Enregistrement de la page %d sur %d"
diff --git a/po/fr_CA.gmo b/po/fr_CA.gmo
index 44f6bd1..bd0e4e4 100644
--- a/po/fr_CA.gmo
+++ b/po/fr_CA.gmo
diff --git a/po/fr_CA.po b/po/fr_CA.po
index 0bddf9b..406432e 100644
--- a/po/fr_CA.po
+++ b/po/fr_CA.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:46+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "Texte"
 msgid "Photo"
 msgstr "Photo"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Réorganiser les pages"
 
@@ -207,7 +207,7 @@ msgstr "Numériser"
 msgid "Save document to a file"
 msgstr "Enregistrer le document dans un fichier"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "Enregistrer"
 
@@ -248,8 +248,7 @@ msgstr "Recadrer la page sélectionnée"
 msgid "Crop"
 msgstr "Recadrer"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "Préférences"
 
@@ -328,164 +327,198 @@ msgstr ""
 "Simple Scan utilise la structure logicielle de SANE pour prendre en charge "
 "la plupart des périphériques de numérisation existants."
 
-#: src/scanner.vala:841
+#. 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."
 
-#: src/scanner.vala:871
+#. 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"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Impossible de démarrer la numérisation"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. 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"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Afficher les informations de version"
 
-#: src/simple-scan.vala:24
+#. 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
+#: ../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"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Échec de la numérisation"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Outil de numérisation"
 
-#: src/simple-scan.vala:632
+#. 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
+#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr "_Fermer"
 
-#: src/ui.vala:327
+#. 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 »"
 
-#: src/ui.vala:375
+#. 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é."
 
-#: src/ui.vala:377
+#. 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."
 
-#: src/ui.vala:382
+#. 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"
 
-#: src/ui.vala:384
+#. 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."
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. 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
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Annuler"
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr "_Enregistrer"
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Document numérisé.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "Fichiers image"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "Tous les fichiers"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (document multipage)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (compressé)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (sans perte)"
 
-#: src/ui.vala:557
+#. 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 :"
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Impossible d'enregistrer le fichier"
 
-#: src/ui.vala:673
+#. 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."
 
-#: src/ui.vala:708
+#. 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 ?"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Abandonner les modifications"
 
-#: src/ui.vala:992
+#. 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"
 
-#: src/ui.vala:1004
+#. 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"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Associer les côtés"
 
-#: src/ui.vala:1216
+#. 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)"
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr "Inverser"
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Maintenir inchangé"
 
-#: src/ui.vala:1451
+#. 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"
 
-#: src/ui.vala:1472
+#. 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"
@@ -514,33 +547,39 @@ msgstr ""
 "en même temps que ce programme ; si ce n'est pas le cas, consultez\n"
 "<http://www.gnu.org/licenses/>."
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "À propos de Simple Scan"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Numériser simplement vos documents"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Mathieu Marin https://launchpad.net/~rama-197"
 
-#: src/ui.vala:1509
+#. 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 ?"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Quitter sans enregistrer"
 
-#: src/ui.vala:1579
+#. 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."
 
-#: src/ui.vala:1581
+#. 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>."
@@ -548,11 +587,13 @@ msgstr ""
 "Les pilotes sont disponibles sur le <a "
 "href=\"http://support.brother.com\">site Web de Brother</a>."
 
-#: src/ui.vala:1585
+#. 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."
 
-#: src/ui.vala:1587
+#. 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>."
@@ -560,15 +601,18 @@ msgstr ""
 "Les pilotes sont disponibles sur le <a "
 "href=\"http://samsung.com/support\">site Web de Samsung</a>."
 
-#: src/ui.vala:1591
+#. 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."
 
-#: src/ui.vala:1596
+#. 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."
 
-#: src/ui.vala:1598
+#. 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>."
@@ -576,125 +620,139 @@ msgstr ""
 "Les pilotes sont disponibles sur le <a "
 "href=\"http://support.epson.com\">site web d'Epson</a>."
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr "Installer les pilotes"
 
-#: src/ui.vala:1633
+#. 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."
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "Installation des pilotes..."
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "Pilotes installés avec succès !"
 
-#: src/ui.vala:1663
+#. 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)."
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "Impossible d'installer les pilotes."
 
-#: src/ui.vala:1676
+#. 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."
 
-#: src/ui.vala:1784
+#. 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/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (brouillon)"
 
-#: src/ui.vala:1790
+#. 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/ui.vala:1793
+#. 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
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr "Nouveau document"
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr "Document"
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr "Courriel..."
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr "Imprimer..."
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr "Aide"
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr "À propos"
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr "Quitter"
 
-#: src/ui.vala:1889
+#. 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"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "_Installer les pilotes"
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automatique"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr "Plus foncé"
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr "Plus clair"
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr "Moins"
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr "Plus"
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr "Minimum"
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr "Maximum"
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Enregistrement du document..."
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Enregistrement de la page %d sur %d"
diff --git a/po/gd.gmo b/po/gd.gmo
index 3e5b7fa..dbe1ce1 100644
--- a/po/gd.gmo
+++ b/po/gd.gmo
diff --git a/po/gd.po b/po/gd.po
index 8eee031..6a06c42 100644
--- a/po/gd.po
+++ b/po/gd.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "Teacsa"
 msgid "Photo"
 msgstr "Dealbh"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Atharraich òrdugh nan duilleagan"
 
@@ -207,7 +207,7 @@ msgstr "Sganaich"
 msgid "Save document to a file"
 msgstr "Sàbhail an sgrìobhainn mar fhaidhle"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "Sàbhail"
 
@@ -248,8 +248,7 @@ msgstr "Bearr an duilleag a thagh thu"
 msgid "Crop"
 msgstr "Bearr"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "Roghainnean"
 
@@ -329,164 +328,198 @@ msgstr ""
 "Cleachdaidh Sganadh simplidh a' framework SANE gus taic a thoirt dhan "
 "mhòrchuid a sganairean a tha ann."
 
-#: src/scanner.vala:841
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Chan eil sganair sam bith ri làimh. Feuch is ceangail sganair ris."
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Cha b' urrainn dhuinn ceangal ris an sganair."
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Cha b' urrainn tòiseachadh air an sganadh"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Thachair mearachd nuair a bha sinn a' conaltradh ris an sganair"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Seall tionndadh an sgaoilidh"
 
-#: src/simple-scan.vala:24
+#. Help string for command line --debug flag
+#: ../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"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Dh'fhàillig an sganadh"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Goireas sganaidh"
 
-#: src/simple-scan.vala:632
+#. 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 ""
 "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:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr "_Dùin"
 
-#: src/ui.vala:327
+#. 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 ""
 "Tha feum air ainm-cleachdaiche agus facal-faire mus faighear cothrom air "
 "\"%s\""
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Cha deach sganair sam bith a lorg"
 
-#: src/ui.vala:377
+#. 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 "Dèan cinnteach gu bheil sganair ceangailte ris agus gu bheil e air"
 
-#: src/ui.vala:382
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:382
 msgid "Additional software needed"
 msgstr "Tha bathar-bog a dhìth"
 
-#: src/ui.vala:384
+#. Instructions to install driver software
+#: ../src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr "Feumaidh tu bathar-bog draibheir a stàladh airson an sganair agad."
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "Sàbhail mar..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Sguir dheth"
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr "_Sàbhail"
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Sgrìobhainn sganaichte.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "Faidhlichean deilbh"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "Na h-uile faidhle"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF {sgrìobhainn ioma-dhuilleagach}"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (dùmhlaichte)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (gun chall càileachd)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr "Fòrmat an fhaidhle:"
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Cha b' urrainn dhuinn a shàbhaladh ann am faidhle"
 
-#: src/ui.vala:673
+#. 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 ""
 "Mur an sàbhail thu e, thèid atharrachadh sam bith a rinn thu air chall."
 
-#: src/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "A bheil thu airson an sgrìobhainn làithreach a shàbhaladh?"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Tilg air falbh na h-atharraichean"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Cha ghabh an ìomhaigh a shàbhaladh airson a ro-shealladh"
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Chan urrainn dhuinn an aplacaid fhosgladh a ro-sheallas an ìomhaigh"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Cuir còmhla na duilleagan"
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Cuir còmhla na duilleagan (ann an òrdugh contrarra)"
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr "Contrarra"
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Cum gun atharrachadh"
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Chan urrainn dhuinn faidhle na cobharach fhosgladh"
 
-#: src/ui.vala:1472
+#. 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"
@@ -514,15 +547,17 @@ msgstr ""
 "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/>."
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Mu dhèidhinn Sganadh simplidh"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Inneal simplidh airson sganadh sgrìobhainnean"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -530,19 +565,23 @@ msgstr ""
 "  GunChleoc https://launchpad.net/~gunchleoc\n"
 "  alasdair caimbeul https://launchpad.net/~alexd-deactivatedaccount"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "A bheil thu airson an sgrìobhainn a shàbhaladh mus dèan sinn fàgail?"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Fàg gun a shàbhaladh"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "Tha coltas gu bheil sganair Brother agad."
 
-#: src/ui.vala:1581
+#. 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>."
@@ -550,11 +589,13 @@ msgstr ""
 "Tha draibhearan dha ri am faighinn air <a "
 "href=\"http://support.brother.com\">làrach-lìn Brother</a>."
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "Tha coltas gu bheil sganair Samsung agad."
 
-#: src/ui.vala:1587
+#. 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>."
@@ -562,15 +603,18 @@ msgstr ""
 "Tha draibhearan dha ri am faighinn air <a "
 "href=\"http://samsung.com/support\">làrach-lìn Samsung</a>."
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "Tha coltas gu bheil sganair HP agad."
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "Tha coltas gu bheil sganair Epson agad."
 
-#: src/ui.vala:1598
+#. 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>."
@@ -578,126 +622,140 @@ msgstr ""
 "Tha draibhearan dha ri am faighinn air <a "
 "href=\"http://support.epson.com\">làrach-lìn Epson</a>."
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr "Stàlaich na draibhearan"
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 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."
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "A' stàladh nan draibhearan..."
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "Tha na draibhearan air an stàladh!"
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Cha deach leinn na draibhearan a stàladh (còd na mearachd: %d)."
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "Cha deach leinn na draibhearan a stàladh."
 
-#: src/ui.vala:1676
+#. 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 "Feumaidh tu a' phacaid / na pacaidean %s a stàladh."
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (bun-roghainn)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (dreachd)"
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (dùmhlachd-bhreacaidh àrd)"
 
-#: src/ui.vala:1793
+#. 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
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr "Sgrìobhainn ùr"
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr "Sgrìobhainn"
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr "Post-d..."
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr "Clò-bhuail..."
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr "Cobhair"
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr "Mu dhèidhinn"
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr "Fàg an-seo"
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Atharraich an _sganair"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "Stàlaich na dra_ibhearan"
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "Gu fèin-obrachail"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr "Nas duirche"
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr "Nas soilleire"
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr "Nas lugha"
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr "Barrrachd"
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr "As lugha"
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr "As motha"
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr "A' sàbhaladh na sgrìobhainn..."
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, 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
index cc99e74..4458512 100644
--- a/po/gl.gmo
+++ b/po/gl.gmo
diff --git a/po/gl.po b/po/gl.po
index dc568f3..3804134 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "Texto"
 msgid "Photo"
 msgstr "Fotografía"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Reordenar as páxinas"
 
@@ -207,7 +207,7 @@ msgstr "Escanear"
 msgid "Save document to a file"
 msgstr "Gardar o documento nun ficheiro"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "Gardar"
 
@@ -248,8 +248,7 @@ msgstr "Recortar a páxina seleccionada"
 msgid "Crop"
 msgstr "Recortar"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "Preferencias"
 
@@ -327,159 +326,193 @@ msgstr ""
 "Escáner Sinxelo usa o marco de traballo de SANE para ser compatíbel coa "
 "maioría de escáneres existentes."
 
-#: src/scanner.vala:841
+#. 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."
 
-#: src/scanner.vala:871
+#. 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"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Non foi posíbel iniciar o escaneado"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. 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"
 
-#: src/simple-scan.vala:21
+#. 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/simple-scan.vala:24
+#. 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
+#: ../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"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Produciuse un fallo ao escanear"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DISPOSITIVO...] - Utilidade de escaneado"
 
-#: src/simple-scan.vala:632
+#. 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
+#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr "_Pechar"
 
-#: src/ui.vala:327
+#. 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»"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Non se detectou ningún escáner"
 
-#: src/ui.vala:377
+#. 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 "Verifique que o seu escáner está conectado e aceso"
 
-#: src/ui.vala:382
+#. 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"
 
-#: src/ui.vala:384
+#. 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."
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "Gardar como..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr "_Gardar"
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Documento escaneado.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "Ficheiros de imaxes"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "Todos os ficheiros"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (documento de varias páxinas)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimido)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (sen perdas)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr "Formato do ficheiro:"
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Produciuse un fallo ao gardar o ficheiro"
 
-#: src/ui.vala:673
+#. 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 garda o ficheiro, os seus cambios perderanse permanentemente."
 
-#: src/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "Gardar o documento actual?"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Rexeitar os cambios"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Non foi posíbel gardar a imaxe da miniatura"
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Non se pode abrir o aplicativo de vista previa da imaxe"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Combinar lados"
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Combinar lados (inverso)"
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr "Inverter"
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Manter sen cambios"
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Non é posíbel abrir o ficheiro de axuda"
 
-#: src/ui.vala:1472
+#. 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"
@@ -507,15 +540,17 @@ msgstr ""
 "Debe haber recibido una copia de la GNU General Public License\n"
 "con este programa. Si no fuera así, vea <http://www.gnu.org/licenses/>."
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Acerca de Simple Scan"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Ferramenta sinxela de escaneado de documentos"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -525,19 +560,23 @@ msgstr ""
 "  Miguel Anxo Bouzada https://launchpad.net/~mbouzada\n"
 "  Robert Ancell https://launchpad.net/~robert-ancell"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Gardar o documento antes de saír?"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Saír sen gardar"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "Semella que ten un escáner Brother."
 
-#: src/ui.vala:1581
+#. 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>."
@@ -545,11 +584,13 @@ msgstr ""
 "Os controladores para este dispositivo están dispoñíbeis na páxina de <a "
 "href=\"http://support.brother.com\">Brother</a>."
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "Semella ter un escáner Samsung."
 
-#: src/ui.vala:1587
+#. 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>."
@@ -557,15 +598,18 @@ msgstr ""
 "Os controladores para este dispositivo están dispoñíbeis na páxina de <a "
 "href=\"http://samsung.com/support\">Samsung</a>."
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "Semella ter un escáner HP."
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "Semella ter un escáner Epson."
 
-#: src/ui.vala:1598
+#. 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>."
@@ -573,126 +617,140 @@ msgstr ""
 "Os controladores están dispoñíbeis no sitio web de <a "
 "href=\"http://support.epson.com\">Epson</a>."
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr "Instalar controladores"
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Unha vez instalados deberá reiniciar o Escáner Sinxelo."
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "Instalando os controladores..."
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "Os controladores instaláronse correctamente."
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 "Produciuse un fallo na instalación dos controladores (código do erro %d)."
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "Produciuse un fallo na instalación dos controladores."
 
-#: src/ui.vala:1676
+#. 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 "Necesita instalar o paquete(s) %s."
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (predeterminada)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (borrador)"
 
-#: src/ui.vala:1790
+#. 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ón)"
 
-#: src/ui.vala:1793
+#. 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
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr "Novo documento"
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr "Documento"
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr "Correo electrónico..."
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr "Axuda"
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr "Sobre"
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr "Saír"
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Cambiar o _escáner"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "_Instalar controladores"
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automático"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr "Máis escuro"
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr "Máis claro"
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr "Menos"
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr "Máis"
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr "Mínimo"
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr "Máximo"
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Gardando o documento..."
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Gardando páxina %d de %d"
diff --git a/po/he.gmo b/po/he.gmo
index f845214..de0a68a 100644
--- a/po/he.gmo
+++ b/po/he.gmo
diff --git a/po/he.po b/po/he.po
index 4a1f45a..e18dbaa 100644
--- a/po/he.po
+++ b/po/he.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "טקסט"
 msgid "Photo"
 msgstr "צילום"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "סידור הדפים מחדש"
 
@@ -207,7 +207,7 @@ msgstr "סריקה"
 msgid "Save document to a file"
 msgstr "שמירת המסמך לקובץ"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "שמירה"
 
@@ -248,8 +248,7 @@ msgstr "חיתוך העמוד שנבחר"
 msgid "Crop"
 msgstr "חיתוך"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "העדפות"
 
@@ -326,158 +325,192 @@ msgid ""
 msgstr ""
 "סריקה פשוטה משתמשת בסביבת העבודה SANE לטובת תמיכה ברוב הסורקים הזמינים."
 
-#: src/scanner.vala:841
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "אין סורקים זמינים. נא לחבר סורק."
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "לא ניתן להתחבר לסורק"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "לא ניתן להתחיל בסריקה"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "אירעה שגיאה בעת ההתקשרות עם הסורק"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Show release version"
 
-#: src/simple-scan.vala:24
+#. 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
+#: ../src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "תיקון קובצי PDF שנוצרו באמצעות גרסאות ישנות יותר של Simple Scan"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "הסריקה נכשלה"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Scanning utility"
 
-#: src/simple-scan.vala:632
+#. 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 ""
 "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:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr "ס_גירה"
 
-#: src/ui.vala:327
+#. 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'"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "לא נמצאו סורקים"
 
-#: src/ui.vala:377
+#. 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 "יש לבדוק כי הסורק מחובר ומופעל"
 
-#: src/ui.vala:382
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:382
 msgid "Additional software needed"
 msgstr "נדרשות תכניות נוספות"
 
-#: src/ui.vala:384
+#. Instructions to install driver software
+#: ../src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr "עליך להתקין את מנהל ההתקן של הסורק שלך."
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "שמירה בשם..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr "_ביטול"
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr "_שמירה"
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "מסמך סרוק.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "קובצי תמונה"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "כל הקבצים"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (מסמך מרובה עמודים)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (דחוס)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (ללא אבדן נתונים)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr "תבנית הקובץ:"
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "שמירת הקובץ נכשלה"
 
-#: src/ui.vala:673
+#. 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/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "האם לשמור את המסמך הנוכחי?"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "התעלמות מהשינויים"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "לא ניתן לשמור את התמונה לתצוגה מקדימה"
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "לא ניתן לפתוח את היישום להצגה מקדימה של תמונות"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr "שילוב צדדים"
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "שילוב צדדים (הפוך)"
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr "היפוך"
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "להשאיר ללא שינוי"
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "לא ניתן לפתוח את קובץ העזרה"
 
-#: src/ui.vala:1472
+#. 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"
@@ -503,15 +536,17 @@ msgstr ""
 "לתכנית זו אמור להיות מצורף עותק של הרישיון הציבורי הכללי של GNU; במידה שלא, "
 "ניתן לעיין ב־<http://www.gnu.org/licenses/>."
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "על אודות Simple Scan"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "כלי פשוט לסריקת מסמכים"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -523,19 +558,23 @@ msgstr ""
 "  Shlomil https://launchpad.net/~shlomister\n"
 "  Yaron https://launchpad.net/~sh-yaron"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "האם לשמור את המסמך בטרם היציאה?"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "לצאת ללא שמירה"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "נראה כי הסורק המחובר הוא מתוצרת Brother."
 
-#: src/ui.vala:1581
+#. 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>."
@@ -543,11 +582,13 @@ msgstr ""
 "מנהלי ההתקן זמינים ב<a href=\"http://support.brother.com\">אתר של "
 "Brother</a>."
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "נראה כי הסורק המחובר הוא מתוצרת Samsung."
 
-#: src/ui.vala:1587
+#. 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>."
@@ -555,15 +596,18 @@ msgstr ""
 "מנהלי ההתקן זמינים ב<a href=\"http://samsung.com/support\">אתר של "
 "Samsung</a>."
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "נראה כי הסורק המחובר הוא מתוצרת HP."
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "נראה כי הסורק המחובר הוא מתוצרת Epson."
 
-#: src/ui.vala:1598
+#. 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>."
@@ -571,125 +615,139 @@ msgstr ""
 "מנהלי התקן עבור ההתקן זמינים ב<a href=\"http://support.epson.com\">אתר של "
 "Epson</a>."
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr "התקנת מנהלי התקן"
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "לאחר ההתקנה יהיה עליך להפעיל מחדש את סריקה פשוטה."
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "מנהלי ההתקן מותקנים…"
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "מנהלי ההתקנים הותקנו בהצלחה!"
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "התקנת מנהלי ההתקנים נכשלה (קוד שגיאה %d)."
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "התקנת מנהלי ההתקן נכשלה."
 
-#: src/ui.vala:1676
+#. 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 "יהיה עליך להתקין את החבילה/ות %s."
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (בררת מחדל)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (טיוטה)"
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (רזולוציה גבוהה)"
 
-#: src/ui.vala:1793
+#. 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
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr "מסמך חדש"
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr "מסמך"
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr "דוא״ל…"
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr "הדפסה…"
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr "עזרה"
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr "על אודות"
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr "יציאה"
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "ב_חירה בסורק אחר"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "הת_קנת מנהלי התקן"
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "אוטומטי"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr "כהה יותר"
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr "בהיר יותר"
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr "פחות"
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr "יותר"
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr "מזערי"
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr "מרבי"
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr "המסמך נשמר...‏"
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "נשמר העמוד %d מתוך %d"
diff --git a/po/hr.gmo b/po/hr.gmo
index 5608e50..c7b396e 100644
--- a/po/hr.gmo
+++ b/po/hr.gmo
diff --git a/po/hr.po b/po/hr.po
index 4dc6030..a7f947b 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -8,14 +8,14 @@ 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: Launchpad Translations Administrators <Unknown>\n"
+"PO-Revision-Date: 2016-11-26 12:08+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-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-27 05:49+0000\n"
+"X-Generator: Launchpad (build 18282)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "Tekst"
 msgid "Photo"
 msgstr "Fotografija"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Presloži stranice"
 
@@ -176,7 +176,7 @@ msgstr "Pomakni udesno"
 #. Label on help menu
 #: data/simple-scan.ui:624
 msgid "_Help"
-msgstr "_Pomoć"
+msgstr "_Priručnik"
 
 #. Help|Contents menu
 #: data/simple-scan.ui:632
@@ -207,7 +207,7 @@ msgstr "Skeniraj"
 msgid "Save document to a file"
 msgstr "Spremi dokument u datoteku"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "Spremi"
 
@@ -248,8 +248,7 @@ msgstr "Izreži odabranu stranicu"
 msgid "Crop"
 msgstr "Izreži"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "Osobitosti"
 
@@ -307,7 +306,7 @@ msgstr "skeniraj;skener;plosnat;adf;"
 
 #: data/simple-scan.desktop.in:8
 msgid "scanner"
-msgstr ""
+msgstr "skener"
 
 #: data/simple-scan.appdata.xml.in:8
 msgid ""
@@ -328,160 +327,194 @@ msgstr ""
 "Skeniranje dokumenata koristi SANE radni okvir za podršku većine postojećih "
 "skenera."
 
-#: src/scanner.vala:841
+#. 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."
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Nemoguće povezivanje sa skenerom"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Nemoguće pokretanje skenera"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. 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"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Prikaži inačicu izdanja"
 
-#: src/simple-scan.vala:24
+#. 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
+#: ../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"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Neuspjelo skeniranje"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[UREĐAJ...] - Alat za skeniranje"
 
-#: src/simple-scan.vala:632
+#. 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 ""
 "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
+#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr "_Zatvori"
 
-#: src/ui.vala:327
+#. 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'"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Nema otkrivenih skenera"
 
-#: src/ui.vala:377
+#. 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 "Provjerite je li vaš skener spojen i uključen"
 
-#: src/ui.vala:382
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:382
 msgid "Additional software needed"
 msgstr "Potreban je daodatan softver"
 
-#: src/ui.vala:384
+#. 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."
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "Spremi kao..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Odustani"
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr "_Spremi"
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Skenirani dokument.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "Slikovne datoteke"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "Sve datoteke"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (dokument od više stranica)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (sažeto)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (bez gubitaka)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr "Format datoteke:"
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Neuspjelo spremanje datoteke"
 
-#: src/ui.vala:673
+#. 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 "Ako ne spremite, promjene će biti trajno izgubljene."
 
-#: src/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "Spremi trenutni dokument?"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Odbaci promjene"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Neuspjelo spremanje slike za pregled"
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Nemoguće otvaranje aplikacije pregleda slike"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Kombiniraj strane"
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Kombiniraj strane (obrnuto)"
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr "Obrnuto"
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Zadrži nepromijenjeno"
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Nemoguće otvaranje datoteke pomoći"
 
-#: src/ui.vala:1472
+#. 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"
@@ -509,15 +542,17 @@ msgstr ""
 "Trebali ste dobiti primjerak GNU Opće javne licence uz ovaj\n"
 "program. Ako niste pogledajte <http://www.gnu.org/licenses/>."
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "O skeniranju dokumenata"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Alat za jednostavno skeniranje"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -530,19 +565,23 @@ msgstr ""
 "  jfk- https://launchpad.net/~jfk-\n"
 "  student4 https://launchpad.net/~iputnik-msn"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Spremi dokument prije zatvaranja?"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Zatvori bez spremanja"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "Izgleda kako imate Brother skener."
 
-#: src/ui.vala:1581
+#. 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>."
@@ -550,11 +589,13 @@ msgstr ""
 "Upravljački programi su dostupni na <a "
 "href=\"http://support.brother.com\">Brother web stranici</a>."
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "Izgleda kako imate Samsung skener."
 
-#: src/ui.vala:1587
+#. 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>."
@@ -562,15 +603,18 @@ msgstr ""
 "Upravljački programi su dostupni na <a "
 "href=\"http://samsung.com/support\">Samsung web stranici</a>."
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "Izgleda kako imate HP skener."
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "Izgleda kako imate Epson skener."
 
-#: src/ui.vala:1598
+#. 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>."
@@ -578,126 +622,140 @@ msgstr ""
 "Upravljački programi za ovaj pisač su dostupi na <a "
 "href=\"http://support.epson.com\">Epson web stranici</a>."
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr "Instaliraj upravljački program"
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 "Jednom kada se instalira, morate ponovno pokrenuti Skeniranje dokumenata."
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "Instalacija upravljačkih programa..."
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "Upravljački programi su uspješno instalirani!"
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Neuspjela instalacija upravljačkih programa (kôd greške %d)."
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "Neuspjela instalacija upravljačkih programa."
 
-#: src/ui.vala:1676
+#. 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 "Morate instalirati %s package(s)."
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (zadano)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (skica)"
 
-#: src/ui.vala:1790
+#. 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/ui.vala:1793
+#. 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
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr "Novi dokument"
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr "Dokument"
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr "E-pošta..."
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr "Ispiši…"
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
-msgstr "Pomoć"
+msgstr "Priručnik"
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr "O programu"
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr "Zatvori"
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Promijeni _skener"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "_Instaliraj upravljačke programe"
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automatska"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr "Tamnije"
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr "Svjetlije"
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr "Manje"
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr "Više"
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr "Najmanje"
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr "Najviše"
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Spremanje dokumenta..."
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Spremanje stranice %d od %d"
diff --git a/po/hu.gmo b/po/hu.gmo
index 39775b3..7c8edc9 100644
--- a/po/hu.gmo
+++ b/po/hu.gmo
diff --git a/po/hu.po b/po/hu.po
index f749495..848ef75 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "Szöveg"
 msgid "Photo"
 msgstr "Fénykép"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Oldalak újrarendezése"
 
@@ -207,7 +207,7 @@ msgstr "Szkennelés"
 msgid "Save document to a file"
 msgstr "Dokumentum fájlba mentése"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "Mentés"
 
@@ -248,8 +248,7 @@ msgstr "A kiválasztott oldal vágása"
 msgid "Crop"
 msgstr "Vágás"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "Beállítások"
 
@@ -327,159 +326,193 @@ msgstr ""
 "A Simple Scan a SANE keretrendszert használja a legtöbb létező szkenner "
 "támogatása érdekében."
 
-#: src/scanner.vala:841
+#. 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."
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Nem sikerült csatlakozni a szkennerhez"
 
-#: src/scanner.vala:1223
+#. 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"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. 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"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Verziószám megjelenítése"
 
-#: src/simple-scan.vala:24
+#. 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
+#: ../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"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "A szkennelés meghiúsult"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ESZKÖZ…] – Szkennelő segédprogram"
 
-#: src/simple-scan.vala:632
+#. 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 ""
 "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
+#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr "_Bezárás"
 
-#: src/ui.vala:327
+#. 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"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Nem található szkenner"
 
-#: src/ui.vala:377
+#. 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 ""
 "Ellenőrizze, hogy a szkenner csatlakoztatva van, és be van-e kapcsolva"
 
-#: src/ui.vala:382
+#. 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"
 
-#: src/ui.vala:384
+#. 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."
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "Mentés másként…"
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Mégse"
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr "_Mentés"
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Szkennelt dokumentum.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "Képfájlok"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "Minden fájl"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (többoldalas dokumentum)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (tömörített)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (veszteségmentes)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr "Fájlformátum:"
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "A fájl mentése sikertelen"
 
-#: src/ui.vala:673
+#. 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 "Ha nem ment, akkor a változtatások véglegesen elvesznek."
 
-#: src/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "Mentse az aktuális dokumentumot?"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Módosítások eldobása"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "A képfájlt nem lehet elmenteni előnézethez"
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Nem nyitható meg az előnézetet megjelenítő alkalmazás"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Oldalak egyesítése"
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Oldalak egyesítése (fordított)"
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr "Fordított"
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Maradjon változatlan"
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "A súgófájl nem nyitható meg"
 
-#: src/ui.vala:1472
+#. 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"
@@ -506,15 +539,17 @@ msgstr ""
 "A programhoz a GNU General Public License egy példánya is jár, ha nem kapta "
 "meg, itt elolvashatja: <http://www.gnu.org/licenses/>."
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Simple Scan névjegye"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Egyszerű dokumentumszkennelés"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -530,19 +565,23 @@ msgstr ""
 "  csola48 https://launchpad.net/~mail-csordaslaszlo\n"
 "  Úr Balázs https://launchpad.net/~urbalazs"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Menti a dokumentumot kilépés előtt?"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Kilépés mentés nélkül"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "Úgy tűnik, Brother márkájú szkennere van."
 
-#: src/ui.vala:1581
+#. 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>."
@@ -550,11 +589,13 @@ msgstr ""
 "Ehhez a <a href=\"http://support.brother.com\">Brother weboldaláról</a> "
 "érhetők el illesztőprogramok."
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "Úgy tűnik, Samsung márkájú szkennere van."
 
-#: src/ui.vala:1587
+#. 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>."
@@ -562,15 +603,18 @@ msgstr ""
 "Ehhez a <a href=\"http://samsung.com/support\">Samsung weboldaláról</a> "
 "érhetők el illesztőprogramok."
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "Úgy tűnik, HP márkájú szkennere van."
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "Úgy tűnik, Epson márkájú szkennere van."
 
-#: src/ui.vala:1598
+#. 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>."
@@ -578,125 +622,139 @@ msgstr ""
 "Ehhez az <a href=\"http://support.epson.com\">Epson weboldaláról</a> érhetők "
 "el illesztőprogramok."
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr "Illesztőprogramok telepítése"
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "A telepítés után újra kell indítania a Simple Scant."
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "Illesztőprogramok telepítése…"
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "Az illesztőprogramok sikeresen telepítve"
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Az illesztőprogramok telepítése meghiúsult (hibakód: %d)."
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "Az illesztőprogramok telepítése meghiúsult."
 
-#: src/ui.vala:1676
+#. 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 "Telepíteni kell a következő csomagokat: %s."
 
-#: src/ui.vala:1784
+#. 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/ui.vala:1787
+#. 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/ui.vala:1790
+#. 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/ui.vala:1793
+#. 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
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr "Új dokumentum"
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr "Dokumentum"
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr "E-mail…"
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr "Nyomtatás…"
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr "Súgó"
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr "Névjegy"
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr "Kilépés"
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "_Szkennerváltás"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "_Illesztőprogramok telepítése"
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automatikus"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr "Sötétebb"
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr "Világosabb"
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr "Kevesebb"
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr "Több"
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr "Minimum"
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr "Maximum"
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Dokumentum mentése..."
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "%d. oldal mentése, összesen %d"
diff --git a/po/hy.gmo b/po/hy.gmo
index 22b6cc7..aa097de 100644
--- a/po/hy.gmo
+++ b/po/hy.gmo
diff --git a/po/hy.po b/po/hy.po
index 55060af..d9a005e 100644
--- a/po/hy.po
+++ b/po/hy.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr ""
 msgid "Photo"
 msgstr ""
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr ""
 
@@ -207,7 +207,7 @@ msgstr ""
 msgid "Save document to a file"
 msgstr ""
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr ""
 
@@ -248,8 +248,7 @@ msgstr ""
 msgid "Crop"
 msgstr ""
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr ""
 
@@ -322,157 +321,191 @@ msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#: src/scanner.vala:841
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr ""
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr ""
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr ""
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr ""
 
-#: src/simple-scan.vala:24
+#. Help string for command line --debug flag
+#: ../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 ""
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr ""
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
-#: src/simple-scan.vala:632
+#. 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
+#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr ""
 
-#: src/ui.vala:327
+#. 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 ""
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr ""
 
-#: src/ui.vala:377
+#. 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 ""
 
-#: src/ui.vala:382
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#: src/ui.vala:384
+#. Instructions to install driver software
+#: ../src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr ""
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr ""
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr ""
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr ""
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr ""
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr ""
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr ""
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr ""
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr ""
 
-#: src/ui.vala:673
+#. 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/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr ""
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr ""
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr ""
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr ""
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr ""
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr ""
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr ""
 
-#: src/ui.vala:1472
+#. 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"
@@ -488,181 +521,206 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr ""
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Serj Safarian https://launchpad.net/~safarian"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr ""
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr ""
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#: src/ui.vala:1581
+#. 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 ""
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#: src/ui.vala:1587
+#. 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 ""
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#: src/ui.vala:1598
+#. 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 ""
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#: src/ui.vala:1676
+#. 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 ""
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
-#: src/ui.vala:1793
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: src/ui.vala:1835
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr ""
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr ""
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr ""
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr ""
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr ""
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr ""
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr ""
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr ""
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr ""
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr ""
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr ""
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr ""
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr ""
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr ""
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr ""
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/id.gmo b/po/id.gmo
index 38c474a..a2846de 100644
--- a/po/id.gmo
+++ b/po/id.gmo
diff --git a/po/id.po b/po/id.po
index dbb2dc0..08fd976 100644
--- a/po/id.po
+++ b/po/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "Teks"
 msgid "Photo"
 msgstr "Foto"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Atur Ulang Halaman"
 
@@ -207,7 +207,7 @@ msgstr "Pindai"
 msgid "Save document to a file"
 msgstr ""
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr ""
 
@@ -248,8 +248,7 @@ msgstr ""
 msgid "Crop"
 msgstr ""
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "Preferensi"
 
@@ -327,158 +326,192 @@ msgstr ""
 "Simple Scan memakai framework SANE untuk mendukung kebanyakan pemindai yang "
 "ada."
 
-#: src/scanner.vala:841
+#. 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."
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Tak dapat terhubung ke pemindai"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Tak dapat memulai pemindaian"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. 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"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Tampilkan versi rilis"
 
-#: src/simple-scan.vala:24
+#. 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
+#: ../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"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Gagal memindai"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[PERANGKAT...] - Utilitas pemindaian"
 
-#: src/simple-scan.vala:632
+#. 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
+#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr "_Tutup"
 
-#: src/ui.vala:327
+#. 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'"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Tidak ada pemindai yang terdeteksi"
 
-#: src/ui.vala:377
+#. 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 ""
 "Mohon periksa apakah pemindai Anda terhubung dan dalam keadaan menyala"
 
-#: src/ui.vala:382
+#. 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"
 
-#: src/ui.vala:384
+#. 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."
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "Simpan Sebagai..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Batal"
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr "_Simpan"
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Dokumen Hasil Pindai.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "Berkas Citra"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "Semua Berkas"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (dokumen multi-halaman)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (terkompresi)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (lossless)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr "Format berkas:"
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Gagal menyimpan berkas"
 
-#: src/ui.vala:673
+#. 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 "Jika Anda tidak menyimpan, perubahan akan hilang secara permanen."
 
-#: src/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "Simpan dokumen saat ini?"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Buang Perubahan"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Tak dapat menyimpan gambar untuk pratinjau"
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Tidak dapat membuka aplikasi pratinjau gambar"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Kombinasikan sisi-sisi"
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Kombinasikan sisi-sisi (balik)"
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr "Balikkan"
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Biarkan tak berubah"
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Tak dapat membuka berkas bantuan"
 
-#: src/ui.vala:1472
+#. 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"
@@ -505,15 +538,17 @@ msgstr ""
 "Anda seharusnya mendapat salinan GNU General Public License\n"
 "bersama program ini. Bila tidak, lihat <http://www.gnu.org/licenses/>."
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Tentang Simple Scan"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Alat pemindai dokumen sederhana"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -531,19 +566,23 @@ msgstr ""
 "  idham khaidir https://launchpad.net/~kenzoabeta\n"
 "  jemmy surya https://launchpad.net/~jemmy"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Simpan dokumen sebelum keluar"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Keluar tanpa menyimpan"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "Nampaknya Anda punya pemindai Brother."
 
-#: src/ui.vala:1581
+#. 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>."
@@ -551,11 +590,13 @@ msgstr ""
 "Penggerak bagi ini tersedia di <a href=\"http://support.brother.com\">situs "
 "web Brother</a>."
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "Nampaknya Anda punya pemindai Samsung."
 
-#: src/ui.vala:1587
+#. 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>."
@@ -563,15 +604,18 @@ msgstr ""
 "Penggerak bagi ini tersedia di <a href=\"http://samsung.com/support\">situs "
 "web Samsung</a>."
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "Nampaknya Anda punya pemindai HP."
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "Nampaknya Anda punya pemindai Epson."
 
-#: src/ui.vala:1598
+#. 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>."
@@ -579,125 +623,139 @@ msgstr ""
 "Penggerak bagi ini tersedia di <a href=\"http://support.epson.com\">situs "
 "web Epson</a>."
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr "Pasang penggerak"
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Sekali terpasang Anda perlu memulai ulang Simple Scan."
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "Memasang penggerak..."
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "Penggerak sukses terpasang!"
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Gagal memasang penggerak (kode kesalahan %d)."
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "Gagal memasang penggerak."
 
-#: src/ui.vala:1676
+#. 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."
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (default)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (draft)"
 
-#: src/ui.vala:1790
+#. 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)"
 
-#: src/ui.vala:1793
+#. 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
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr "Dokumen Baru"
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr "Dokumen"
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr "Surel..."
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr "Cetak..."
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr "Bantuan"
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr "Perihal"
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr "Keluar"
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Ganti _Pemindai"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "_Pasang Penggerak"
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "Otomatis"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr "Lebih Gelap"
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr "Lebih Terang"
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr "Kurang"
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr "Lebih"
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr "Minimum"
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr "Maksimum"
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Menyimpan dokumen..."
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Menyimpan halaman %d dari %d"
diff --git a/po/it.gmo b/po/it.gmo
index 5238fe4..51d0cc5 100644
--- a/po/it.gmo
+++ b/po/it.gmo
diff --git a/po/it.po b/po/it.po
index 1756b63..ad7d43f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "Testo"
 msgid "Photo"
 msgstr "Foto"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Riordina pagine"
 
@@ -207,7 +207,7 @@ msgstr "Acquisisci"
 msgid "Save document to a file"
 msgstr "Salva documento in un file"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "Salva"
 
@@ -248,8 +248,7 @@ msgstr "Ritaglia la pagina selezionata"
 msgid "Crop"
 msgstr "Ritaglia"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "Preferenze"
 
@@ -328,160 +327,194 @@ msgstr ""
 "Simple Scan usa il framework SANE per supportare il maggior numero di "
 "scanner esistenti."
 
-#: src/scanner.vala:841
+#. 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."
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Impossibile connettersi allo scanner"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Impossibile avviare l'acquisizione"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. 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"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Mostra la versione del rilascio"
 
-#: src/simple-scan.vala:24
+#. 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
+#: ../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"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Acquisizione non riuscita"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DISPOSITIVO...] - Strumento per l'acquisizione"
 
-#: src/simple-scan.vala:632
+#. 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 ""
 "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
+#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr "_Chiudi"
 
-#: src/ui.vala:327
+#. 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»"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Nessuno scanner rilevato"
 
-#: src/ui.vala:377
+#. 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 "Controllare che lo scanner sia collegato e acceso"
 
-#: src/ui.vala:382
+#. 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"
 
-#: src/ui.vala:384
+#. 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."
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "Salva come..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr "A_nnulla"
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr "_Salva"
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Documento-acquisito.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "File immagine"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "Tutti i file"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (documento multi-pagina)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (compresso)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (senza perdita di qualità)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr "Formato file:"
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Salvataggio file non riuscito"
 
-#: src/ui.vala:673
+#. 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/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "Salvare il documento corrente?"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Scarta le modifiche"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Impossibile salvare l'immagine per l'anteprima"
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr ""
 "Impossibile aprire l'applicazione per la visualizzazione delle anteprime"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Unisci lati"
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Unisci lati (inverso)"
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr "Inverso"
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Mantieni non modificato"
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Impossibile aprire il file di aiuto"
 
-#: src/ui.vala:1472
+#. 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"
@@ -511,15 +544,17 @@ msgstr ""
 "la licenza in Inglese con validità legale consultate "
 "<http://www.gnu.org/licenses/>."
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Informazioni su Simple Scan"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Semplice strumento per l'acquisizione di documenti"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -545,19 +580,23 @@ msgstr ""
 "  matrobriva https://launchpad.net/~matrobriva\n"
 "  phede92 https://launchpad.net/~phede92"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Salvare il documento prima di uscire?"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Esci senza salvare"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "Sembra essere uno scanner «Brother»."
 
-#: src/ui.vala:1581
+#. 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>."
@@ -565,11 +604,13 @@ msgstr ""
 "I driver per questo dispositivo sono disponibili sul <a "
 "href=\"http://support.brother.com\">sito web Brother</a>."
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "Sembra essere uno scanner «Samsung»."
 
-#: src/ui.vala:1587
+#. 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>."
@@ -577,15 +618,18 @@ msgstr ""
 "I driver per questo dispositivo sono disponibili sul <a "
 "href=\"http://samsung.com/support\">sito web Samsung</a>."
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "Sembra essere uno scanner «HP»."
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "Sembra essere uno scanner «Epson»."
 
-#: src/ui.vala:1598
+#. 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>."
@@ -593,126 +637,140 @@ msgstr ""
 "I driver sono disponibili dal <a href=\"http://support.epson.com\">sito web "
 "Epson</a>."
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr "Installazione dei driver"
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 "Una volta completata l'installazione sarà necessario riavviare Simple Scan."
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "Installazione dei driver..."
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "Driver installati con successo."
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Installazione dei driver non riuscita (codice errore %d)."
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "Installazione driver non riuscita."
 
-#: src/ui.vala:1676
+#. 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 "È necessario installare i seguenti pacchetti: %s."
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (predefinita)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (bozza)"
 
-#: src/ui.vala:1790
+#. 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)"
 
-#: src/ui.vala:1793
+#. 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
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr "Nuovo documento"
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr "Documento"
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr "Email..."
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr "Stampa..."
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr "Aiuto"
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr "Informazioni"
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr "Esci"
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Cambia _scanner"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "_Installa driver"
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automatico"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr "Più scura"
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr "Più chiara"
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr "Minore"
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr "Maggiore"
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr "Minima"
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr "Massima"
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Salvataggio del documento..."
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Salvataggio pagina %d di %d"
diff --git a/po/ja.gmo b/po/ja.gmo
index fbb3ce2..850cd45 100644
--- a/po/ja.gmo
+++ b/po/ja.gmo
diff --git a/po/ja.po b/po/ja.po
index d93c80b..424e9ad 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "テキスト"
 msgid "Photo"
 msgstr "写真"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "ページを再整列"
 
@@ -207,7 +207,7 @@ msgstr "スキャン"
 msgid "Save document to a file"
 msgstr "ドキュメントをファイルに保存"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "保存"
 
@@ -248,8 +248,7 @@ msgstr "選択した範囲の切り抜き"
 msgid "Crop"
 msgstr "切り抜き"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "設定"
 
@@ -324,157 +323,191 @@ msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr "シンプル スキャンはSANE フレームワークを採用しており、多数の既存スキャナに対応しています。"
 
-#: src/scanner.vala:841
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "利用可能なスキャナがありません。スキャナを接続してください。"
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "スキャナに接続できません"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "スキャンを開始できません"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "スキャナとの通信に失敗しました"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "リリースバージョンを表示"
 
-#: src/simple-scan.vala:24
+#. Help string for command line --debug flag
+#: ../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ファイルを修復する"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "スキャンに失敗しました"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[デバイス...] - スキャンユーティリティ"
 
-#: src/simple-scan.vala:632
+#. 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/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr "閉じる(_C)"
 
-#: src/ui.vala:327
+#. 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' にアクセスするにはユーザ名とパスワードが必要です"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "スキャナが検出されていません"
 
-#: src/ui.vala:377
+#. 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 "スキャナが接続されて電源が入っているか確認してください"
 
-#: src/ui.vala:382
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:382
 msgid "Additional software needed"
 msgstr "追加ソフトウェアが必要です"
 
-#: src/ui.vala:384
+#. Instructions to install driver software
+#: ../src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr "スキャナに対応したドライバー ソフトウェアをインストールする必要があります。"
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "名前を付けて保存..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr "キャンセル(_C)"
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr "保存(_S)"
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "スキャンされたドキュメント.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "画像ファイル"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "すべてのファイル"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (複数ページ)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (圧縮済み)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (ロスレス)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr "ファイルフォーマット:"
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "ファイルの保存に失敗しました"
 
-#: src/ui.vala:673
+#. 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/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "現在のドキュメントを保存しますか?"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "変更を破棄"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "プレビュー用の画像を保存できません"
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "画像プレビューアプリケーションを開けませんでした"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr "面を結合"
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "面を結合(逆順)"
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr "逆順"
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "無変更を維持"
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "ヘルプファイルを開くことができません"
 
-#: src/ui.vala:1472
+#. 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"
@@ -502,15 +535,17 @@ msgstr ""
 "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/>."
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Simple Scan について"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "ドキュメントのスキャンを行うシンプルなツールです"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -526,19 +561,23 @@ msgstr ""
 "  Tosiki Iga https://launchpad.net/~tosiki-iga\n"
 "  kaneisland https://launchpad.net/~kaneisland"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "終了する前にドキュメントを保存しますか?"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "保存せずに終了"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "ブラザー製スキャナーを見つけました。"
 
-#: src/ui.vala:1581
+#. 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>."
@@ -546,11 +585,13 @@ msgstr ""
 "このスキャナーのドライバーは、<a "
 "href=\"http://support.brother.com\">Brotherのウェブサイト</a>から入手できます。"
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "Samsung製スキャナーを見つけました。"
 
-#: src/ui.vala:1587
+#. 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>."
@@ -558,140 +599,157 @@ msgstr ""
 "このスキャナーのドライバーは、<a href=\"http://samsung.com/support\">Samsungのウェブサイト</a> "
 "から入手できます。"
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "HP製スキャナーを見つけました。"
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "エプソン製スキャナーを見つけました。"
 
-#: src/ui.vala:1598
+#. 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 ""
 "このスキャナーのドライバーは、<a href=\"http://support.epson.com\">Epsonウェブサイト</a>から入手できます。"
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr "ドライバーのインストール手順"
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "ドライバーのインストール後、シンプル スキャンを再起動する必要があります。"
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "ドライバーをインストールしています..."
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "ドライバーのインストールに成功しました!"
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "ドライバーのインストールに失敗しました(エラーコード %d)。"
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "ドライバーのインストールに失敗しました。"
 
-#: src/ui.vala:1676
+#. 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 "%s パッケージをインストールする必要があります。"
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (標準)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (ドラフト)"
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (高解像度)"
 
-#: src/ui.vala:1793
+#. 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
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr "新しいドキュメント"
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr "ドキュメント"
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr "メール..."
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr "印刷..."
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr "ヘルプ"
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr "このプログラムについて"
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr "終了"
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "スキャナを変更(_S)"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "ドライバーをインストール (_I)"
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "自動"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr "暗く"
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr "明るく"
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr "弱く"
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr "強く"
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr "最小"
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr "最大"
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr "ドキュメントを保存しています..."
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "%2$dページ中%1$dページを保存しています"
diff --git a/po/kk.gmo b/po/kk.gmo
index 077ad70..a63021f 100644
--- a/po/kk.gmo
+++ b/po/kk.gmo
diff --git a/po/kk.po b/po/kk.po
index 501e24a..053ca30 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "Мәтін"
 msgid "Photo"
 msgstr "Фото"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr ""
 
@@ -207,7 +207,7 @@ msgstr "Іздеу"
 msgid "Save document to a file"
 msgstr ""
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "Сақтау"
 
@@ -248,8 +248,7 @@ msgstr ""
 msgid "Crop"
 msgstr "Қиып жіберу"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "Баптаулары"
 
@@ -322,157 +321,191 @@ msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#: src/scanner.vala:841
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr ""
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr ""
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr ""
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr ""
 
-#: src/simple-scan.vala:24
+#. Help string for command line --debug flag
+#: ../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 ""
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr ""
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
-#: src/simple-scan.vala:632
+#. 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
+#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr ""
 
-#: src/ui.vala:327
+#. 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 ""
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr ""
 
-#: src/ui.vala:377
+#. 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 ""
 
-#: src/ui.vala:382
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#: src/ui.vala:384
+#. Instructions to install driver software
+#: ../src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "Қалайша сақтау..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr ""
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr ""
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr ""
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "Бүкіл файлдар"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr ""
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr ""
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr ""
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr ""
 
-#: src/ui.vala:673
+#. 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/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr ""
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Өзгерістерді ысырып тастау"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr ""
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr ""
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr ""
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr ""
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Көмек ақпараты файлын ашу мүмкін емес"
 
-#: src/ui.vala:1472
+#. 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"
@@ -488,182 +521,207 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr ""
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  arruah https://launchpad.net/~arruah\n"
 "  jmb_kz https://launchpad.net/~jmb-kz"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr ""
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr ""
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#: src/ui.vala:1581
+#. 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 ""
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#: src/ui.vala:1587
+#. 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 ""
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#: src/ui.vala:1598
+#. 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 ""
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#: src/ui.vala:1676
+#. 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 ""
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
-#: src/ui.vala:1793
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: src/ui.vala:1835
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr ""
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr ""
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr ""
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr ""
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr ""
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr ""
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr ""
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "Авто"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr ""
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr ""
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr ""
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr ""
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr ""
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr ""
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr ""
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/km.gmo b/po/km.gmo
index 9909312..4bbf262 100644
--- a/po/km.gmo
+++ b/po/km.gmo
diff --git a/po/km.po b/po/km.po
index cebfa18..21bc234 100644
--- a/po/km.po
+++ b/po/km.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "អត្ថបទ"
 msgid "Photo"
 msgstr "រូបថត"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "ការរៀបចំទំព័រ"
 
@@ -207,7 +207,7 @@ msgstr "ស្កេន"
 msgid "Save document to a file"
 msgstr "រក្សាទុក​ឯកសារ​ទៅ​ឯកសារ"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "រក្សាទុក"
 
@@ -248,8 +248,7 @@ msgstr "ច្រឹប​ទំព័រ​ដែល​បាន​ជ្រើ
 msgid "Crop"
 msgstr "ច្រឹប"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "ចំណូលចិត្ត"
 
@@ -322,163 +321,197 @@ msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#: src/scanner.vala:841
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "ពុំ​មាន​ម៉ាស៊ីន​ស្កេន​ទេ សូម​តភ្ជាប់​ម៉ាស៊ីន​ស្កេន ។"
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "មិន​អាច​តភ្ជាប់​ម៉ាស៊ីន​ស្កេន​បាន​ទេ"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "មិន​អាច​ចាប់ផ្ដើម​ស្កេន​បាន​ទេ"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "កំហុស​ក្នុង​ការ​ទាក់ទង​ទៅកាន់​ម៉ាស៊ីន​ស្កេន"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "បង្ហាញ​កំណែ​ការ​ចេញផ្សាយ"
 
-#: src/simple-scan.vala:24
+#. Help string for command line --debug flag
+#: ../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 ដែល​បាន​បង្កើត​ជាមួយ​កំណែ​ចាស់​របស់​ម៉ាស៊ីន​ស្កេន​ធម្មតា"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ស្កេន"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ឧបករណ៍...] - ការ​ស្កេន​ឧបករណ៍​ប្រើប្រាស់"
 
-#: src/simple-scan.vala:632
+#. 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/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr "បិទ"
 
-#: src/ui.vala:327
+#. 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'"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "រក​មិន​ឃើញ​ម៉ាស៊ីន​ស្កេន"
 
-#: src/ui.vala:377
+#. 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 ""
 "សូម​ពិនិត្យមើល​ម៉ាស៊ីន​ស្កេន​របស់​អ្នក​ថា​តើ​បាន​តភ្ជាប់ "
 "និង​បើក​កុងតាក់​ហើយ​ឬនៅ"
 
-#: src/ui.vala:382
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#: src/ui.vala:384
+#. Instructions to install driver software
+#: ../src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "រក្សាទុក​ជា..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr "បោះបង់"
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr "រក្សាទុក"
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Document.pdf ដែល​បាន​ស្កេន"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "ឯកសារ​រូបភាព"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "ឯកសារ​ទាំងអស់"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (ឯកសារ​ច្រើន​ទំព័រ)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (បាន​បង្ហាប់)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (គ្មាន​ការ​បាត់បង់)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr "ទ្រង់ទ្រាយ​ឯកសារ ៖"
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​រក្សាទុក​ឯកសារ"
 
-#: src/ui.vala:673
+#. 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/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "រក្សាទុក​ឯកសារ​បច្ចុប្បន្ន ?"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "បោះបង់​ការ​ផ្លាស់ប្ដូរ"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "មិន​អាច​រក្សាទុក​រូបភាព​សម្រាប់​ការ​មើល​ជាមុន​បាន​ទេ"
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "មិន​អាច​បើក​កម្មវិធី​មើល​រូបភាព​ជាមុន​បាន​ទេ"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr "ផ្សំភាគី"
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "ផ្សំភាគី (បញ្ច្រាស)"
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr "បញ្ច្រាស"
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "រក្សា​ឱ្យមិនមានការ​ផ្លាស់​ប្តូ​រ"
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "មិន​អាច​បើក​ឯកសារ​ជំនួយ​បាន​ទេ"
 
-#: src/ui.vala:1472
+#. 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"
@@ -507,15 +540,17 @@ msgstr ""
 "ជាមួយ​កម្មវិធី​នេះ ។ ប្រសិនបើ​មិន​បាន​ទទួល​ទេ "
 "សូម​មើល<http://www.gnu.org/licenses/> ។"
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "អំពី​ការ​ស្កេន​ធម្មតា"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "ឧបករណ៍​ស្កេន​ធម្មតា"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -524,167 +559,190 @@ msgstr ""
 "  Rockworld https://launchpad.net/~rockrock2222222\n"
 "  Seng Sutha https://launchpad.net/~sutha"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "រក្សាទុក​ឯកសារ​មុន​ពេល​បិទ​ឬ ?"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "បិទ​ដោយ​មិន​រក្សាទុក"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#: src/ui.vala:1581
+#. 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 ""
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#: src/ui.vala:1587
+#. 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 ""
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#: src/ui.vala:1598
+#. 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 ""
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#: src/ui.vala:1676
+#. 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 ""
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (លំនាំដើម)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (ពង្រាង)"
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (គុណភាព​បង្ហាញ​ខ្ពស់)"
 
-#: src/ui.vala:1793
+#. 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
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr "ឯកសារ​ថ្មី"
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr "ឯកសារ"
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr "អ៊ីមេល..."
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr "បោះពុម្ព..."
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr "ជំនួយ​"
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr "អំពី"
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr "ចេញ"
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "ប្ដូរ​ម៉ាស៊ីន​ស្កេន"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "ស្វ័យប្រវត្តិ"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr "ងងឹត"
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr "ស្រាល"
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr "តិចជាង"
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr "ផ្សេងទៀត"
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr "អប្បបរមា"
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr "អតិបរមា"
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr "កំពុង​រក្សាទុក​ឯកសារ..."
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "រក្សាទុក​ទំព័រ %d ផុត​សម័យ %d"
diff --git a/po/ko.gmo b/po/ko.gmo
index 98e371a..8882be7 100644
--- a/po/ko.gmo
+++ b/po/ko.gmo
diff --git a/po/ko.po b/po/ko.po
index 6c639bb..84e2caf 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "텍스트"
 msgid "Photo"
 msgstr "사진"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "페이지 다시 정렬"
 
@@ -207,7 +207,7 @@ msgstr "스캔"
 msgid "Save document to a file"
 msgstr "파일로 문서 저장하기"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "저장"
 
@@ -248,8 +248,7 @@ msgstr "선택한 페이지 자르기"
 msgid "Crop"
 msgstr "잘라내기"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "기본 설정"
 
@@ -324,157 +323,191 @@ msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr "심플 스캔은 현존하는 거의 모든 스캐너들을 지원하는 SANE 프레임워크를 사용합니다."
 
-#: src/scanner.vala:841
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "사용할 수 있는 스캐너가 없습니다. 스캐너를 연결하세요."
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "스캐너에 연결할 수 없음"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "스캔을 시작할 수 없음"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "스캐너와의 통신 에러"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "릴리즈 버전 보이기"
 
-#: src/simple-scan.vala:24
+#. Help string for command line --debug flag
+#: ../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 파일 고치기"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "스캔 실패"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[장치...] - 스캐닝 도구"
 
-#: src/simple-scan.vala:632
+#. 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/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr "닫기(_C)"
 
-#: src/ui.vala:327
+#. 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'에 접근하려면 사용자 이름과 암호가 필요합니다"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "감지된 스캐너 없음"
 
-#: src/ui.vala:377
+#. 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 "스캐너와 연결되어있는지, 전원이 켜져 있는지 확인해 주세요"
 
-#: src/ui.vala:382
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:382
 msgid "Additional software needed"
 msgstr "추가 소프트웨어 필요"
 
-#: src/ui.vala:384
+#. Instructions to install driver software
+#: ../src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr "스캐너용 드라이버를 설치해야 합니다."
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "다른 이름으로 저장..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr "취소(_C)"
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr "저장(_S)"
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "스캔한 문서.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "그림 파일"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "모든 파일"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (복수 페이지 문서)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (압축된)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (무손실)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr "파일 형식:"
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "파일 저장 실패"
 
-#: src/ui.vala:673
+#. 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/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "현재 문서를 저장하시겠습니까?"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "바뀐 내용 버리기"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "미리 보기 그림을 저장할 수 없습니다."
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "그림 미리보기 프로그램을 열 수 없습니다"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr "측면 결합"
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "측면 결합(역순)"
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr "역순"
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "바꾸지 않은 상태 유지"
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "도움말 파일을 열 수 없습니다"
 
-#: src/ui.vala:1472
+#. 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"
@@ -502,15 +535,17 @@ msgstr ""
 "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/>."
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "심플 스캔 소개"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "간단한 문서 스캐닝 도구"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -525,170 +560,193 @@ msgstr ""
 "  Sunil https://launchpad.net/~sodoetha\n"
 "  atto https://launchpad.net/~kpsman"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "종료하기 전에 문서를 저장하시겠습니까?"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "저장하지 않고 종료"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "Brother 스캐너를 가지고 계신 것 같습니다"
 
-#: src/ui.vala:1581
+#. 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 ""
 "사용 가능한 드라이버 확인 <a href=\"http://support.brother.com\">Brother website</a>."
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "삼성 스캐너를 가지고 계신 것 같습니다."
 
-#: src/ui.vala:1587
+#. 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 ""
 "사용 가능한 드라이버 확인 <a href=\"http://samsung.com/support\">Samsung website</a>."
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "HP 스캐너를 가지고 계신 것 같습니다."
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "Epson 스캐너를 가지고 계신 것 같습니다."
 
-#: src/ui.vala:1598
+#. 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 ""
 "사용 가능한 드라이버 확인 <a href=\"http://support.epson.com\">Epson website</a>."
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr "드라이버 설치"
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "드라이버 설치 후엔 심플 스캔을  다시 시작해야 합니다."
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "드라이버를 설치하고 있습니다..."
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "드라이버를 설치했습니다!"
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "드라이버 설치 실패 (에러 코드 %d)."
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "드라이버 설치에 실패했습니다."
 
-#: src/ui.vala:1676
+#. 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 "%s 패키지를 설치해야 합니다."
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (기본값)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (초안)"
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (고해상도)"
 
-#: src/ui.vala:1793
+#. 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
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr "새 문서"
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr "문서"
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr "이메일..."
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr "인쇄..."
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr "도움말"
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr "소개"
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr "끝내기"
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "스캐너 변경(_S)"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "드라이버 설치(_I)"
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "자동 설정"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr "어둡게"
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr "밝게"
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr "적게"
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr "많이"
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr "최소"
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr "최대"
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr "문서 저장..."
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "%d 페이지(전체 %d 페이지) 저장 중"
diff --git a/po/ky.gmo b/po/ky.gmo
index c799552..4ecfbb2 100644
--- a/po/ky.gmo
+++ b/po/ky.gmo
diff --git a/po/ky.po b/po/ky.po
index 5a78bd9..8e84852 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr ""
 msgid "Photo"
 msgstr ""
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr ""
 
@@ -207,7 +207,7 @@ msgstr ""
 msgid "Save document to a file"
 msgstr ""
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr ""
 
@@ -248,8 +248,7 @@ msgstr ""
 msgid "Crop"
 msgstr ""
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr ""
 
@@ -322,157 +321,191 @@ msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#: src/scanner.vala:841
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr ""
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr ""
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr ""
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr ""
 
-#: src/simple-scan.vala:24
+#. Help string for command line --debug flag
+#: ../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 ""
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr ""
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
-#: src/simple-scan.vala:632
+#. 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
+#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr ""
 
-#: src/ui.vala:327
+#. 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 ""
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr ""
 
-#: src/ui.vala:377
+#. 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 ""
 
-#: src/ui.vala:382
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#: src/ui.vala:384
+#. Instructions to install driver software
+#: ../src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr ""
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr ""
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr ""
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr ""
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr ""
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr ""
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr ""
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr ""
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr ""
 
-#: src/ui.vala:673
+#. 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/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr ""
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr ""
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr ""
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr ""
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr ""
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr ""
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr ""
 
-#: src/ui.vala:1472
+#. 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"
@@ -488,181 +521,206 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr ""
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Saltanat Osmonova https://launchpad.net/~salta007"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr ""
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr ""
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#: src/ui.vala:1581
+#. 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 ""
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#: src/ui.vala:1587
+#. 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 ""
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#: src/ui.vala:1598
+#. 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 ""
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#: src/ui.vala:1676
+#. 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 ""
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
-#: src/ui.vala:1793
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: src/ui.vala:1835
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr ""
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr ""
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr ""
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr ""
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr ""
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr ""
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr ""
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr ""
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr ""
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr ""
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr ""
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr ""
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr ""
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr ""
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr ""
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/lt.gmo b/po/lt.gmo
index b743f8e..e88879f 100644
--- a/po/lt.gmo
+++ b/po/lt.gmo
diff --git a/po/lt.po b/po/lt.po
index b9e2f0b..538af32 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -8,14 +8,14 @@ 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-15 16:12+0000\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "Tekstas"
 msgid "Photo"
 msgstr "Nuotrauka"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Pakeisti puslapių tvarką"
 
@@ -207,7 +207,7 @@ msgstr "Skenuoti"
 msgid "Save document to a file"
 msgstr "Įrašyti dokumentą į failą"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "Įrašyti"
 
@@ -248,8 +248,7 @@ msgstr "Apkirpti pažymėtą puslapį"
 msgid "Crop"
 msgstr "Apkirpti"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "Nuostatos"
 
@@ -303,11 +302,11 @@ msgstr "Skenuoti dokumentus"
 
 #: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
-msgstr "skenuoti;nuskaityti;adf;skaitytuvas;plokštuminis;"
+msgstr "skenuoti;nuskaityti;adf;skaitytuvas;skeneris;plokštuminis;"
 
 #: data/simple-scan.desktop.in:8
 msgid "scanner"
-msgstr ""
+msgstr "skeneris"
 
 #: data/simple-scan.appdata.xml.in:8
 msgid ""
@@ -328,159 +327,193 @@ msgstr ""
 "Paprastas skenavimas naudoja SANE karkasą, kad palaikytų daugelį esamų "
 "skenerių."
 
-#: src/scanner.vala:841
+#. 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į."
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Nepavyko prisijungti prie skenerio"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Nepavyko pradėti skenavimo"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. 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"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Rodyti laidos versiją"
 
-#: src/simple-scan.vala:24
+#. 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
+#: ../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"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Skenavimas nepavyko"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ĮRENGINYS...] - Skenavimo paslaugų programa"
 
-#: src/simple-scan.vala:632
+#. 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
+#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr "_Užverti"
 
-#: src/ui.vala:327
+#. 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“"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Skenerių neaptikta"
 
-#: src/ui.vala:377
+#. 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 "Patikrinkite ar skeneris yra prijungtas ir įjungtas"
 
-#: src/ui.vala:382
+#. 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"
 
-#: src/ui.vala:384
+#. 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ę."
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "Įrašyti kaip..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Atsisakyti"
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr "Į_rašyti"
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Nuskenuotas dokumentas.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "Paveikslų failai"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "Visi failai"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (kelių puslapių dokumentas)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (suglaudintas)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (nenuostolingasis)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr "Failo formatas:"
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Nepavyko įrašyti failo"
 
-#: src/ui.vala:673
+#. 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 "Jeigu neįrašysite, pakeitimai bus negrįžtamai prarasti."
 
-#: src/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "Įrašyti šį dokumentą?"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Atmesti pakeitimus"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Nepavyko įrašyti paveikslo peržiūrai"
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Nepavyko atverti paveikslų peržiūros programos"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Suskirstyti puses"
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Suskirstyti puses (atvirkščiai)"
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr "Atvirkščiai"
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Palikti nepakeistus"
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Nepavyko atverti žinyno failo"
 
-#: src/ui.vala:1472
+#. 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"
@@ -509,15 +542,17 @@ msgstr ""
 "Jūs turėjote gauti GNU bendrosios viešosios licencijos kopiją kartu su\n"
 "šia programa; jei negavote, žiūrėkite <http://www.gnu.org/licenses/>."
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Apie Paprastą skenavimą"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Paprastas dokumentų skenavimo įrankis"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -530,19 +565,23 @@ msgstr ""
 "  Vincas Dargis https://launchpad.net/~talkless\n"
 "  romasg https://launchpad.net/~romasg"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Įrašyti dokumentą prieš baigiant programos darbą?"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Baigti neįrašant"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "Atrodo, kad turite Brother skenerį."
 
-#: src/ui.vala:1581
+#. 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>."
@@ -550,11 +589,13 @@ msgstr ""
 "Tvarkyklės šiam įrenginiui yra prieinamos <a "
 "href=\"http://support.brother.com\">Brother svetainėje</a>."
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "Atrodo, kad turite Samsung skenerį."
 
-#: src/ui.vala:1587
+#. 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>."
@@ -562,15 +603,18 @@ msgstr ""
 "Tvarkyklės šiam įrenginiui yra prieinamos <a "
 "href=\"http://samsung.com/support\">Samsung svetainėje</a>."
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "Atrodo, kad turite HP skenerį."
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "Atrodo, kad turite Epson skenerį."
 
-#: src/ui.vala:1598
+#. 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>."
@@ -578,125 +622,139 @@ msgstr ""
 "Tvarkyklės šiam įrenginiui yra prieinamos <a "
 "href=\"http://support.epson.com\">Epson svetainėje</a>."
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr "Įdiegti tvarkykles"
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Įdiegę, turėsite iš naujo paleisti Paprastą skenavimą."
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "Įdiegiamos tvarkyklės..."
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "Tvarkyklės sėkmingai įdiegtos!"
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Nepavyko įdiegti tvarkyklių (klaidos kodas %d)."
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "Nepavyko įdiegti tvarkyklių."
 
-#: src/ui.vala:1676
+#. 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 "Jums reikia įdiegti %s paketą(-us)."
 
-#: src/ui.vala:1784
+#. 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/ui.vala:1787
+#. 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/ui.vala:1790
+#. 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/ui.vala:1793
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d tašk./col."
 
-#: src/ui.vala:1835
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr "Naujas dokumentas"
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr "Dokumentas"
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr "El. paštas..."
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr "Spausdinti..."
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr "Žinynas"
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr "Apie"
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr "Baigti"
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Keisti _skenerį"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "Į_diegti tvarkykles"
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automatinis"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr "Tamsesnis"
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr "Šviesesnis"
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr "Mažiau"
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr "Daugiau"
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr "Žemiausia"
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr "Aukščiausia"
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Įrašomas dokumentas..."
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Įrašomas puslapis %d iš %d"
diff --git a/po/lv.gmo b/po/lv.gmo
index d510706..8eda7a2 100644
--- a/po/lv.gmo
+++ b/po/lv.gmo
diff --git a/po/lv.po b/po/lv.po
index 7f576de..4ca2381 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "Teksts"
 msgid "Photo"
 msgstr "Foto"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr ""
 
@@ -207,7 +207,7 @@ msgstr "Skenēt"
 msgid "Save document to a file"
 msgstr "Saglabāt dokumentu datnē"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "Saglabāt"
 
@@ -248,8 +248,7 @@ msgstr "Apcirst izvēlēto lapu"
 msgid "Crop"
 msgstr "Apcirst"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "Iestatījumi"
 
@@ -322,159 +321,193 @@ msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#: src/scanner.vala:841
+#. 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."
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Neizdevās savienoties ar skeneri"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Neizdevās sākt skenēšanu"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. 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"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Rādīt laidiena versiju"
 
-#: src/simple-scan.vala:24
+#. 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
+#: ../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"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Neizdevās skenēt"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[IERĪCE...] - skenēšanas utilītprogramma"
 
-#: src/simple-scan.vala:632
+#. 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
+#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr "_Aizvērt"
 
-#: src/ui.vala:327
+#. 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"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Nav atrasts neviens skeneris"
 
-#: src/ui.vala:377
+#. 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 "Lūdzu, pārbaudiet, vai skeneris ir pievienots un ieslēgts"
 
-#: src/ui.vala:382
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#: src/ui.vala:384
+#. Instructions to install driver software
+#: ../src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "Saglabāt kā..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr "At_celt"
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr "_Saglabāt"
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Ieskenēts Dokuments.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "Attēlu datnes"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "Visas datnes"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (vairāku lapu dokuments)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (saspiests)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (bez zudumiem)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Neizdevās saglabāt datni"
 
-#: src/ui.vala:673
+#. 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 "Ja nesaglabāsiet, izmaiņas neatgriezeniski pazudīs."
 
-#: src/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "Saglabāt šo dokumentu?"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Izmest izmaiņas"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Nevar saglabāt attēlu priekšskatīšanai"
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Neizdevās atvērt attēlu priekšskatīšanas lietotni"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr "Pagriezt"
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Paturēt nemainīti"
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Nevar atvērt palīdzības datni"
 
-#: src/ui.vala:1472
+#. 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"
@@ -499,15 +532,17 @@ msgstr ""
 "GNU Vispārējās publiskās licences kopiju kopā ar šo programmu; ja jūs to "
 "nesaņēmāt, skatiet <http://www.gnu.org/licenses/>."
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Par Simple Scan"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Vienkāršs dokumentu skenēšanas rīks"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -516,167 +551,190 @@ msgstr ""
 "  Rihards Pfeifle https://launchpad.net/~spr1nt3r\n"
 "  Rūdolfs Mazurs https://launchpad.net/~rudolfs-mazurs"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Pirms iziešanas saglabāt dokumentu?"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Iziet nesaglabājot"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#: src/ui.vala:1581
+#. 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 ""
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#: src/ui.vala:1587
+#. 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 ""
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#: src/ui.vala:1598
+#. 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 ""
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#: src/ui.vala:1676
+#. 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 ""
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (noklusējuma)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (melraksts)"
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (augsta izšķirtspēja)"
 
-#: src/ui.vala:1793
+#. 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
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr "Jauns dokuments"
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr "Dokuments"
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr "Epasts..."
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr "Drukāt..."
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr "Palīdzība"
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr "Par"
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr "Iziet"
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Mainīt _skeneri"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automātiski"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr "Tumšāks"
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr "Gaišāks"
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr "Mazāk"
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr "Vairāk"
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr "Minimums"
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr "Maksimums"
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Saglabā dokumentu..."
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Saglabā lapu %d no %d"
diff --git a/po/mhr.gmo b/po/mhr.gmo
index a4ab5d0..d929bcf 100644
--- a/po/mhr.gmo
+++ b/po/mhr.gmo
diff --git a/po/mhr.po b/po/mhr.po
index bc75add..6104131 100644
--- a/po/mhr.po
+++ b/po/mhr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:46+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "Текст"
 msgid "Photo"
 msgstr "Фотосӱрет"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr ""
 
@@ -207,7 +207,7 @@ msgstr ""
 msgid "Save document to a file"
 msgstr ""
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "Аныклаш"
 
@@ -248,8 +248,7 @@ msgstr ""
 msgid "Crop"
 msgstr "Лектыш"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "Келыштарымаш-влак"
 
@@ -322,157 +321,191 @@ msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#: src/scanner.vala:841
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr ""
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr ""
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr ""
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr ""
 
-#: src/simple-scan.vala:24
+#. Help string for command line --debug flag
+#: ../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 ""
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr ""
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
-#: src/simple-scan.vala:632
+#. 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
+#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr ""
 
-#: src/ui.vala:327
+#. 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 ""
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr ""
 
-#: src/ui.vala:377
+#. 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 ""
 
-#: src/ui.vala:382
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#: src/ui.vala:384
+#. Instructions to install driver software
+#: ../src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr ""
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr ""
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr ""
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr ""
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr ""
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr ""
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr ""
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr ""
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr ""
 
-#: src/ui.vala:673
+#. 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/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr ""
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr ""
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr ""
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr ""
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr ""
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr ""
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr ""
 
-#: src/ui.vala:1472
+#. 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"
@@ -488,182 +521,207 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr ""
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Max Romanov https://launchpad.net/~dr-max-romanov\n"
 "  Снежана https://launchpad.net/~snezhana-yandemerova-94"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr ""
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr ""
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#: src/ui.vala:1581
+#. 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 ""
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#: src/ui.vala:1587
+#. 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 ""
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#: src/ui.vala:1598
+#. 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 ""
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#: src/ui.vala:1676
+#. 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 ""
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
-#: src/ui.vala:1793
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: src/ui.vala:1835
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr ""
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr ""
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr ""
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr ""
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr ""
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr ""
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr ""
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr ""
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr "Пычкемышрак"
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr ""
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr ""
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr ""
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr ""
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr ""
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr ""
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/ms.gmo b/po/ms.gmo
index 9f5ccaf..bfb04f9 100644
--- a/po/ms.gmo
+++ b/po/ms.gmo
diff --git a/po/ms.po b/po/ms.po
index 1533fd9..5a21020 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "Teks"
 msgid "Photo"
 msgstr "Foto"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Tertib Semula Halaman"
 
@@ -207,7 +207,7 @@ msgstr "Imbas"
 msgid "Save document to a file"
 msgstr "Simpan dokumen ke fail"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "Simpan"
 
@@ -248,8 +248,7 @@ msgstr "Kerat halaman pilihan"
 msgid "Crop"
 msgstr "Kerat"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "Keutamaan"
 
@@ -328,159 +327,193 @@ msgstr ""
 "Pengimbas Ringkas menggunakan bingkai kerja SANE untuk menyokong kebanyakan "
 "pengimbas sedia ada."
 
-#: src/scanner.vala:841
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Tiada pengimbas hadir. Sila sambungkan pengimbas."
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Tidak boleh menyambung kepada pengimbas"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Tidak boleh memulakan imbasan"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Ralat berkomunikasi dengan pengimbas"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Papar versi keluaran"
 
-#: src/simple-scan.vala:24
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Papar mesej penyahpepijatan"
 
-#: src/simple-scan.vala:26
+#: ../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"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Gagal mengimbas"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Utiliti mengimbas"
 
-#: src/simple-scan.vala:632
+#. 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 melihat senarai penuh pilihan baris perintah yang "
 "ada."
 
-#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
+#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr "_Tutup"
 
-#: src/ui.vala:327
+#. 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 laluan diperlukan untuk mencapai '%s'"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Tiada pengimbas dikesan"
 
-#: src/ui.vala:377
+#. 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 "Sila semak pengimbas anda sama ada ia bersambung dan dihidupkan"
 
-#: src/ui.vala:382
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:382
 msgid "Additional software needed"
 msgstr "Perisian tambahan diperlukan"
 
-#: src/ui.vala:384
+#. Instructions to install driver software
+#: ../src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr "Anda perlu pasang perisian pemacu untuk pengimbas anda."
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "Simpan Sebagai..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Batal"
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr "_Simpan"
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Dokumen Diimbas.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "Fail Imej"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "Semua Fail"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (dokumen berbilang-halaman)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (termampat)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (tidak hilang)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr "Format fail:"
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Gagal menyimpan fail"
 
-#: src/ui.vala:673
+#. 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 "Jika anda tidak simpan, semua perubahan akan hilang."
 
-#: src/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "Simpan dokumen semasa"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Abai Perubahan"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Tidak boleh menyimpan imej untuk pratonton"
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Tidak boleh membuka aplikasi partonton imej"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Gabung sisi"
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Gabung sisi (songsang)"
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr "Songsang"
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Kekal tidak berubah"
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Tidak boleh membuka fail bantuan"
 
-#: src/ui.vala:1472
+#. 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"
@@ -508,15 +541,17 @@ msgstr ""
 "pengurus skrip Nautilus; jika tidak, laporkannya ke Free Software "
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Mengenai Pengimbas Ringkas"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Alat mengimbas dokumen mudah"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -527,19 +562,23 @@ msgstr ""
 "  ahmad akmal bin mohd idris https://launchpad.net/~mamahopsk87\n"
 "  dequan https://launchpad.net/~dequan"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Simpan dokumen sebelum keluar?"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Keluar tanpa Menyimpan"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "Anda kelihatan mempunyai pengimbas Brother."
 
-#: src/ui.vala:1581
+#. 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>."
@@ -547,11 +586,13 @@ msgstr ""
 "Pemacunya tersedia di <a href=\"http://support.brother.com\">laman sesawang "
 "Brother</a>."
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "Anda kelihatan mempunyai pengimbas Samsung."
 
-#: src/ui.vala:1587
+#. 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>."
@@ -559,15 +600,18 @@ msgstr ""
 "Pemacunya tersedia di <a href=\"http://samsung.com/support\">laman sesawang "
 "Samsung</a>."
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "Anda kelihatan mempunyai pengimbas HP."
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "Anda kelihatan mempunyai pengimbas Epson."
 
-#: src/ui.vala:1598
+#. 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>."
@@ -575,125 +619,139 @@ msgstr ""
 "Pemacu untuknya tersedia di <a href=\"http://support.epson.com\">laman "
 "sesawang Epson</a>."
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr "Pasang pemacu"
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Setelah dipasang anda perlu mulakan semula Pengimbas Ringkas."
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "Memasng pemacu..."
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "Pemacu berjaya dipasangkan!"
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Gagal memasang pemacu (kod ralat %d)."
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "Gagal memasang pemacu."
 
-#: src/ui.vala:1676
+#. 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 pasang pakej(s) %s."
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (tersedia)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (draf)"
 
-#: src/ui.vala:1790
+#. 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)"
 
-#: src/ui.vala:1793
+#. 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
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr "Dokumen Baharu"
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr "Dokumen"
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr "Emel..."
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr "Cetak..."
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr "Bantuan"
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr "Perihal"
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr "Keluar"
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Ubah _Pengimbas"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "_Pasang Pemacu"
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automatik"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr "Lebih Gelap"
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr "Lebih Cerah"
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr "Kurang"
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr "Lagi"
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr "Minimum"
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr "Maksimum"
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Menyimpan dokumen..."
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, 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
index 042a29a..1137837 100644
--- a/po/my.gmo
+++ b/po/my.gmo
diff --git a/po/my.po b/po/my.po
index 9ae85c5..6f6e4c9 100644
--- a/po/my.po
+++ b/po/my.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "စာ"
 msgid "Photo"
 msgstr "ဓာတ်ပုံ"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr ""
 
@@ -207,7 +207,7 @@ msgstr "Scan"
 msgid "Save document to a file"
 msgstr "ဖိုင် တစ်ခုထဲသို့ စာရွက်စာတမ်း ကိုသိမ်းပါ။"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "သိမ်းဆည်းပါ"
 
@@ -248,8 +248,7 @@ msgstr "ရွေးချယ်ထားသောစာမျက်နှာက
 msgid "Crop"
 msgstr "ဖြတ်ပါ။"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "Preferences"
 
@@ -322,159 +321,193 @@ msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#: src/scanner.vala:841
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Scanner နှင့်ချိတ်ဆက်ထားခြင်းမရှိပါ။ Scanner နှင့်ချိတ်ဆက်ပါ။"
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Scanner နှင့်မချိတ်ဆက်နိုင်ပါ။"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Scan မစတင်နိုင်ပါ။"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Scanner နှင့်ချိတ်ဆက်ရင်းအမှားအယွင်းဖြစ်ခဲ့သည်။"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "ထုတ်လုပ်သော ဗားရှင်းကို ပြပါ"
 
-#: src/simple-scan.vala:24
+#. Help string for command line --debug flag
+#: ../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"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Scan မဖတ်ဖြစ်ပါ။"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Scanning utility"
 
-#: src/simple-scan.vala:632
+#. 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/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr ""
 
-#: src/ui.vala:327
+#. 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' ကိုသုံးရန်အတွက်သုံးစွဲသူအမည်နှင့် စကားဝှက်လိုအပ်ပါသည်။"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Scanner ရှာမတွေ့ပါ။"
 
-#: src/ui.vala:377
+#. 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 ""
 "သင်၏ Scanner ကိုချိတ်ဆက်ပြီးကြောင်း၊ "
 "ပါဝါဖွင့်ထားကြောင်းသေချာအောင်ပြန်လည်စစ်ဆေးပါ။"
 
-#: src/ui.vala:382
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#: src/ui.vala:384
+#. Instructions to install driver software
+#: ../src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "Save As..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr ""
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr ""
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Scanned Document.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "Image Files"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "ဖိုင်အလုံးစုံ"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (multi-page document)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (compressed)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (lossless)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "ဖိုင်ကိုမသိမ်းဖြစ်ပါ။"
 
-#: src/ui.vala:673
+#. 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/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "ယခုစာရွက်စာတမ်းကိုသိမ်းမလား။"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Discard Changes"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "ကြည့်ရူရန်အတွက် ပုံများကိုမသိမ်းနိုင်ပါ။"
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Unable to open image preview application"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr ""
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr ""
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "အကူအညီဖိုင်ကို မဖွင့်နိုင်ပါ။"
 
-#: src/ui.vala:1472
+#. 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"
@@ -502,182 +535,207 @@ msgstr ""
 "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/>."
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "ရိုးရှင်းစွာ Scan ဖတ်ခြင်းအကြောင်း"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Simple document scanning tool"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Bone Pyae Sone https://launchpad.net/~bonepyaesone\n"
 "  Pyae Sone https://launchpad.net/~gipsyhnh"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "မပိတ်ခင် စာရွက်စာတမ်းများကိုသိမ်းမလား။"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "မသိမ်းပဲနှင့်ထွက်မည်။"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#: src/ui.vala:1581
+#. 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 ""
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#: src/ui.vala:1587
+#. 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 ""
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#: src/ui.vala:1598
+#. 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 ""
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#: src/ui.vala:1676
+#. 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 ""
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (default)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (draft)"
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (high resolution)"
 
-#: src/ui.vala:1793
+#. 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
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr ""
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr ""
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr ""
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr ""
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr ""
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr ""
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Change _Scanner"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "အလိုအလျှောက်"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr ""
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr ""
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr ""
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr ""
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr ""
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr ""
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr ""
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/nb.gmo b/po/nb.gmo
index e4b5481..cd5603a 100644
--- a/po/nb.gmo
+++ b/po/nb.gmo
diff --git a/po/nb.po b/po/nb.po
index eb88b67..f68a30a 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "Tekst"
 msgid "Photo"
 msgstr "Bilde"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Omplasser sider"
 
@@ -207,7 +207,7 @@ msgstr "Skann"
 msgid "Save document to a file"
 msgstr "Lagre dokument til fil"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "Lagre"
 
@@ -248,8 +248,7 @@ msgstr "Beskjær valgt side"
 msgid "Crop"
 msgstr "Beskjær"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "Innstillinger"
 
@@ -326,159 +325,193 @@ msgid ""
 msgstr ""
 "Simple Scan bruker rammeverket SANE til å støtte de vanligste skannerne."
 
-#: src/scanner.vala:841
+#. 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."
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Klarte ikke å koble til skanneren"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Klarte ikke å sette i gang skanneren"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. 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"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Vis utgivelsesversjon"
 
-#: src/simple-scan.vala:24
+#. 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
+#: ../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"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Klarte ikke å utføre skanningen"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ENHET...] - Scanneutstyr"
 
-#: src/simple-scan.vala:632
+#. 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
+#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr "_Lukk"
 
-#: src/ui.vala:327
+#. 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'"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Fant ingen skannere"
 
-#: src/ui.vala:377
+#. 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 "Undersøk om skanneren er riktig tilkoblet, og at den er slått på"
 
-#: src/ui.vala:382
+#. 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"
 
-#: src/ui.vala:384
+#. 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."
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "Lagre som..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr "_Lagre"
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Skannet_dokument.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "Bildefiler"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "Alle Filer"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (flersidig dokument)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (komprimert)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (tapsfri)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr "Filformat:"
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Lagring av fil mislyktes"
 
-#: src/ui.vala:673
+#. 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/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "Lagre gjeldende dokument?"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Forkast endringer"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Klarte ikke å lagre forhåndsvisning"
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Åpning av forhåndsvisning mislyktes"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Kombiner sider"
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Kombiner sider (omvendt)"
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr "Omvendt"
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Behold uendret"
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Klarte ikke å åpne hjelpefil"
 
-#: src/ui.vala:1472
+#. 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"
@@ -506,15 +539,17 @@ msgstr ""
 "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/>."
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Om Simple Scan"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Enkelt verktøy for å skanne dokumenter"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -526,19 +561,23 @@ msgstr ""
 "  kingu https://launchpad.net/~comradekingu\n"
 "  Åka Sikrom https://launchpad.net/~akrosikam"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Lagre dokumentet før du avslutter?"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Avslutt uten å lagre"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "Det ser ut som at du har en Brother-skanner."
 
-#: src/ui.vala:1581
+#. 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>."
@@ -546,11 +585,13 @@ msgstr ""
 "Du skal kunne finne drivere på <a "
 "href=\"http://support.brother.com\">Brothers nettsider</a>."
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "Det ser ut som at du har en Samsung-skanner."
 
-#: src/ui.vala:1587
+#. 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>."
@@ -558,15 +599,18 @@ msgstr ""
 "Du skal kunne finne drivere på <a "
 "href=\"http://samsung.com/support\">Samsungs nettsider</a>."
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "Det ser ut som at du har en HP-skanner."
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "Det ser ut som at du har en Epson-skanner."
 
-#: src/ui.vala:1598
+#. 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>."
@@ -574,125 +618,139 @@ msgstr ""
 "Drivere er tilgjengelig på <a href=\"http://support.epson.com\">Epson</a>s "
 "nettside."
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr "Installer drivere"
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Start Simple Scan på nytt når driveren er installert."
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "Installerer drivere …"
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "Driverne er nå installert."
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Klarte ikke å installere drivere (feilkode %d)."
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "Klarte ikke å installere drivere."
 
-#: src/ui.vala:1676
+#. 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 "Du må installere pakka/pakkene for %s."
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (standard)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (kladd)"
 
-#: src/ui.vala:1790
+#. 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)"
 
-#: src/ui.vala:1793
+#. 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
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr "Nytt dokument"
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr "Dokument"
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr "E-post …"
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr "Skriv ut …"
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr "Hjelp"
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr "Om"
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr "Avslutt"
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Bytt _skanner"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "_Installer drivere"
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr "Mørkere"
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr "Lysere"
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr "Mindre"
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr "Mer"
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr "Minimum"
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr "Maksimum"
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Lagrer dokument …"
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Lagrer side nr. %d av %d"
diff --git a/po/nl.gmo b/po/nl.gmo
index f20007f..f18f129 100644
--- a/po/nl.gmo
+++ b/po/nl.gmo
diff --git a/po/nl.po b/po/nl.po
index e9d865c..164b7c3 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "Tekst"
 msgid "Photo"
 msgstr "Foto"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Bladzijden herschikken"
 
@@ -207,7 +207,7 @@ msgstr "Scannen"
 msgid "Save document to a file"
 msgstr "Document naar een bestand opslaan"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "Opslaan"
 
@@ -248,8 +248,7 @@ msgstr "De geselecteerde pagina bijsnijden"
 msgid "Crop"
 msgstr "Bijsnijden"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "Voorkeuren"
 
@@ -328,163 +327,197 @@ msgstr ""
 "Simple Scan gebruikt het SANE-kader om de meeste scanners te kunnen "
 "gebruiken."
 
-#: src/scanner.vala:841
+#. 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."
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Kan niet verbinden met de scanner"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Kan de scan niet starten"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. 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"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Uitgaveversie tonen"
 
-#: src/simple-scan.vala:24
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Debugberichten weergeven"
 
-#: src/simple-scan.vala:26
+#: ../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"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Scannen is mislukt"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[APPARAAT...] - Hulpmiddel voor scannen"
 
-#: src/simple-scan.vala:632
+#. 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
+#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr "_Sluiten"
 
-#: src/ui.vala:327
+#. 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'"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Geen scanners gevonden"
 
-#: src/ui.vala:377
+#. 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 "Controleer of uw scanner is aangesloten en is ingeschakeld"
 
-#: src/ui.vala:382
+#. 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"
 
-#: src/ui.vala:384
+#. 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."
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "Opslaan als..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Annuleren"
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr "_Opslaan"
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Gescand document.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "Afbeeldingsbestanden"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "Alle bestanden"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (document met meerdere pagina's)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (gecomprimeerd)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (lossless)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr "Bestandsformaat:"
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Bestand opslaan mislukt"
 
-#: src/ui.vala:673
+#. 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 "Als u niet opslaat, zullen wijzigingen permanent verloren gaan."
 
-#: src/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "Huidige document opslaan?"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Wijzigingen negeren"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Opslaan van afbeelding voor voorvertoning mislukt"
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Kan toepassing voor voorvertoning van afbeelding niet openen"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Zijden samenvoegen"
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Zijden samenvoegen (omgekeerd)"
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr "Omgekeerd"
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Onveranderd laten"
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Kon hulpbestand niet openen"
 
-#: src/ui.vala:1472
+#. 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"
@@ -514,15 +547,17 @@ msgstr ""
 "ontvangen samen met dit programma. Als dat niet het geval is, zie\n"
 "<http://www.gnu.org/licenses/>."
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Info over Scanhulpmiddel"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Eenvoudig hulpmiddel voor het scannen van documenten"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -546,19 +581,23 @@ msgstr ""
 "  kay van der Zander https://launchpad.net/~kay20\n"
 "  rob https://launchpad.net/~rvdb"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Document opslaan voor afsluiten?"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Afsluiten zonder opslaan"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "U lijkt een Brother-scanner te hebben."
 
-#: src/ui.vala:1581
+#. 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>."
@@ -566,11 +605,13 @@ msgstr ""
 "Stuurprogramma's hiervoor zijn beschikbaar op de <a "
 "href=\"http://support.brother.com\">website van Brother</a>."
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "U lijkt een Samsung-scanner te hebben."
 
-#: src/ui.vala:1587
+#. 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>."
@@ -578,15 +619,18 @@ msgstr ""
 "Stuurprogramma's hiervoor zijn beschikbaar op de <a "
 "href=\"http://samsung.com/support\">website van Samsung</a>."
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "U lijkt een HP-scanner te hebben."
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "U lijkt een Epson-scanner te hebben."
 
-#: src/ui.vala:1598
+#. 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>."
@@ -594,125 +638,139 @@ msgstr ""
 "Stuurprogramma's hiervoor zijn beschikbaar op de <a "
 "href=\"http://support.epson.com\">Epson-website</a>."
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr "Stuurprogramma's installeren"
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Eenmaal geïnstalleerd, zult u Simple Scan moeten herstarten."
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "Stuurprogramma's aan het installeren..."
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "Stuurprogramma's met succes geïnstalleerd!"
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Kon geen stuurprogramma's installeren (foutcode %d)."
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "Kon geen stuurprogramma's installeren."
 
-#: src/ui.vala:1676
+#. 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 "U moet de %s pakket(ten) installeren"
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (standaard)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (klad)"
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (hoge resolutie)"
 
-#: src/ui.vala:1793
+#. 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
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr "Nieuw document"
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr "Document"
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr "E-mail..."
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr "Afdrukken..."
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr "Hulp"
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr "Over"
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr "Afsluiten"
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "_Scanner wijzigen"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "Stuurprogramma's _installeren"
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr "Donkerder"
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr "Lichter"
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr "Minder"
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr "Meer"
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr "Minimum"
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr "Maximum"
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Bezig met opslaan van document..."
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Bezig met opslaan van pagina %d van %d"
diff --git a/po/oc.gmo b/po/oc.gmo
index bf75c9a..d024012 100644
--- a/po/oc.gmo
+++ b/po/oc.gmo
diff --git a/po/oc.po b/po/oc.po
index a176c87..99c0537 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "Tèxte"
 msgid "Photo"
 msgstr "Fòto"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr ""
 
@@ -207,7 +207,7 @@ msgstr "Numerizar"
 msgid "Save document to a file"
 msgstr "Enregistrar lo document dins un fichièr"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "Enregistrar"
 
@@ -249,8 +249,7 @@ msgstr "Requadrar la pagina seleccionada"
 msgid "Crop"
 msgstr "Requadrar"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "Preferéncias"
 
@@ -323,160 +322,194 @@ msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#: src/scanner.vala:841
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Cap de periferic de numerizacion pas disponible. Connectatz-ne un."
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Impossible de se connectar al scanner"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Impossible d'aviar la numerizacion"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Error de comunicacion amb lo scanner"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Aficha la version del logicial"
 
-#: src/simple-scan.vala:24
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Afichar los messatges de desbugatge"
 
-#: src/simple-scan.vala:26
+#: ../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"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Fracàs de la numerizacion"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Aisina de numerizacion"
 
-#: src/simple-scan.vala:632
+#. 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 ""
 "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:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr "_Tampar"
 
-#: src/ui.vala:327
+#. 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'utilizaire e senhal necessaris per accedir a « %s »"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Cap de scanner es pas estat detectat"
 
-#: src/ui.vala:377
+#. 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 "Verificatz que vòstre scanner es connectat e jos tension"
 
-#: src/ui.vala:382
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#: src/ui.vala:384
+#. Instructions to install driver software
+#: ../src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "Enregistrar jos..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr "A_nullar"
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr "_Salvar"
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Document.pdf numerizat"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "Fichièrs imatges"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "Totes los fichièrs"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (document multipaginas)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (compressat)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (sens pèrda)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr "Format del fichièr :"
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Impossible d'enregistrar lo fichièr"
 
-#: src/ui.vala:673
+#. 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 "S'enregistratz pas, las modificacions seràn perdudas definitivament."
 
-#: src/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "Enregistrar lo document actual ?"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Abandonar las modificacions"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Impossible d'enregistrar l'imatge per lo previsualizar"
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Impossible de dobrir l'aplicacion de previsualizacion d'imatge"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr "Inversar"
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr ""
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Impossible de dobrir lo fichièr d'ajuda"
 
-#: src/ui.vala:1472
+#. 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"
@@ -505,182 +538,207 @@ msgstr ""
 "al meteis temps qu'aqueste programa ; s'es pas lo cas, consultatz\n"
 "<http://www.gnu.org/licenses/>."
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "A prepaus de Simple Scan"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Numerizar simplament vòstres documents"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Cédric VALMARY (Tot en òc) https://launchpad.net/~cvalmary\n"
 "  Quentin Pagès https://launchpad.net/~kwentin"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Enregistrar lo document abans de quitar ?"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Quitar sens enregistrar"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#: src/ui.vala:1581
+#. 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 ""
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#: src/ui.vala:1587
+#. 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 ""
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#: src/ui.vala:1598
+#. 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 ""
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#: src/ui.vala:1676
+#. 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 ""
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (per defaut)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (borrolhon)"
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d ppp (nauta resolucion)"
 
-#: src/ui.vala:1793
+#. 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
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr "Document novèl"
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr "Document"
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr "Ajuda"
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr "A prepaus"
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr "Quitar"
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Cambiar de _scanner"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automatic"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr "Mai escur"
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr "Mai clar"
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr "Mens"
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr "Mai"
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr "Minimum"
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr "Maximum"
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Enregistrament del document..."
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, 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
index 4a7cd3f..d314215 100644
--- a/po/pa.gmo
+++ b/po/pa.gmo
diff --git a/po/pa.po b/po/pa.po
index 78e3598..f4be470 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "ਟੈਕਸਟ"
 msgid "Photo"
 msgstr "ਫੋਟੋ"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr ""
 
@@ -207,7 +207,7 @@ msgstr "ਸਕੈਨ"
 msgid "Save document to a file"
 msgstr "ਡੌਕੂਮੈਂਟ ਫਾਇਲ ਵਿੱਚ ਸੰਭਾਲੋ"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "ਸੰਭਾਲੋ"
 
@@ -248,8 +248,7 @@ msgstr "ਚੁਣੇ ਸਫ਼ੇ ਨੂੰ ਕਰੋਪ ਕਰੋ"
 msgid "Crop"
 msgstr "ਕਰੋਪ ਕਰੋ"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "ਮੇਰੀ ਪਸੰਦ"
 
@@ -322,157 +321,191 @@ msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#: src/scanner.vala:841
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "ਕੋਈ ਵੀ ਸਕੈਨਰ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ। ਸਕੈਨਰ ਨਾਲ ਕੁਨੈਕਟ ਕਰੋ ਜੀ।"
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "ਸਕੈਨਰ ਨਾਲ ਜੁੜਨ ਲਈ ਅਸਮਰੱਥ"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "ਸਕੈਨ ਕਰਨਾ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "ਸਕੈਨਰ ਨਾਲ ਸੰਚਾਰ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr ""
 
-#: src/simple-scan.vala:24
+#. Help string for command line --debug flag
+#: ../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 ""
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "ਸਕੈਨ ਕਰਨ ਲਈ ਫੇਲ੍ਹ"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
-#: src/simple-scan.vala:632
+#. 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
+#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr ""
 
-#: src/ui.vala:327
+#. 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' ਵਰਤਣ ਲਈ ਯੂਜ਼ਰ-ਨਾਂ ਅਤੇ ਪਾਸਵਰਡ ਚਾਹੀਦਾ ਹੈ"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "ਕੋਈ ਸਕੈਨਰ ਨਹੀਂ ਮਿਲਿਆ"
 
-#: src/ui.vala:377
+#. 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 "ਆਪਣੇ ਜੁੜ ਹੋਏ ਸਕੈਨਰ ਨੂੰ ਚੈੱਕ ਕਰੋ ਅਤੇ ਚਾਲੂ ਕਰੋ"
 
-#: src/ui.vala:382
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#: src/ui.vala:384
+#. Instructions to install driver software
+#: ../src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "ਇੰਝ ਸੰਭਾਲੋ..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr ""
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr ""
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "ਸਕੈਨ ਕੀਤਾ ਡੌਕੂਮੈਂਟ.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "ਚਿੱਤਰ ਫਾਇਲਾਂ"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "ਸਭ ਫਾਇਲਾਂ"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (ਬਹੁ-ਸਫ਼ਾ ਡੌਕੂਮੈਂਟ)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (compressed)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (lossless)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "ਫਾਇਲ ਸੰਭਾਲਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
 
-#: src/ui.vala:673
+#. 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/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "ਮੌਜੂਦਾ ਡੌਕੂਮੈਂਟ ਸੰਭਾਲਣਾ ਹੈ?"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "ਬਦਲਾਅ ਅਣਡਿੱਠੇ"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr ""
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "ਚਿੱਤਰ ਝਲਕ ਐਪਲੀਕੇਸ਼ਨ ਖੋਲ੍ਹਣ ਲਈ ਅਸਮਰੱਥ"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr ""
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr ""
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "ਮੱਦਦ ਫਾਇਲ ਖੋਲ੍ਹਣ ਲਈ ਅਸਮਰੱਥ"
 
-#: src/ui.vala:1472
+#. 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"
@@ -488,181 +521,206 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "ਸੈਂਪਲ ਸਕੈਨ ਬਾਰੇ"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "ਸੈਂਪਲ ਡੌਕੂਮੈਂਟ ਸਕੈਨਿੰਗ ਟੂਲ"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  A S Alam https://launchpad.net/~aalam-users"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "ਕੀ ਬੰਦ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਡੌਕੂਮੈਂਟ ਸੰਭਾਲਣਾ ਹੈ?"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "ਬਿਨਾਂ ਸੰਭਾਲੇ ਬੰਦ ਕਰਨਾ ਹੈ"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#: src/ui.vala:1581
+#. 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 ""
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#: src/ui.vala:1587
+#. 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 ""
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#: src/ui.vala:1598
+#. 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 ""
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#: src/ui.vala:1676
+#. 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 ""
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (ਡਿਫਾਲਟ)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (draft)"
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (ਵੱਧ ਰੈਜ਼ੋਲੂਸ਼ਨ)"
 
-#: src/ui.vala:1793
+#. 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
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr ""
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr ""
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr ""
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr ""
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr ""
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr ""
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "ਸਕੈਨਰ ਬਦਲੋ(_S)"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "ਆਟੋਮੈਟਿਕ"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr ""
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr ""
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr ""
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr ""
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr ""
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr ""
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr ""
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/pl.gmo b/po/pl.gmo
index f172346..c63c3e2 100644
--- a/po/pl.gmo
+++ b/po/pl.gmo
diff --git a/po/pl.po b/po/pl.po
index cff9efc..62834c2 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-08-01 05:18+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "Tekst"
 msgid "Photo"
 msgstr "Zdjęcie"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Zmień kolejność stron"
 
@@ -207,7 +207,7 @@ msgstr "Skanuj"
 msgid "Save document to a file"
 msgstr "Zapisuje dokument do pliku"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "Zapisz"
 
@@ -248,8 +248,7 @@ msgstr "Kadruje zaznaczoną stronę"
 msgid "Crop"
 msgstr "Kadruj"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "Preferencje"
 
@@ -327,158 +326,192 @@ msgstr ""
 "Program Simple Scan używa mechanizmu SANE do obsługi większości istniejących "
 "skanerów."
 
-#: src/scanner.vala:841
+#. 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."
 
-#: src/scanner.vala:871
+#. 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"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Nie można rozpocząć skanowania"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. 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"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Wyświetla informacje o wersji"
 
-#: src/simple-scan.vala:24
+#. 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
+#: ../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"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Skanowanie się nie powiodło"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[URZĄDZENIE…] — narzędzie do skanowania"
 
-#: src/simple-scan.vala:632
+#. 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
+#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr "Za_mknij"
 
-#: src/ui.vala:327
+#. 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"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Nie wykryto żadnego skanera"
 
-#: src/ui.vala:377
+#. 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 "Proszę sprawdzić, czy skaner jest podłączony i włączony"
 
-#: src/ui.vala:382
+#. 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"
 
-#: src/ui.vala:384
+#. 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."
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "Zapisz jako…"
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Anuluj"
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr "_Zapisz"
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Zeskanowany dokument.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "Pliki obrazów"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "Wszystkie pliki"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (dokument wielostronicowy)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (skompresowany)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (bezstratny)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr "Format pliku:"
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Zapisanie pliku się nie powiodło"
 
-#: src/ui.vala:673
+#. 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 "Zmiany zostaną bezpowrotnie utracone, jeśli nie zostaną zapisane."
 
-#: src/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "Zapisać bieżący dokument?"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Odrzuć zmiany"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Nie można zapisać podglądu obrazu"
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Nie można otworzyć programu podglądu obrazów"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Połącz strony"
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Połącz strony (odwrotnie)"
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr "Odwrotnie"
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Bez zmiany"
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Nie można otworzyć pliku pomocy"
 
-#: src/ui.vala:1472
+#. 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"
@@ -509,15 +542,17 @@ msgstr ""
 "Powszechnej Licencji Publicznej GNU (GNU General Public License); jeśli nie\n"
 "— proszę odwiedzić stronę internetową <http://www.gnu.org/licenses/>."
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "O programie"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Proste narzędzie do skanowania dokumentów"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -535,19 +570,23 @@ msgstr ""
 "  Tomasz Dominikowski https://launchpad.net/~dominikowski\n"
 "  Wiatrak https://launchpad.net/~wiatrak."
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Zapisać dokument przed zakończeniem programu?"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Zakończ bez zapisywania"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "Wykryto skaner marki Brother."
 
-#: src/ui.vala:1581
+#. 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>."
@@ -555,11 +594,13 @@ msgstr ""
 "Sterowniki dla tego urządzenia są dostępne na <a "
 "href=\"http://support.brother.com\">stronie firmy Brother</a>."
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "Wykryto skaner marki Samsung."
 
-#: src/ui.vala:1587
+#. 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>."
@@ -567,15 +608,18 @@ msgstr ""
 "Sterowniki dla tego urządzenia są dostępne na <a "
 "href=\"http://samsung.com/support\">stronie firmy Samsung</a>."
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "Wykryto skaner marki HP."
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "Wykryto skaner marki Epson."
 
-#: src/ui.vala:1598
+#. 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>."
@@ -583,125 +627,139 @@ msgstr ""
 "Sterowniki są dostępne na <a href=\"http://support.epson.com\">stronie firmy "
 "Epson</a>."
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr "Instalowanie sterowników"
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Po ukończeniu instalowania należy uruchomić program ponownie."
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "Instalowanie sterowników…"
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "Zainstalowano sterowniki."
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Zainstalowanie sterowników się nie powiodło (kod błędu %d)."
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "Zainstalowanie sterowników się nie powiodło."
 
-#: src/ui.vala:1676
+#. 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 "Należy zainstalować pakiety %s."
 
-#: src/ui.vala:1784
+#. 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/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d DPI (szkic)"
 
-#: src/ui.vala:1790
+#. 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/ui.vala:1793
+#. 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
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr "Nowy dokument"
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr "Dokument"
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr "E-mail…"
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr "Wydrukuj…"
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr "Pomoc"
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr "O programie"
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr "Zakończ"
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Zmień _skaner"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "_Zainstaluj sterowniki"
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automatycznie"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr "Ciemniej"
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr "Jaśniej"
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr "Mniejszy"
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr "Większy"
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr "Minimalnie"
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr "Maksymalnie"
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Zapisywanie dokumentu…"
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Zapisywanie strony %d z %d"
diff --git a/po/pt.gmo b/po/pt.gmo
index 6522f2f..a52b0d0 100644
--- a/po/pt.gmo
+++ b/po/pt.gmo
diff --git a/po/pt.po b/po/pt.po
index 70f1309..2703275 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "Texto"
 msgid "Photo"
 msgstr "Foto"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Reordenar páginas"
 
@@ -207,7 +207,7 @@ msgstr "Digitalizar"
 msgid "Save document to a file"
 msgstr "Guardar documento num ficheiro"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "Guardar"
 
@@ -248,8 +248,7 @@ msgstr "Cortar a página selecionada"
 msgid "Crop"
 msgstr "Recortar"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "Preferências"
 
@@ -327,161 +326,195 @@ msgstr ""
 "Simple Scan usa a estrutura SANE para suportar a maior parte dos scanners "
 "atuais."
 
-#: src/scanner.vala:841
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Sem digitalizador disponível. Por favor, ligue um scanner."
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Impossível ligar ao scanner"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Não é possível iniciar a digitalização"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Erro de comunicação com scanner"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Mostrar a versão de lançamento"
 
-#: src/simple-scan.vala:24
+#. 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
+#: ../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"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Falhou ao digitalizar"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Utilitário de digitalização"
 
-#: src/simple-scan.vala:632
+#. 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 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:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr "Fechar"
 
-#: src/ui.vala:327
+#. 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 utilizador e palavra-passe para aceder a '%s'"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Sem scanners detetados"
 
-#: src/ui.vala:377
+#. 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 "Verifique se o seu scanner está conetado e ligado"
 
-#: src/ui.vala:382
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:382
 msgid "Additional software needed"
 msgstr "Software adicional necessário"
 
-#: src/ui.vala:384
+#. Instructions to install driver software
+#: ../src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr "Precisa instalar o driver de software para o seu scanner."
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "Guardar como..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr "Cancelar"
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr "Guardar"
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Documento digitalizado.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "Ficheiros de imagem"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "Todos os ficheiros"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (documento multi-página)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimido)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (sem perdas)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr "Formato do ficheiro:"
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Falhou ao guardar o ficheiro"
 
-#: src/ui.vala:673
+#. 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 não guardar, as alteração serão perdidas permanentemente."
 
-#: src/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "Guardar documento atual?"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Descartar alterações"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Incapaz de gravar imagem para pré-visualização"
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Não foi possível abrir a aplicação de visualização de imagem"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Combinar lados"
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Combinar lados (inverso)"
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr "Inverter"
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Manter inalterado"
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Não foi possível abrir o ficheiro da ajuda"
 
-#: src/ui.vala:1472
+#. 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"
@@ -510,15 +543,17 @@ msgstr ""
 "\n"
 "este programa. Caso contrário, veja <http://www.gnu.org/licenses/>."
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Acerca do Digitalizações (Simple Scan)"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Ferramenta simples para digitalizar documentos"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -551,19 +586,23 @@ msgstr ""
 "  Tiago Silva https://launchpad.net/~tiagosilva\n"
 "  styluss https://launchpad.net/~styluss"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Guardar documento antes de sair?"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Sair sem guardar"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "Aparenta ter um scanner da Brother."
 
-#: src/ui.vala:1581
+#. 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>."
@@ -571,11 +610,13 @@ msgstr ""
 "Os controladores estão disponíveis em <a "
 "href=\"http://support.brother.com\">Brother website</a>"
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "Aparentemente tem um digitalizador Samsung."
 
-#: src/ui.vala:1587
+#. 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>."
@@ -583,15 +624,18 @@ msgstr ""
 "Os controladores estão disponíveis em <a "
 "href=\"http://samsung.com/support\">Samsung website</a>"
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "Aparentemente tem um digitalizador HP"
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "Aparentemente tem um digitalizador Epson"
 
-#: src/ui.vala:1598
+#. 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>."
@@ -599,126 +643,140 @@ msgstr ""
 "Os drivers para isto estão disponíveis em <a "
 "href=\"http://support.epson.com\">Epson</a>."
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr "Instalar drivers"
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 "Uma vez instalado vai necessitar de re-iniciar a Digitalização Simples"
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "A instalar drivers..."
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "Controladores instalados com sucesso!"
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Erro na instalação dos controladores (código de erro %d)"
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "Falhou a instalar os drivers."
 
-#: src/ui.vala:1676
+#. 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 "Necessita de instalar o pacote(s) %s"
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (predefinido)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (rascunho)"
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (alta-resolução)"
 
-#: src/ui.vala:1793
+#. 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
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr "Novo documento"
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr "Documento"
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr "Email..."
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr "Ajuda"
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr "Sobre"
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr "Sair"
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Alterar _digitalizador"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "_Instalar drivers"
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automático"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr "Escurecer"
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr "Clarear"
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr "Menos"
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr "Mais"
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr "Mínimo"
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr "Máximo"
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr "A guardar o documento..."
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, 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
index a58734b..cf50141 100644
--- a/po/pt_BR.gmo
+++ b/po/pt_BR.gmo
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 3ada035..9659702 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:46+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "Texto"
 msgid "Photo"
 msgstr "Foto"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Reordenar páginas"
 
@@ -207,7 +207,7 @@ msgstr "Digitalizar"
 msgid "Save document to a file"
 msgstr "Salvar documento em arquivo"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "Salvar"
 
@@ -248,8 +248,7 @@ msgstr "Recortar a página selecionada"
 msgid "Crop"
 msgstr "Recortar"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "Preferências"
 
@@ -322,161 +321,195 @@ msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#: src/scanner.vala:841
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 "Nenhum digitalizador disponível. Por favor, conecte um digitalizador."
 
-#: src/scanner.vala:871
+#. 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"
 
-#: src/scanner.vala:1223
+#. 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"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. 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"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Mostrar versão de lançamento"
 
-#: src/simple-scan.vala:24
+#. 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
+#: ../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"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Falha ao digitalizar"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DISPOSITIVO...] - Utilitário de digitalização"
 
-#: src/simple-scan.vala:632
+#. 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
+#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr "Fe_char"
 
-#: src/ui.vala:327
+#. 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'"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Nenhum digitalizador detectado"
 
-#: src/ui.vala:377
+#. 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 "Por favor verifique se o seu digitalizador está conectado e ligado"
 
-#: src/ui.vala:382
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#: src/ui.vala:384
+#. Instructions to install driver software
+#: ../src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "Salvar como..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr "_Salvar"
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Documento digitalizado.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "Arquivos de imagem"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "Todos os arquivos"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (documento com múltiplas páginas)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimido)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (sem perdas)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Falha ao salvar o arquivo"
 
-#: src/ui.vala:673
+#. 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 você não salvar, as alterações serão permanentemente perdidas."
 
-#: src/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "Salvar documento atual?"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Descartar alterações"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Não é possível salvar imagem para visualização"
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Não foi possível abrir o aplicativo de visualização de imagem"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Combine os lados"
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Combine os lados (reverso)"
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr "Reverso"
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Manter inalterado"
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Não foi possível abrir o arquivo de ajuda"
 
-#: src/ui.vala:1472
+#. 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"
@@ -505,15 +538,17 @@ msgstr ""
 "Você deve ter recebido uma cópia da Licença Pública Geral GNU juntamente a\n"
 "este programa. Caso contrário, acesse <http://www.gnu.org/licenses/>."
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Sobre o Digitalizador simples"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Ferramenta simples para digitalizar documentos"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -541,167 +576,190 @@ msgstr ""
 "  kahue https://launchpad.net/~kahuemm\n"
 "  millemiglia https://launchpad.net/~dnieper650"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Salvar o documento antes de sair?"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Sair sem salvar"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#: src/ui.vala:1581
+#. 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 ""
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#: src/ui.vala:1587
+#. 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 ""
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#: src/ui.vala:1598
+#. 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 ""
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#: src/ui.vala:1676
+#. 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 ""
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (padrão)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (rascunho)"
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (alta resolução)"
 
-#: src/ui.vala:1793
+#. 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
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr "Novo documento"
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr "Documentos"
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr "E-mail..."
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr "Ajuda"
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr "Sobre"
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr "Sair"
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Alterar _digitalizador"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automático"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr "Mais escuro"
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr "Mais claro"
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr "Menos"
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr "Mais"
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr "Mínima"
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr "Máxima"
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Salvando documento..."
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Salvando página %d de %d"
diff --git a/po/ro.gmo b/po/ro.gmo
index 25e2831..d09cf8a 100644
--- a/po/ro.gmo
+++ b/po/ro.gmo
diff --git a/po/ro.po b/po/ro.po
index 0473db6..9da0ef6 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 "Language: ro\n"
 
 #. Button to submit authorization dialog
@@ -89,8 +89,8 @@ msgstr "Text"
 msgid "Photo"
 msgstr "Foto"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr ""
 
@@ -208,7 +208,7 @@ msgstr "Scanează"
 msgid "Save document to a file"
 msgstr "Salvează documentul ca fișier"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "Salvează"
 
@@ -249,8 +249,7 @@ msgstr "Decupează pagina selectată"
 msgid "Crop"
 msgstr "Decupează"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "Preferințe"
 
@@ -323,161 +322,195 @@ msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#: src/scanner.vala:841
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Nu există niciun scaner disponibil. Conectați un scaner."
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Nu s-a putut realiza conexiunea la scaner"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Nu s-a putut porni scanarea"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Eroare la comunicarea cu scanerul"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Arată versiunea"
 
-#: src/simple-scan.vala:24
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Afișează mesajele pentru depanare"
 
-#: src/simple-scan.vala:26
+#: ../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ă"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Scanarea a eșuat"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "DISPOZITIV...] - Utilitar pentru scanare"
 
-#: src/simple-scan.vala:632
+#. 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 ""
 "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:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr "Înc_hide"
 
-#: src/ui.vala:327
+#. 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 "Sunt necesare numele de utilizator și parola pentru a accesa „%s”"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Nu a fost detectat niciun scaner"
 
-#: src/ui.vala:377
+#. 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 "Verificați dacă scanerul este conectat și pornit"
 
-#: src/ui.vala:382
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#: src/ui.vala:384
+#. Instructions to install driver software
+#: ../src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "Salvează ca..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Anulare"
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr "_Salvează"
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Document scanat.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "Fișiere imagine"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "Toate fișierele"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (document cu mai multe pagini)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimat)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (fără pierderi)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Salvarea fișierului a eșuat"
 
-#: src/ui.vala:673
+#. 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 "Dacă nu salvați, modificările vor fi pierdute definitiv."
 
-#: src/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "Salvați documentul curent?"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Renunță la modificări"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Nu se poate salva imaginea pentru a prezenta o previzualizare"
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Nu s-a putut deschide aplicația de previzualizare a imaginilor"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr ""
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr ""
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Nu se poate deschide fișierul de ajutor"
 
-#: src/ui.vala:1472
+#. 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"
@@ -508,15 +541,17 @@ msgstr ""
 "împreună cu acest program. În caz contrar, consultați "
 "<http://www.gnu.org/licenses/>."
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Despre „Scanare simplă”"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Utilitar pentru scanarea simplă a documentelor"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -529,167 +564,190 @@ msgstr ""
 "  ValentinV https://launchpad.net/~valentinverde\n"
 "  sfantu https://launchpad.net/~sfantus1"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Salvați documentul înainte de ieșire?"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Închide fără a salva"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#: src/ui.vala:1581
+#. 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 ""
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#: src/ui.vala:1587
+#. 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 ""
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#: src/ui.vala:1598
+#. 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 ""
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#: src/ui.vala:1676
+#. 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 ""
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (implicit)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (ciornă)"
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (rezoluție înaltă)"
 
-#: src/ui.vala:1793
+#. 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
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr ""
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr ""
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr ""
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr ""
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr ""
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr ""
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Schimbă _scanerul"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automată"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr "Mai întunecat"
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr "Mai luminos"
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr "Mai puțin"
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr "Mai mult"
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr "Minim"
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr "Maxim"
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Se salvează documentul..."
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, 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
index 7f6f222..9373593 100644
--- a/po/ru.gmo
+++ b/po/ru.gmo
diff --git a/po/ru.po b/po/ru.po
index 0dcbd81..46e35c6 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "Текст"
 msgid "Photo"
 msgstr "Фотография"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Организация страниц"
 
@@ -207,7 +207,7 @@ msgstr "Сканировать"
 msgid "Save document to a file"
 msgstr "Сохранить документ в файл"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "Сохранить"
 
@@ -248,8 +248,7 @@ msgstr "Обрезать выбранную страницу"
 msgid "Crop"
 msgstr "Обрезать"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "Параметры"
 
@@ -328,157 +327,191 @@ msgstr ""
 "Простое сканирование использует фреймворк SANE для поддержки большинства "
 "существующих сканеров."
 
-#: src/scanner.vala:841
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Нет доступного сканера. Подключите его."
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Не могу подключиться к сканеру"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Не могу начать сканирование"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Ошибка при работе со сканером"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Показать версию"
 
-#: src/simple-scan.vala:24
+#. Help string for command line --debug flag
+#: ../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"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Сканирование не удалось"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] — Устройство сканирования"
 
-#: src/simple-scan.vala:632
+#. 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/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr "_Закрыть"
 
-#: src/ui.vala:327
+#. 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' нужны имя пользователя и пароль"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Сканеры не обнаружены"
 
-#: src/ui.vala:377
+#. 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 "Проверьте, что сканер подсоединён и включён"
 
-#: src/ui.vala:382
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:382
 msgid "Additional software needed"
 msgstr "Необходимо дополнительно программное обеспечение"
 
-#: src/ui.vala:384
+#. Instructions to install driver software
+#: ../src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr "Необходимо установить драйвер для вашего сканера."
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "Сохранить как..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Отменить"
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr "Со_хранить"
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Сканированный документ.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "Файлы изображений"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "Все файлы"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (многостраничный документ)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (сжатый)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (без потерь в качестве)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr "Формат файла:"
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Не удалось сохранить файл"
 
-#: src/ui.vala:673
+#. 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/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "Сохранить текущий документ?"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Отменить изменения"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Не удалось сохранить изображение для предварительного просмотра"
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Невозможно открыть программу для просмотра изображений"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Объединить стороны"
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Объединить стороны (в обратном порядке)"
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr "В обратном порядке"
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Оставить без изменений"
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Не удалось открыть файл справки"
 
-#: src/ui.vala:1472
+#. 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"
@@ -506,15 +539,17 @@ msgstr ""
 "License) должная поставляться с этой программой. В остальных случаях "
 "пройдите по ссылке: <http://www.gnu.org/licenses/>."
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "О программе"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Простой инструмент для сканирования документов"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -552,19 +587,23 @@ msgstr ""
 "  Илья Калитко https://launchpad.net/~kalitko-ilya007\n"
 "  ☠Jay ZDLin☠ https://launchpad.net/~black-buddha666"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Сохранить документ перед выходом?"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Выйти без сохранения"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "Похоже, у вас сканер компании Brother."
 
-#: src/ui.vala:1581
+#. 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>."
@@ -572,11 +611,13 @@ msgstr ""
 "Драйверы для этих сканеров доступны на <a "
 "href=\"http://support.brother.com\">веб-сайте Brother</a>."
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "Похоже, у вас сканер компании Samsung."
 
-#: src/ui.vala:1587
+#. 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>."
@@ -584,15 +625,18 @@ msgstr ""
 "Драйверы для этих сканеров доступны на <a "
 "href=\"http://samsung.com/support\">веб-сайте Samsung</a>."
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "Похоже, у вас сканер компании HP."
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "Похоже, у вас сканер компании Epson."
 
-#: src/ui.vala:1598
+#. 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>."
@@ -600,125 +644,139 @@ msgstr ""
 "Драйверы для этих сканеров доступны на <a "
 "href=\"http://support.epson.com\">веб-сайте Epson</a>."
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr "Установка драйверов"
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "После установки необходимо перезапустить Simple Scan."
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "Установка драйверов…"
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "Драйверы успешно установлены!"
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Не удалось установить драйверы (код ошибки %d)."
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "Не удалось установить драйверы."
 
-#: src/ui.vala:1676
+#. 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 "Необходимо установить пакет(-ы) %s."
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (по умолчанию)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (черновик)"
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (высокое разрешение)"
 
-#: src/ui.vala:1793
+#. 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
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr "Новый документ"
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr "Документ"
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr "Отправить..."
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr "Печать..."
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr "Справка"
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr "О программе"
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr "Завершить"
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Сменить _сканер"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "_Установить драйверы"
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "Выбрать автоматически"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr "Темнее"
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr "Светлее"
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr "Меньше"
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr "Больше"
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr "Мин."
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr "Макс."
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Сохранение документа..."
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Сохранение страницы %d из %d"
diff --git a/po/sd.gmo b/po/sd.gmo
index c52e90d..80c53d1 100644
--- a/po/sd.gmo
+++ b/po/sd.gmo
diff --git a/po/sd.po b/po/sd.po
index 70e671a..81b5c97 100644
--- a/po/sd.po
+++ b/po/sd.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "تحرير"
 msgid "Photo"
 msgstr "فوٽو"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr ""
 
@@ -207,7 +207,7 @@ msgstr "اسڪين"
 msgid "Save document to a file"
 msgstr "دستاويز کي فائل ۾ سانڍيو"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "سانڍيو"
 
@@ -248,8 +248,7 @@ msgstr "چونڊيل صفحي کي ڪاٽيو"
 msgid "Crop"
 msgstr "ڪاٽيو"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "ترجيحون"
 
@@ -322,157 +321,191 @@ msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#: src/scanner.vala:841
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr ""
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr ""
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr ""
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr ""
 
-#: src/simple-scan.vala:24
+#. Help string for command line --debug flag
+#: ../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 ""
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "اسڪين ڪرڻ ۾ ناڪامي"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
-#: src/simple-scan.vala:632
+#. 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
+#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr ""
 
-#: src/ui.vala:327
+#. 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 ""
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr ""
 
-#: src/ui.vala:377
+#. 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 ""
 
-#: src/ui.vala:382
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#: src/ui.vala:384
+#. Instructions to install driver software
+#: ../src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "هينئن سانڍيو..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr ""
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr ""
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "اسڪين دستاويز.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "شڪل فائلون"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "تمام فائلون"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr ""
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr ""
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr ""
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "فائل سانڍڻ ۾ ناڪامي"
 
-#: src/ui.vala:673
+#. 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/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "هاڻوڪو دستاويز سانڍيو؟"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "تبديليون منسوخ ڪريو"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr ""
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr ""
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr ""
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr ""
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "سهڪاري فائل ڀرڻ ۾ ناڪام"
 
-#: src/ui.vala:1472
+#. 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"
@@ -488,181 +521,206 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "سادي اسڪين بابت"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "سادو دستاويز اسڪين ڪندڙ اوزار"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Abdul-Rahim Nizamani https://launchpad.net/~ghaffari"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "نڪرڻ کان پهرين دستاويز سانڍيو؟"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "سانڍڻ بغير نڪرو"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#: src/ui.vala:1581
+#. 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 ""
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#: src/ui.vala:1587
+#. 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 ""
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#: src/ui.vala:1598
+#. 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 ""
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#: src/ui.vala:1676
+#. 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 ""
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
-#: src/ui.vala:1793
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: src/ui.vala:1835
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr ""
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr ""
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr ""
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr ""
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr ""
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr ""
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "اسڪينر _تبديل ڪريو"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "پاڻمرادو"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr ""
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr ""
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr ""
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr ""
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr ""
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr ""
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr ""
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/se.gmo b/po/se.gmo
index 1927930..ea6f61e 100644
--- a/po/se.gmo
+++ b/po/se.gmo
diff --git a/po/se.po b/po/se.po
index b21602a..65bc086 100644
--- a/po/se.po
+++ b/po/se.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "Teaksta"
 msgid "Photo"
 msgstr "Fotografiija"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr ""
 
@@ -207,7 +207,7 @@ msgstr "Oza"
 msgid "Save document to a file"
 msgstr ""
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "Vurke"
 
@@ -248,8 +248,7 @@ msgstr ""
 msgid "Crop"
 msgstr ""
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "Oidimat"
 
@@ -322,157 +321,191 @@ msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#: src/scanner.vala:841
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr ""
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr ""
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr ""
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr ""
 
-#: src/simple-scan.vala:24
+#. Help string for command line --debug flag
+#: ../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 ""
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr ""
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
-#: src/simple-scan.vala:632
+#. 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
+#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr ""
 
-#: src/ui.vala:327
+#. 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 ""
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr ""
 
-#: src/ui.vala:377
+#. 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 ""
 
-#: src/ui.vala:382
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#: src/ui.vala:384
+#. Instructions to install driver software
+#: ../src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "Vurke nugo …"
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr ""
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr ""
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr ""
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "Buot fiillat"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr ""
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr ""
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr ""
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr ""
 
-#: src/ui.vala:673
+#. 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/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr ""
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr ""
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr ""
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr ""
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr ""
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr ""
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr ""
 
-#: src/ui.vala:1472
+#. 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"
@@ -488,181 +521,206 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Simple Scan-dieđut"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Christopher Forster https://launchpad.net/~christopherforster"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr ""
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr ""
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#: src/ui.vala:1581
+#. 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 ""
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#: src/ui.vala:1587
+#. 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 ""
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#: src/ui.vala:1598
+#. 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 ""
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#: src/ui.vala:1676
+#. 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 ""
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
-#: src/ui.vala:1793
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: src/ui.vala:1835
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr ""
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr ""
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr ""
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr ""
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr ""
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr ""
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr ""
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automáhtalaš"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr ""
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr ""
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr ""
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr ""
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr ""
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr ""
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr ""
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/shn.gmo b/po/shn.gmo
index c18da32..14b4f13 100644
--- a/po/shn.gmo
+++ b/po/shn.gmo
diff --git a/po/shn.po b/po/shn.po
index a7ad3e9..92f9ef0 100644
--- a/po/shn.po
+++ b/po/shn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "လိၵ်ႈ"
 msgid "Photo"
 msgstr ""
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr ""
 
@@ -207,7 +207,7 @@ msgstr ""
 msgid "Save document to a file"
 msgstr ""
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr ""
 
@@ -248,8 +248,7 @@ msgstr ""
 msgid "Crop"
 msgstr ""
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr ""
 
@@ -322,157 +321,191 @@ msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#: src/scanner.vala:841
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr ""
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr ""
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr ""
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr ""
 
-#: src/simple-scan.vala:24
+#. Help string for command line --debug flag
+#: ../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 ""
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr ""
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
-#: src/simple-scan.vala:632
+#. 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
+#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr ""
 
-#: src/ui.vala:327
+#. 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 ""
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr ""
 
-#: src/ui.vala:377
+#. 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 ""
 
-#: src/ui.vala:382
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#: src/ui.vala:384
+#. Instructions to install driver software
+#: ../src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr ""
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr ""
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr ""
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr ""
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr ""
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr ""
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr ""
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr ""
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr ""
 
-#: src/ui.vala:673
+#. 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/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr ""
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr ""
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr ""
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr ""
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr ""
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr ""
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr ""
 
-#: src/ui.vala:1472
+#. 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"
@@ -488,181 +521,206 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr ""
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Rockworld https://launchpad.net/~rockrock2222222"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr ""
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr ""
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#: src/ui.vala:1581
+#. 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 ""
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#: src/ui.vala:1587
+#. 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 ""
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#: src/ui.vala:1598
+#. 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 ""
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#: src/ui.vala:1676
+#. 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 ""
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
-#: src/ui.vala:1793
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: src/ui.vala:1835
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr ""
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr ""
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr ""
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr ""
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr ""
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr ""
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr ""
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr ""
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr ""
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr ""
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr ""
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr ""
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr ""
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr ""
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr ""
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/sk.gmo b/po/sk.gmo
index 9f97316..7d634de 100644
--- a/po/sk.gmo
+++ b/po/sk.gmo
diff --git a/po/sk.po b/po/sk.po
index f40a194..d17acca 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 "Language: sk\n"
 
 #. Button to submit authorization dialog
@@ -90,8 +90,8 @@ msgstr "Text"
 msgid "Photo"
 msgstr "Fotografia"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Zmeniť poradie stránok"
 
@@ -209,7 +209,7 @@ msgstr "Skenovať"
 msgid "Save document to a file"
 msgstr "Uloží dokument do súboru"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "Uložiť"
 
@@ -251,8 +251,7 @@ msgstr "Oreže vybratú stránku"
 msgid "Crop"
 msgstr "Orezanie"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "Nastavenia"
 
@@ -331,161 +330,195 @@ msgstr ""
 "Aplikácia Jednoduché skenovanie využíva rozhranie SANE, kvôli podpore "
 "väčšiny existujúcich skenerov."
 
-#: src/scanner.vala:841
+#. 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."
 
-#: src/scanner.vala:871
+#. 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"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Nie je možné začať skenovať"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. 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"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Zobrazí verziu vydania"
 
-#: src/simple-scan.vala:24
+#. 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
+#: ../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"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Skenovanie zlyhalo"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ZARIADENIE…] - Nástroj na skenovanie"
 
-#: src/simple-scan.vala:632
+#. 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 ""
 "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
+#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr "_Zavrieť"
 
-#: src/ui.vala:327
+#. 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'"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Nezistili sa žiadne skenery"
 
-#: src/ui.vala:377
+#. 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 "Prosím, skontrolujte, či je skener pripojený a zapnutý"
 
-#: src/ui.vala:382
+#. 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"
 
-#: src/ui.vala:384
+#. 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."
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "Uložiť ako..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr "Z_rušiť"
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr "_Uložiť"
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Naskenovaný dokument.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "Súbory obrázkov"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "Všetky súbory"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (dokument s viacerými stránkami)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (komprimovaný)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (bezstratový)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr "Formát súboru:"
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Ukladanie súboru zlyhalo"
 
-#: src/ui.vala:673
+#. 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 "Ak dokument neuložíte, zmeny budú natrvalo stratené."
 
-#: src/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "Uložiť aktuálny dokument?"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Zahodiť zmeny"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Nepodarilo sa uložiť obraz na náhľad"
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Nie je možné otvoriť aplikáciu na náhľad obrázku"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Kombinovať strany"
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Kombinovať strany (obrátene)"
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr "Obrátiť"
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Ponechať nezmenené"
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Nie je možné otvoriť súbor pomocníka"
 
-#: src/ui.vala:1472
+#. 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"
@@ -514,15 +547,17 @@ msgstr ""
 "Spolu s týmto programom by ste mali obdržať kópiu Všeobecnej verejnej "
 "licencie GNU. Ak sa tak nestalo, navštívte <http://www.gnu.org/licenses/>."
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "O programe Jednoduché skenovanie"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Nástroj na jednoduché skenovanie dokumentov"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -534,19 +569,23 @@ msgstr ""
 "  Pavol Klačanský https://launchpad.net/~pavolzetor-deactivatedaccount\n"
 "  Robert Ancell https://launchpad.net/~robert-ancell"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Uložiť dokument pred ukončením?"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Ukončiť bez uloženia"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "Zdá sa, že máte skener značky Brother."
 
-#: src/ui.vala:1581
+#. 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>."
@@ -555,11 +594,13 @@ msgstr ""
 "href=\"http://support.brother.com/g/b/countrytop.aspx?c=cz&lang=cs\">Brother "
 "website</a>."
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "Zdá sa, že máte skener značky Samsung."
 
-#: src/ui.vala:1587
+#. 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>."
@@ -567,15 +608,18 @@ msgstr ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/sk/support\">Samsung website</a>."
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "Zdá sa, že máte skener značky HP."
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "Zdá sa, že máte skener značky Epson."
 
-#: src/ui.vala:1598
+#. 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>."
@@ -584,126 +628,140 @@ msgstr ""
 "href=\"http://www.epson.sk/sk/sk/viewcon/corporatesite/support\">webovej "
 "stránke výrobcu Epson</a>."
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr "Inštalácia ovládačov"
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 "Po inštalácii budete musieť aplikáciu Jednoduché skenovanie reštartovať."
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "Inštalujú sa ovládače..."
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "Ovládače boli úspešne nainštalované!"
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Zlyhala inštalácia ovládačov (kód chyby %d)."
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "Zlyhala inštalácia ovládačov."
 
-#: src/ui.vala:1676
+#. 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 "Musíte nainštalovať balík(y) %s."
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (predvolené)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (koncept)"
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (vysoké rozlíšenie)"
 
-#: src/ui.vala:1793
+#. 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
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr "Nový dokument"
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr "Dokument"
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr "Email..."
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr "Tlačiť..."
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr "Pomocník"
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr "O programe"
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr "Ukončiť"
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Zmeniť _skener"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "Na_inštalovať ovládače"
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automatická"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr "Tmavší"
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr "Svetlejší"
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr "Menší"
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr "Väčší"
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr "Minimálna"
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr "Maximálna"
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Ukladá sa dokument…"
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Ukladá sa %d. stránka z %d"
diff --git a/po/sl.gmo b/po/sl.gmo
index d40eb62..06f156a 100644
--- a/po/sl.gmo
+++ b/po/sl.gmo
diff --git a/po/sl.po b/po/sl.po
index 48123b0..ca604d0 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "Besedilo"
 msgid "Photo"
 msgstr "Fotografija"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Prerazporeditev strani"
 
@@ -207,7 +207,7 @@ msgstr "Optično branje"
 msgid "Save document to a file"
 msgstr "Shrani dokument v datoteko"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "Shrani"
 
@@ -248,8 +248,7 @@ msgstr "Obreži izbrano stran"
 msgid "Crop"
 msgstr "Obreži"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "Možnosti"
 
@@ -328,158 +327,192 @@ msgstr ""
 "Enostavno optično branje zahteva ogrodje SANE, da lahko podpira večino "
 "obstoječih optičnih bralnikov."
 
-#: src/scanner.vala:841
+#. 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."
 
-#: src/scanner.vala:871
+#. 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"
 
-#: src/scanner.vala:1223
+#. 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"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. 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"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Pokaži podrobnosti različice"
 
-#: src/simple-scan.vala:24
+#. 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
+#: ../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"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Optično branje je spodletelo"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[NAPRAVA ...] - pripomoček optičnega branja"
 
-#: src/simple-scan.vala:632
+#. 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
+#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr "_Zapri"
 
-#: src/ui.vala:327
+#. 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"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Optičnega bralnika ni mogoče zaznati"
 
-#: src/ui.vala:377
+#. 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 "Preverite, če je vaš optični bralnik povezan in vklopljen"
 
-#: src/ui.vala:382
+#. 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"
 
-#: src/ui.vala:384
+#. 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."
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "Shrani kot ..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Prekliči"
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr "_Shrani"
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Optično bran dokument.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "Slikovne datoteke"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "Vse datoteke"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (večstranski dokument)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (stisnjen)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (brez izgub)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr "Vrsta datoteke:"
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Shranjevanje datoteke je spodletelo"
 
-#: src/ui.vala:673
+#. 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/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "Naj bo trenutni dokument shranjen?"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Zavrzi vse spremembe"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Ni bilo mogoče shraniti slike za predogled"
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Ni mogoče odpreti programa predogleda slik"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Spoji strani"
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Spoji strani (obratno)"
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr "Obrnjeno"
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Ohrani nespremenjeno"
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Ni mogoče odpreti datoteke pomoči"
 
-#: src/ui.vala:1472
+#. 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"
@@ -510,15 +543,17 @@ msgstr ""
 "\n"
 "v primeru, da kopije niste prejeli si oglejte <http://www.gnu.org/licenses/>."
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "O programu"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Preprosto orodje za optično branje dokumentov"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -532,19 +567,23 @@ msgstr ""
 "  Sasa Batistic https://launchpad.net/~sasa-batistic\n"
 "  grofaty https://launchpad.net/~grofaty"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Ali naj bo dokument pred končanjem programa shranjen?"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Končaj brez shranjevanja"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "Videti je, da imate optični bralnik Brother."
 
-#: src/ui.vala:1581
+#. 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>."
@@ -552,11 +591,13 @@ msgstr ""
 "Za ta optični bralnik so gonilniki na voljo na  <a "
 "href=\"http://support.brother.com\">spletni strani Brother</a>."
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "Videti je, da imate optični bralnik Samsung."
 
-#: src/ui.vala:1587
+#. 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>."
@@ -564,15 +605,18 @@ msgstr ""
 "Za ta optični bralnik so gonilniki na voljo na  <a "
 "href=\"http://samsung.com/support\">spletni strani Samsung</a>."
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "Videti je, da imate optični bralnik HP."
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "Videti je, da imate optični bralnik Epson."
 
-#: src/ui.vala:1598
+#. 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>."
@@ -580,127 +624,141 @@ msgstr ""
 "Gonilniki za to so na voljo na <a "
 "href=\"http://support.epson.com\">spletišču Epson</a>."
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr "Namesti gonilnike"
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 "Ko se namestijo, boste morali program Enostavno optično branje ponovno "
 "zagnati."
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "Nameščanje gonilnikov ..."
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "Gonilniki uspešno nameščeni!"
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Namestitev gonilnikov je spodletela (koda napake %d)."
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "Namestitev gonilnikov je spodletela."
 
-#: src/ui.vala:1676
+#. 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 "Morate namestiti paket(e) %s."
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d točk na palec (privzeto)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d točk na palec (osnutek)"
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d točk na palec (visoka ločljivost)"
 
-#: src/ui.vala:1793
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d točk na palec"
 
-#: src/ui.vala:1835
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr "Nov dokument"
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr "Dokument"
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr "E-pošta ..."
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr "Natisni ..."
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr "Pomoč"
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr "O programu"
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr "Izhod"
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Spremeni _optični bralnik"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "_Namesti gonilnike"
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "Samodejno"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr "Temenjše"
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr "Svetlejše"
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr "Manj"
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr "Več"
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr "Najmanj"
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr "Največ"
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Shranjevanje dokumenta ..."
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Shranjevanje strani %d od %d"
diff --git a/po/sq.gmo b/po/sq.gmo
index ddff748..96b9d0a 100644
--- a/po/sq.gmo
+++ b/po/sq.gmo
diff --git a/po/sq.po b/po/sq.po
index cc70e4d..8f5fbcc 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "Tekst"
 msgid "Photo"
 msgstr "Foto"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Riorganizo faqet"
 
@@ -207,7 +207,7 @@ msgstr "Skanim"
 msgid "Save document to a file"
 msgstr "Ruaje dokumentin tek një fajll"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "Ruaj"
 
@@ -248,8 +248,7 @@ msgstr "Preje faqen e përzgjedhur"
 msgid "Crop"
 msgstr "Prej"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "Parapëlqimet"
 
@@ -322,162 +321,196 @@ msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#: src/scanner.vala:841
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Nuk ka skanera të disponueshëm. Ju lutemi të lidhni një skaner."
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Nuk jemi në gjendje të lidhim një skaner"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Nuk munda të nis skanimin"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Gabim gjatë komunikimit me skanerin"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Shfaq versionin e programit"
 
-#: src/simple-scan.vala:24
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Printo mesazhet e gabimeve"
 
-#: src/simple-scan.vala:26
+#: ../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ë"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Skanimi dështoi"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Mjet i skanimit"
 
-#: src/simple-scan.vala:632
+#. 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 ""
 "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:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr "_Mbylle"
 
-#: src/ui.vala:327
+#. 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 "Emri i përdoruesit dhe skanimi kërkohet për të hyrë në '%s'"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Nuk u dalluan skanera"
 
-#: src/ui.vala:377
+#. 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 ""
 "Ju lutemi të kontrolloni nëse skaneri juaj është i lidhur dhe i ndezur"
 
-#: src/ui.vala:382
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#: src/ui.vala:384
+#. Instructions to install driver software
+#: ../src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "Ruaje Si..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Anullo"
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr "_Ruaje"
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Dokumenti i Skanuar.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "Kartela Pamje"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "Të Gjithë Skedarët"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (dokument shumë faqësh)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (i ngjeshur)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (pa humbje)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr "Formati i skedarit:"
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Dështuam në ruajtjen e skedarit"
 
-#: src/ui.vala:673
+#. 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 "Nëse nuk  ruani, ndryshimet do të humbasin përgjithmonë."
 
-#: src/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "Ta ruaj dokumentin e tanishëm?"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Anullo Ndryshimet"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Nuk jemi në gjendje ta ruajmë imazhin për parapamje"
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Nuk jam në gjendje të hap programin për parapamjen e imazhit"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr "Mbrapsht"
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Mbaje të pandryshuar"
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "E pamundur hapja e file të ndihmës"
 
-#: src/ui.vala:1472
+#. 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"
@@ -505,15 +538,17 @@ msgstr ""
 "Ju duhet të keni marrë një kopje të Liçensës së Përgjithshme Publike të GNU\n"
 "me këtë program. Nëse jo, shikoni <http://www.gnu.org/licenses/>."
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Rreth Skanimit të Thjeshtë"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Mjet i thjeshtë për skanimin e dokumenteve"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -522,167 +557,190 @@ msgstr ""
 "  Indrit Bashkimi https://launchpad.net/~indritbsh\n"
 "  Vilson Gjeci https://launchpad.net/~vilsongjeci"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Ta ruaj dokumentin para daljes?"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Dil pa e ruajtur"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#: src/ui.vala:1581
+#. 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 ""
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#: src/ui.vala:1587
+#. 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 ""
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#: src/ui.vala:1598
+#. 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 ""
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#: src/ui.vala:1676
+#. 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 ""
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (e parazgjedhur)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (i thjeshtë)"
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (rezolucion i lartë)"
 
-#: src/ui.vala:1793
+#. 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
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr "Dokument i ri"
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr "Dokument"
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr "Email..."
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
-msgstr ""
+msgstr "Printo..."
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr "Ndihmë"
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
-msgstr ""
+msgstr "Rreth"
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
-msgstr ""
+msgstr "Dil"
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Ndrysho _Skanerin"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
-msgstr ""
+msgstr "_Instalo Draiverat"
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automatik"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr "Më e Errët"
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr "Më e lehtë"
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr "Më Pak"
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr "Më tepër"
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr "Minimum"
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr "Maksimum"
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Ruajtje e dokumentit..."
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, 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
index 2add200..9274f0d 100644
--- a/po/sr.gmo
+++ b/po/sr.gmo
diff --git a/po/sr.po b/po/sr.po
index 444b5cf..9a7be3a 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 "Language: sr\n"
 
 #. Button to submit authorization dialog
@@ -88,8 +88,8 @@ msgstr "Текст"
 msgid "Photo"
 msgstr "Слика"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Промени ред страница"
 
@@ -207,7 +207,7 @@ msgstr "Скенирај"
 msgid "Save document to a file"
 msgstr "Сачувајте документ у датотеку"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "Сачувај"
 
@@ -248,8 +248,7 @@ msgstr "Одрежите изабрану страницу"
 msgid "Crop"
 msgstr "Одрежи"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "Поставке"
 
@@ -327,159 +326,193 @@ msgstr ""
 "Обично скенирање користи САНЕ радни оквир да би додатно подржао већину "
 "тренутних скенера."
 
-#: src/scanner.vala:841
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Нема доступних скенера.  Прикључите скенер."
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Не могу да се повежем са скенером"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Не могу да започнем скенирање"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Грешка у коминикацији са скенером"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Приказује издање програма"
 
-#: src/simple-scan.vala:24
+#. Help string for command line --debug flag
+#: ../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 ""
 "Поправља ПДФ датотеке створене старијим издањима Једноставног скенирања"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Нисам успео да скенирам"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[УРЕЂАЈ...] — алатка за скенирање"
 
-#: src/simple-scan.vala:632
+#. 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/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr "_Затвори"
 
-#: src/ui.vala:327
+#. 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“"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Нема откривених скенера"
 
-#: src/ui.vala:377
+#. 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 "Проверите да ли је скенер повезан и укључен"
 
-#: src/ui.vala:382
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:382
 msgid "Additional software needed"
 msgstr "Потребан је додатни софтвер"
 
-#: src/ui.vala:384
+#. Instructions to install driver software
+#: ../src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr "Морате да инсталирате управљачке програме за ваш скенер."
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "Сачувај као..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Откажи"
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr "_Сачувај"
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Скенирани документ.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "Датотеке слика"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "Све датотеке"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "ПДФ (документ са више страна)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "ЈПЕГ (сажето)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "ПНГ (без губитака)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr "Запис датотеке:"
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Нисам успео да сачувам датотеку"
 
-#: src/ui.vala:673
+#. 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/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "Да сачувам текући документ?"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Одбаци измене"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Не могу да сачувам слику за преглед"
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Не могу да отворим програм за приказивање слика"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Обједини стране"
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Обједини стране (преокрени)"
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr "Преокрени"
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Задржи неизмењено"
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Не могу да отворим датотеку помоћи"
 
-#: src/ui.vala:1472
+#. 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"
@@ -508,15 +541,17 @@ msgstr ""
 "уз овај програм. Ако нисте, погледајте:\n"
 "http://www.gnu.org/licenses/."
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "О Једноставном скенирању"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Једноставна алатка за скенирање докумената"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -527,19 +562,23 @@ msgstr ""
 "  Марко М. Костић https://launchpad.net/~marko-m-kostic\n"
 "  Мирослав Николић https://launchpad.net/~lipek"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Да сачувам документ пре него што изађем?"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Изађи без чувања"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "Изгледа да имате Бродеров скенер."
 
-#: src/ui.vala:1581
+#. 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>."
@@ -547,11 +586,13 @@ msgstr ""
 "Управљачки програми су доступни на <a "
 "href=\"http://support.brother.com\">веб сајту Бродера</a>."
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "Изгледа да имате Самсунгов скенер."
 
-#: src/ui.vala:1587
+#. 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>."
@@ -559,15 +600,18 @@ msgstr ""
 "Управљачки програми су доступни на <a "
 "href=\"http://samsung.com/support\">веб сајту Самсунга</a>."
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "Изгледа да имате Хевлет-Пакардов скенер."
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "Изгледа да имате Епсонов скенер."
 
-#: src/ui.vala:1598
+#. 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>."
@@ -575,126 +619,140 @@ msgstr ""
 "Управљачки програми су доступни на <a href=\"http://support.epson.com\">веб "
 "сајту Епсона</a>."
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr "Инсталација управљачких програма"
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 "Након инсталације мораћете поново да покренете Једноставно скенирање."
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "Инсталирам управљачке програме..."
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "Управљачки програми су успешно инсталирани!"
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Нисам успео да инсталирам управљачке програме (грешка %d)."
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "Нисам успео да инсталирам управљачке програме."
 
-#: src/ui.vala:1676
+#. 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 "Треба да инсталирате пакет „%s“."
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d тпи (основно)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d тпи (нацрт)"
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d тпи (висока резолуција)"
 
-#: src/ui.vala:1793
+#. 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
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr "Нови документ"
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr "Документ"
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr "Ел. пошта..."
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr "Штампај..."
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr "Помоћ"
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr "О програму"
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr "Изађи"
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Промени _скенер"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "_Инсталирај управљачке програме"
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "Самостално"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr "Тамније"
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr "Светлије"
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr "Мањи"
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr "Већи"
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr "Најнижи"
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr "Највиши"
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Чувам документ..."
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Чувам %d. страницу од укупно %d"
diff --git a/po/sv.gmo b/po/sv.gmo
index 3e900cf..9e5ec7d 100644
--- a/po/sv.gmo
+++ b/po/sv.gmo
diff --git a/po/sv.po b/po/sv.po
index de339ce..0ec9708 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "Text"
 msgid "Photo"
 msgstr "Foto"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Ändra sidordning"
 
@@ -207,7 +207,7 @@ msgstr "Läs in"
 msgid "Save document to a file"
 msgstr "Spara dokument till en fil"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "Spara"
 
@@ -248,8 +248,7 @@ msgstr "Beskär den valda sidan"
 msgid "Crop"
 msgstr "Beskär"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "Inställningar"
 
@@ -328,159 +327,193 @@ msgstr ""
 "Simple Scan använder ramverket SANE för att hantera de flesta skannrar som "
 "finns på marknaden."
 
-#: src/scanner.vala:841
+#. 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."
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Kan inte ansluta till bildläsare"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Kan inte starta inläsning"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. 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"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Visa utgåvans version"
 
-#: src/simple-scan.vala:24
+#. 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
+#: ../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"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Misslyckades med att läsa in"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ENHET...] - Bildinläsningsverktyg"
 
-#: src/simple-scan.vala:632
+#. 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 ""
 "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
+#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr "_Stäng"
 
-#: src/ui.vala:327
+#. 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\""
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Inga bildinläsare hittades"
 
-#: src/ui.vala:377
+#. 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 "Kontrollera att din bildläsare är ansluten och påslagen"
 
-#: src/ui.vala:382
+#. 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"
 
-#: src/ui.vala:384
+#. 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."
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "Spara som..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr "_Spara"
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Inläst dokument.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "Bildfiler"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "Alla filer"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (flersidigt dokument)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (komprimerad)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (förlustfri)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr "Filformat:"
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Misslyckades med att spara filen"
 
-#: src/ui.vala:673
+#. 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 "Om du inte sparar så kommer ändringarna att gå förlorade."
 
-#: src/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "Spara aktuellt dokument?"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Förkasta ändringar"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Kunde inte spara bild för förhandsvisning"
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Kunde inte öppna förhandsvisningsprogrammet för bilder"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Kombinera sidor"
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Kombinera sidor (omvänt)"
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr "Omvänt"
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Behåll oförändrad"
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Kunde inte öppna hjälpfilen"
 
-#: src/ui.vala:1472
+#. 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"
@@ -509,15 +542,17 @@ msgstr ""
 "Du bör ha fått en kopia av GNU General Public License tillsammans\n"
 "med detta program. Om inte, se <http://www.gnu.org/licenses/>."
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Om Enkel bildinläsning"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Enkelt verktyg för inläsning av dokument"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -534,19 +569,23 @@ msgstr ""
 "  Teodor Jönsson https://launchpad.net/~teodor-jonsson-sogeti-"
 "deactivatedaccount"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Spara dokumment innan du avslutar?"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Avsluta utan att spara"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "Du verkar ha en skanner från Brother."
 
-#: src/ui.vala:1581
+#. 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>."
@@ -554,11 +593,13 @@ msgstr ""
 "Drivrutinerna finns på <a href=\"http://support.brother.com\">Brothers "
 "webbplats</a>."
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "Du verkar ha en skanner från Samsung."
 
-#: src/ui.vala:1587
+#. 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>."
@@ -566,15 +607,18 @@ msgstr ""
 "Drivrutinerna finns på <a href=\"http://samsung.com/support\">Samsungs "
 "webbplats</a>."
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "Du verkar ha en skanner från HP."
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "Du verkar ha en skanner från Epson."
 
-#: src/ui.vala:1598
+#. 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>."
@@ -582,125 +626,139 @@ msgstr ""
 "Drivrutiner är tillgängliga på <a href=\"http://support.epson.com\">Epsons "
 "webbplats</a>."
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr "Installera drivrutiner"
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Efter installation kan du behöva starta om Simple Scan."
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "Installerar drivrutiner..."
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "Drivrutinerna installerades!"
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Kunde inte installera drivrutiner (felkod %d)."
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "Kunde inte installera drivrutiner."
 
-#: src/ui.vala:1676
+#. 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 "Du behöver installera paket(en) %s."
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (standard)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (utkast)"
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (hög upplösning)"
 
-#: src/ui.vala:1793
+#. 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
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr "Nytt dokument"
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr "Dokument"
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr "E-post..."
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr "Skriv ut..."
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr "Hjälp"
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr "Om"
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr "Avsluta"
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Byt _bildinläsare"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "_Installera drivrutiner"
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automatiskt"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr "Mörkare"
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr "Ljusare"
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr "Mindre"
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr "Mer"
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr "Minimum"
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr "Maximum"
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Sparar dokument..."
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Sparar sida %d av %d"
diff --git a/po/ta.gmo b/po/ta.gmo
index 79fcccf..92e64d4 100644
--- a/po/ta.gmo
+++ b/po/ta.gmo
diff --git a/po/ta.po b/po/ta.po
index 202eedc..886e6f3 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "உரை"
 msgid "Photo"
 msgstr ""
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr ""
 
@@ -207,7 +207,7 @@ msgstr ""
 msgid "Save document to a file"
 msgstr ""
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr ""
 
@@ -248,8 +248,7 @@ msgstr "தேர்வு செய்த பக்கத்தை வெட்
 msgid "Crop"
 msgstr ""
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr ""
 
@@ -322,157 +321,191 @@ msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#: src/scanner.vala:841
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr ""
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr ""
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr ""
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr ""
 
-#: src/simple-scan.vala:24
+#. Help string for command line --debug flag
+#: ../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 ""
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr ""
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
-#: src/simple-scan.vala:632
+#. 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
+#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr ""
 
-#: src/ui.vala:327
+#. 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 ""
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr ""
 
-#: src/ui.vala:377
+#. 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 ""
 
-#: src/ui.vala:382
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#: src/ui.vala:384
+#. Instructions to install driver software
+#: ../src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr ""
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr ""
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr ""
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr ""
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr ""
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr ""
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr ""
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr ""
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr ""
 
-#: src/ui.vala:673
+#. 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/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr ""
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr ""
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr ""
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr ""
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr ""
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr ""
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr ""
 
-#: src/ui.vala:1472
+#. 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"
@@ -488,15 +521,17 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr ""
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -505,167 +540,190 @@ msgstr ""
 "  Ramesh https://launchpad.net/~rame20002007\n"
 "  mano-மனோ https://launchpad.net/~manoj-neyveli"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr ""
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr ""
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#: src/ui.vala:1581
+#. 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 ""
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#: src/ui.vala:1587
+#. 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 ""
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#: src/ui.vala:1598
+#. 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 ""
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#: src/ui.vala:1676
+#. 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 ""
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
-#: src/ui.vala:1793
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: src/ui.vala:1835
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr ""
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr ""
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr ""
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr ""
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr ""
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr ""
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr ""
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr ""
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr ""
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr ""
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr ""
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr ""
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr ""
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr ""
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr ""
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/te.gmo b/po/te.gmo
index 95fd395..bd237cc 100644
--- a/po/te.gmo
+++ b/po/te.gmo
diff --git a/po/te.po b/po/te.po
index 0fb5f49..b6f9247 100644
--- a/po/te.po
+++ b/po/te.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "పాఠ్యం"
 msgid "Photo"
 msgstr "ఫొటో"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr ""
 
@@ -207,7 +207,7 @@ msgstr "స్కాన్"
 msgid "Save document to a file"
 msgstr "పత్రాన్ని ఫైలులో దాచు"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "భద్రపరచు"
 
@@ -248,8 +248,7 @@ msgstr "ఎంపికైన పెజీ అంచులుసవరించ�
 msgid "Crop"
 msgstr "అంచులుసవరించు"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "ప్రాధాన్యతలు"
 
@@ -322,158 +321,192 @@ msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#: src/scanner.vala:841
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "ఏ స్కానర్‌లు అందుబాటులోలేవు. దయచేసి ఒక స్కానర్‌ను అనుసంధానించండి."
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "స్కానర్‌కు అనుసంధానించలేకపోతోంది"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "స్కాన్ ప్రారంభించుట వీలుకాలేదు"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "స్కానర్‌తో వర్తమాన దోషం"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "విడుదల రూపాంతరాన్ని చూపించు"
 
-#: src/simple-scan.vala:24
+#. Help string for command line --debug flag
+#: ../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 ""
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "స్కాన్‌చేయుటలో విఫలమైంది"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
-#: src/simple-scan.vala:632
+#. 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/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr ""
 
-#: src/ui.vala:327
+#. 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' వాడుటకు వాడుకరిపేరు మరియు సంకేతపదం కావాలి"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "ఏ స్కానర్‌లు కనిపెట్టబడలేదు"
 
-#: src/ui.vala:377
+#. 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 ""
 "మీ స్కానర్ విద్యుత్తుచే చేతనమై కంప్యూటర్‌కు అనుసంధానమైనదో లేదో చూడండి."
 
-#: src/ui.vala:382
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#: src/ui.vala:384
+#. Instructions to install driver software
+#: ../src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "ఇలా దాచు..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr ""
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr ""
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "స్కాన్‌చేయబడిన పత్రం.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "బొమ్మ ఫైళ్లు"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "అన్ని ఫైళ్ళు"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (బహుళ-పేజి పత్రం)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (కుదించిన)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (నష్టంలేని)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "ఫైల్ దాచుటలో విఫలమైంది"
 
-#: src/ui.vala:673
+#. 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/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "ప్రస్తుత పత్రాన్ని దాచాలా?"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "మార్పులు వదలివేయి"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "మునుజూపు కొరకు బొమ్మను భద్రపరుచులేకపోతున్నది"
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "బొమ్మ మునుజూపు అనువర్తనం తెరచుట వీలుకాలేదు"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr ""
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr ""
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "సహాయ ఫైలు తెరువలేకపోయింది"
 
-#: src/ui.vala:1472
+#. 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"
@@ -500,15 +533,17 @@ msgstr ""
 "GNU General Public License మీకు దీనితో ఇచ్చి వుండాలి\n"
 " లేనిచో చూడండి <http://www.gnu.org/licenses/>."
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "సింపుల్ స్కాన్ గురించి"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "సులభంగా పత్ర స్కానింగ్‌చేయు సాధనం"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -517,167 +552,190 @@ msgstr ""
 "  arjuna rao chavala https://launchpad.net/~arjunaraoc\n"
 "  వీవెన్ https://launchpad.net/~veeven"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "నిష్క్రమించేముందు పత్రాన్ని దాచాలా?"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "దాచకుండా నిష్క్రమించు"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#: src/ui.vala:1581
+#. 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 ""
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#: src/ui.vala:1587
+#. 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 ""
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#: src/ui.vala:1598
+#. 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 ""
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#: src/ui.vala:1676
+#. 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 ""
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (అప్రమేయ)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (చిత్తు)"
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (ఉన్నత విభాజకత)"
 
-#: src/ui.vala:1793
+#. 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
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr ""
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr ""
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr ""
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr ""
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr ""
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr ""
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "స్కానర్‌ను మార్చు(_S)"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "స్వయంచాలక"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr ""
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr ""
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr ""
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr ""
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr ""
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr ""
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr ""
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/th.gmo b/po/th.gmo
index 81f4009..d8f9612 100644
--- a/po/th.gmo
+++ b/po/th.gmo
diff --git a/po/th.po b/po/th.po
index e1bafac..d8a5518 100644
--- a/po/th.po
+++ b/po/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "ข้อความ"
 msgid "Photo"
 msgstr "ภาพถ่าย"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr ""
 
@@ -207,7 +207,7 @@ msgstr "สแกน"
 msgid "Save document to a file"
 msgstr "บันทึกเอกสารเป็นแฟ้ม"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "บันทึก"
 
@@ -248,8 +248,7 @@ msgstr "ตัดหน้าที่เลือก"
 msgid "Crop"
 msgstr "ตัด"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "คุณสมบัติ"
 
@@ -322,157 +321,191 @@ msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#: src/scanner.vala:841
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "เครื่องสแกนไม่สามารถใช้ได้ โปรดเชื่อมต่อเครื่องสแกน"
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "ไม่สามารถเชื่อมต่อเครื่องสแกน"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "ไม่สามารถเริ่มต้นการสแกน"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "การสื่อสารกับเครื่องสแกนผิดพลาด"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "แสดงรุ่นที่ออก"
 
-#: src/simple-scan.vala:24
+#. Help string for command line --debug flag
+#: ../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 รุ่นที่เก่ากว่า"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "การสแกนล้มเหลว"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - เครื่องมือกำลังสแกน"
 
-#: src/simple-scan.vala:632
+#. 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/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr ""
 
-#: src/ui.vala:327
+#. 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'"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "ไม่พบเครื่องสแกน"
 
-#: src/ui.vala:377
+#. 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 "กรุณาตรวจสอบการเชื่อมต่อเครื่องสแกนของคุณและเปิดเครื่อง"
 
-#: src/ui.vala:382
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#: src/ui.vala:384
+#. Instructions to install driver software
+#: ../src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "บันทึกเป็น..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr ""
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr ""
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "สแกน Document.pdf แล้ว"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "แฟ้มภาพ"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "แฟ้มทั้งหมด"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (เอกสารหลายหน้า)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (บีบอัดแล้ว)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (lossless)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "การบันทึกแฟ้มล้มเหลว"
 
-#: src/ui.vala:673
+#. 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/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "บันทึกเอกสารปัจจุบัน"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "ยกเลิกการเปลี่ยนแปลง"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "ไม่สามารถบัญทึกรูปภาพตัวอย่าง"
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "ไม่สามารถเปิดโปรแกรมแสดงภาพได้"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr ""
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr ""
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "ไม่สามารถเปิดแฟ้มเอกสารวิธีใช้"
 
-#: src/ui.vala:1472
+#. 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"
@@ -500,15 +533,17 @@ msgstr ""
 "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/>."
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "เกี่ยวกับ Simple Scan"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "เครื่องมือสแกนเอกสารอย่างง่าย"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -520,167 +555,190 @@ msgstr ""
 "  SiraNokyoongtong https://launchpad.net/~gumara\n"
 "  kijjaz https://launchpad.net/~kijjaz-gmail"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "บันทึกเอกสารก่อนปิดหรือไม่?"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "ปิดโดยไม่บันทึก"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#: src/ui.vala:1581
+#. 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 ""
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#: src/ui.vala:1587
+#. 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 ""
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#: src/ui.vala:1598
+#. 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 ""
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#: src/ui.vala:1676
+#. 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 ""
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (ค่าปริยาย)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (ภาพร่าง)"
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (ความละเอียดสูง)"
 
-#: src/ui.vala:1793
+#. 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
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr ""
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr ""
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr ""
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr ""
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr ""
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr ""
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "เ_ปลี่ยนเครื่องสแกน"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "อัตโนมัติ"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr ""
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr ""
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr ""
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr ""
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr ""
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr ""
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr ""
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/tr.gmo b/po/tr.gmo
index 80d9b3c..e9a2f9f 100644
--- a/po/tr.gmo
+++ b/po/tr.gmo
diff --git a/po/tr.po b/po/tr.po
index 300f15c..faa0cc8 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "Metin"
 msgid "Photo"
 msgstr "Fotoğraf"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Sayfaları Yeniden Sırala"
 
@@ -207,7 +207,7 @@ msgstr "Tara"
 msgid "Save document to a file"
 msgstr "Belgeyi bir dosyaya kaydet"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "Kaydet"
 
@@ -248,8 +248,7 @@ msgstr "Seçili sayfayı kırp"
 msgid "Crop"
 msgstr "Kırp"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "Tercihler"
 
@@ -324,159 +323,193 @@ msgstr ""
 "Basit Tarayıcı mevcut bir çok tarayıcı desteği için SANE altyapısını "
 "kullanır."
 
-#: src/scanner.vala:841
+#. 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."
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Tarayıcıya bağlanılamadı"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Tarama başlatılamadı"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. 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"
 
-#: src/simple-scan.vala:21
+#. 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/simple-scan.vala:24
+#. 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
+#: ../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"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Tarama başarısız oldu"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[AYGIT...] - Tarama uygulaması"
 
-#: src/simple-scan.vala:632
+#. 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
+#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr "_Kapat"
 
-#: src/ui.vala:327
+#. 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"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Tarayıcı bulunamadı"
 
-#: src/ui.vala:377
+#. 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 "Lütfen tarayıcınızın bağlı ve açık olduğundan emin olun"
 
-#: src/ui.vala:382
+#. 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"
 
-#: src/ui.vala:384
+#. 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."
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "Farklı Kaydet..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Vazgeç"
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr "_Kaydet"
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Taranan Belge.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "Resim Dosyaları"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "Tüm Dosyalar"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (çok sayfalı belge)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (sıkıştırılmış)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (kayıpsız)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr "Dosya biçimi:"
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Dosya kaydedilemedi"
 
-#: src/ui.vala:673
+#. 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/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "Mevcut belgeyi kaydet?"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Değişiklikleri Geri Al"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Görüntü, önizleme için kaydedilemiyor"
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Görüntü ön izleme uygulaması açılamıyor"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Yüzleri birleştir"
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Yüzleri birleştir (ters)"
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr "Tersine çevir"
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Değiştirmeden bırak"
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Yardım dosyası açılamıyor"
 
-#: src/ui.vala:1472
+#. 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"
@@ -504,15 +537,17 @@ msgstr ""
 "olmalısınız.\n"
 "Eğer almadıysanız bile şuraya bakınız: <http://www.gnu.org/licenses/>"
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Basit Tarama Hakkında"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Basit bir belge tarama aracı"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -537,19 +572,23 @@ msgstr ""
 "  ubuntuki https://launchpad.net/~aleverzurumlu\n"
 "  İbrahim Çelik https://launchpad.net/~ibrahimcelik89"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Çıkmadan önce belgeyi kaydet?"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Kaydetmeden Çık"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "Bir Brother tarayıcıya sahip olduğunuz görünüyor."
 
-#: src/ui.vala:1581
+#. 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>."
@@ -557,11 +596,13 @@ msgstr ""
 "Bunun sürücüleri <a href=\"http://support.brother.com\">Brother "
 "websitesinde</a> mevcuttur."
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "Bir Samsung tarayıcıya sahip olduğunuz görünüyor."
 
-#: src/ui.vala:1587
+#. 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>."
@@ -569,15 +610,18 @@ msgstr ""
 "Bunun sürücüleri <a href=\"http://samsung.com/support\">Samsung "
 "websitesinde</a> mevcuttur."
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "Bir HP tarayıcıya sahip olduğunuz görünüyor."
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "Bir Epson tarayıcıya sahip olduğunuz görünüyor."
 
-#: src/ui.vala:1598
+#. 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>."
@@ -585,125 +629,139 @@ msgstr ""
 "Bunun sürücüleri <a href=\"http://samsung.com/support\">Epson "
 "websitesinde</a> mevcuttur."
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr "Sürücüleri kur"
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
-msgstr ""
+msgstr "Yükledikten sonra Basit Tarama'yı yeniden başlatmanız gerekiyor."
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "Sürücüler kuruluyor..."
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "Sürücüler başarıyla kuruldu!"
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Sürücülerin kurulumu başarısız oldu (error code %d)."
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "Sürücülerin kurulumu başarısız oldu."
 
-#: src/ui.vala:1676
+#. 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 "%s paket kurulmasına ihtiyacınız var."
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (varsayılan)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (taslak)"
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (yüksek çözünürlük)"
 
-#: src/ui.vala:1793
+#. 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
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr "Yeni Belge"
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr "Belge"
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr "E-Posta..."
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr "Yazdır..."
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr "Yardım"
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr "Hakkında"
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr "Çık"
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "_Tarayıcı Değiştir"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "Sürücüleri _Kur"
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "Otomatik"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr "Daha Koyu"
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr "Daha Açık"
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr "Daha Az"
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr "Daha Fazla"
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr "En Az"
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr "En Çok"
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Belge kaydediliyor..."
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Kaydedilen sayfa: %d / %d"
diff --git a/po/ug.gmo b/po/ug.gmo
index 9f8c194..9f39651 100644
--- a/po/ug.gmo
+++ b/po/ug.gmo
diff --git a/po/ug.po b/po/ug.po
index 44cc0ee..cb5b588 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 "X-Poedit-Language: Uighur\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
@@ -91,8 +91,8 @@ msgstr "تېكىست"
 msgid "Photo"
 msgstr "سۈرەت"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "بەتلەرنى قايتا تىزىش"
 
@@ -210,7 +210,7 @@ msgstr "شويلىلاش"
 msgid "Save document to a file"
 msgstr "پۈتۈكنى ھۆججەتكە ساقلايدۇ"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "ساقلا"
 
@@ -251,8 +251,7 @@ msgstr "تاللانغان بەتنى قىرقىيدۇ"
 msgid "Crop"
 msgstr "قىرقى"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "مايىللىق"
 
@@ -325,159 +324,193 @@ msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#: src/scanner.vala:841
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "شويلىلىغۇچ مەۋجۇت ئەمەس. شويلىلىغۇچنى چېتىڭ."
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "شويلىلىغۇچقا باغلانغىلى بولمىدى"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "شويلىلاشنى باشلىغىلى بولمىدى"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "شويلىلىغۇچ بىلەن ئالاقە باغلاشتا خاتالىق كۆرۈلدى"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "نەشرىنى كۆرسەت"
 
-#: src/simple-scan.vala:24
+#. Help string for command line --debug flag
+#: ../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 ھۆججىتىنى ئوڭلاش"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "شويلىلاش مەغلۇپ بولدى"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ئۈسكۈنە...] - شويلىلاش قورالى."
 
-#: src/simple-scan.vala:632
+#. 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/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr "ياپ(_C)"
 
-#: src/ui.vala:327
+#. 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› كىرىش ئۈچۈن ئىشلەتكۈچى نامى ۋە مەخپىي نومۇر كېرەك"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "شويلىلىغۇچ تېپىلمىدى"
 
-#: src/ui.vala:377
+#. 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 "شويلىلىغۇچ چېتىلغانمۇ توكى ئۇلانغانمۇ تەكشۈرۈڭ"
 
-#: src/ui.vala:382
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:382
 msgid "Additional software needed"
-msgstr ""
+msgstr "باشقا يۇمشاق دېتاللار زۆرۈر"
 
-#: src/ui.vala:384
+#. Instructions to install driver software
+#: ../src/ui.vala:384
 msgid "You need to install driver software for your scanner."
-msgstr ""
+msgstr "شويلىلىغۇچ ئۈچۈن قوزغاتقۇ دېتاللىرىنى ئورنىتىشىڭىز كېرەك."
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "باشقا ئاتتا ساقلا…"
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr "ئەمەلدىن قالدۇر(_C)"
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr "ساقلا(_S)"
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "شويلىلانغان Document.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "سۈرەت ھۆججەتلىرى"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "بارلىق ھۆججەتلەر"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (كۆپ بەتلىك پۈتۈكلەر)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (پرېسلانغان)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (خورىماس)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
-msgstr ""
+msgstr "ھۆججەت پىچىمى'"
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "ھۆججەتكە ساقلىغىلى بولمىدى"
 
-#: src/ui.vala:673
+#. 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/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "ھازىرقى پۈتۈكنى ساقلىسۇنمۇ؟"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "ئۆزگەرتىشنى تاشلىۋەت"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "ئالدىن كۆرىدىغان رەسىمنى ساقلىغىلى بولمىدى."
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "رەسىمنى ئالدىن كۆرۈش پروگراممىسىنى قوزغاتقىلى بولمىدى"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr "تەرەپلەرنى بىرىكتۈرۈش"
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "تەرەپلەرنى بىرىكتۈرۈش(ئەسكىچە)"
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr "ئەكسىچە"
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "ئۆزگەرمىسۇن"
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "ياردەم ھۆججىتىنى ئاچقىلى بولمىدى"
 
-#: src/ui.vala:1472
+#. 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"
@@ -507,15 +540,17 @@ msgstr ""
 "نىڭ كۆچۈرمىسىگە ئېرىشكەن بۆلىشىڭىز مۇمكىن، بولمىسا ئۇنى \n"
 "<http://www.gnu.org/licenses/> دا تاپالايسىز."
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "«ئاددىي شويلىلاش» ھەققىدە"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "ئاددىي پۈتۈك شويلىلاش قورالى"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -528,167 +563,190 @@ msgstr ""
 "  azimat https://launchpad.net/~azimat-uigur\n"
 "  umar tumur https://launchpad.net/~umar-tumur"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "ئاخىرلاشتۇرۇشتىن ئاۋۋال ھازىرقى پۈتۈكنى ساقلىسۇنمۇ؟"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "ساقلىماي ئاخىرلاشتۇر"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#: src/ui.vala:1581
+#. 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 ""
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#: src/ui.vala:1587
+#. 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 ""
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#: src/ui.vala:1598
+#. 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 ""
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
-msgstr ""
+msgstr "قوزغاتقۇلارنى ئورنىتىش"
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
-msgstr ""
+msgstr "ئورنىتىلغاندىن كېيىن Simple Scan نى قايتا قوزغىتىش زۆرۈر"
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
-msgstr ""
+msgstr "قوزغاتقۇلارنى ئورنىتىۋاتىدۇ…"
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
-msgstr ""
+msgstr "قوزغاتقۇلار مۇۋەپپەقىيەتلىك ئورنىتىلدى"
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
-msgstr ""
+msgstr "قوزغاتقۇلار ئورنىتىش مەغلۇپ بولدى."
 
-#: src/ui.vala:1676
+#. 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 ""
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (كۆڭۈلدىكى)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (دەسلەپكى نۇسخا)"
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (يۇقىرى ئېنىقلىق)"
 
-#: src/ui.vala:1793
+#. 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
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr "يېڭى پۈتۈك"
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr "پۈتۈك"
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr "ئېلخەت…"
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr "باس…"
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr "ياردەم"
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr "ھەققىدە"
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr "ئاخىرلاشتۇر"
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "شويلىلىغۇچنى ئالماشتۇرۇڭ(_S)"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
-msgstr ""
+msgstr "قوزغاتقۇلارنى ئورنات(_I)"
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "ئاپتوماتىك"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr "قارىراق"
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr "يورۇقراق"
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr "كىچىك"
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr "تېخىمۇ كۆپ"
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr "ئەڭ كىچىك"
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr "ئەڭ چوڭ"
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr "پۈتۈكنى ساقلاۋاتىدۇ…"
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "ساقلاۋاتقىنى %d/%d - بەت"
diff --git a/po/uk.gmo b/po/uk.gmo
index 189c0ba..06821f6 100644
--- a/po/uk.gmo
+++ b/po/uk.gmo
diff --git a/po/uk.po b/po/uk.po
index 790b33c..5375b51 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "Текстовий"
 msgid "Photo"
 msgstr "Фотографія"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Перевпорядкувати сторінки"
 
@@ -207,7 +207,7 @@ msgstr "Сканувати"
 msgid "Save document to a file"
 msgstr "Зберегти документ до файла"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "Зберегти"
 
@@ -248,8 +248,7 @@ msgstr "Обрізати позначену сторінку"
 msgid "Crop"
 msgstr "Обрізати"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "Налаштування"
 
@@ -330,162 +329,196 @@ msgstr ""
 "Для роботи із більшістю сканерів у Simple Scan використовуються бібліотеки "
 "SANE."
 
-#: src/scanner.vala:841
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 "Не вдалося виявити жодного сканера. Будь ласка, з’єднайте сканер з "
 "комп’ютером."
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Не вдалося з’єднатися зі сканером"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Не вдалося розпочати сканування"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Помилка під час спроби обміну даними зі сканером"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Показати версію випуску"
 
-#: src/simple-scan.vala:24
+#. Help string for command line --debug flag
+#: ../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"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Помилка сканування"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ПРИСТРІЙ...] — програма для сканування"
 
-#: src/simple-scan.vala:632
+#. 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/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr "За_крити"
 
-#: src/ui.vala:327
+#. 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» слід вказати ім’я користувача та пароль"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Сканерів не виявлено"
 
-#: src/ui.vala:377
+#. 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 "Будь ласка, перевірте, чи з’єднано ваш сканер і чи увімкнено його"
 
-#: src/ui.vala:382
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:382
 msgid "Additional software needed"
 msgstr "Потрібне додаткове програмне забезпечення"
 
-#: src/ui.vala:384
+#. Instructions to install driver software
+#: ../src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr "Вам слід встановити драйвер до вашого сканера."
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "Зберегти як..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Скасувати"
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr "З_берегти"
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Сканований документ.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "Файли зображень"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "Всі файли"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (багатосторінковий документ)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (стиснений)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (без втрат)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr "Формат файлів:"
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Не вдалося зберегти файл"
 
-#: src/ui.vala:673
+#. 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/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "Зберегти поточний документ?"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Відкинути зміни"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Не вдалося зберегти зображення для попереднього перегляду"
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Не вдалося запустити програму для перегляду зображення"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr "З’єднувати збоку"
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "З’єднувати збоку (у зворотному порядку)"
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr "У зворотному порядку"
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Не змінювати"
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Не вдалося відкрити файл довідки"
 
-#: src/ui.vala:1472
+#. 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"
@@ -513,15 +546,17 @@ msgstr ""
 "Якщо ви її не отримали, зверніться за адресою "
 "<http://www.gnu.org/licenses/>, щоб дізнатися про подальші дії."
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Про «Просте сканування»"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Інструмент для спрощення сканування документів"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -531,19 +566,23 @@ msgstr ""
 "  passtas https://launchpad.net/~passtas\n"
 "  Микола Ткач https://launchpad.net/~stuartlittle1970"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Зберегти документ перед виходом?"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Вийти без збереження"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "Здається, у вас сканер Brother."
 
-#: src/ui.vala:1581
+#. 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>."
@@ -551,11 +590,13 @@ msgstr ""
 "Драйвери можна отримати на <a href=\"http://support.brother.com\">сайті "
 "Brother</a>."
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "Здається, у вас сканер Samsung."
 
-#: src/ui.vala:1587
+#. 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>."
@@ -563,15 +604,18 @@ msgstr ""
 "Драйвери до таких сканерів можна отримати з <a "
 "href=\"http://samsung.com/support\">сайта Samsung</a>."
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "Здається, у вас сканер HP."
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "Здається, у вас сканер Epson."
 
-#: src/ui.vala:1598
+#. 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>."
@@ -579,125 +623,139 @@ msgstr ""
 "Драйвери для цього доступні на <a href=\"http://support.epson.com\">Веб-"
 "сайті Epson</a>."
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr "Встановлення драйверів"
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Після встановлення драйверів, вам слід перезапустити Simple Scan."
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "Встановлюємо драйвери…"
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "Драйвери успішно встановлено!"
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Не вдалося встановити драйвери (код помилки %d)."
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "Не вдалося встановити драйвери."
 
-#: src/ui.vala:1676
+#. 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 "Необхідно встановити пакунок(-и) %s."
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d т/д (типова)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d т/д (чернетка)"
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d т/д (висока роздільність)"
 
-#: src/ui.vala:1793
+#. 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
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr "Новий документ"
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr "Документ"
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr "Надіслати ел. поштою…"
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr "Надрукувати…"
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr "Довідка"
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr "Про програму"
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr "Вийти"
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "З_мінити сканер"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "_Встановити драйвери"
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "Автоматично"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr "темніше"
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr "світліше"
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr "менше"
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr "більше"
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr "Мінімальна"
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr "Максимальна"
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Збереження документа…"
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Зберігаємо сторінку %d з %d"
diff --git a/po/ur.gmo b/po/ur.gmo
index d48fca7..45074a6 100644
--- a/po/ur.gmo
+++ b/po/ur.gmo
diff --git a/po/ur.po b/po/ur.po
index cbdc1f3..691e360 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "عبارت"
 msgid "Photo"
 msgstr "تصویر"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr ""
 
@@ -207,7 +207,7 @@ msgstr ""
 msgid "Save document to a file"
 msgstr ""
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "محفوظ کریں"
 
@@ -248,8 +248,7 @@ msgstr ""
 msgid "Crop"
 msgstr ""
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "ترجیحات"
 
@@ -322,157 +321,191 @@ msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#: src/scanner.vala:841
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr ""
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr ""
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr ""
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr ""
 
-#: src/simple-scan.vala:24
+#. Help string for command line --debug flag
+#: ../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 ""
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr ""
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
-#: src/simple-scan.vala:632
+#. 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
+#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr ""
 
-#: src/ui.vala:327
+#. 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 ""
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr ""
 
-#: src/ui.vala:377
+#. 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 ""
 
-#: src/ui.vala:382
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#: src/ui.vala:384
+#. Instructions to install driver software
+#: ../src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr ""
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr ""
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr ""
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr ""
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr ""
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr ""
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr ""
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr ""
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr ""
 
-#: src/ui.vala:673
+#. 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/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr ""
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr ""
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr ""
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr ""
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr ""
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr ""
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr ""
 
-#: src/ui.vala:1472
+#. 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"
@@ -488,15 +521,17 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr ""
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -504,167 +539,190 @@ msgstr ""
 "  Shehzad Ashiq Ali https://launchpad.net/~shehzadashiq\n"
 "  Shoaib Mirza https://launchpad.net/~monymirza"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr ""
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr ""
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#: src/ui.vala:1581
+#. 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 ""
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#: src/ui.vala:1587
+#. 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 ""
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#: src/ui.vala:1598
+#. 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 ""
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#: src/ui.vala:1676
+#. 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 ""
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
-#: src/ui.vala:1793
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: src/ui.vala:1835
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr ""
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr ""
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr ""
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr ""
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr ""
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr ""
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr ""
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr ""
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr ""
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr ""
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr ""
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr ""
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr ""
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr ""
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr ""
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/uz.gmo b/po/uz.gmo
index 5dbb988..cc8c511 100644
--- a/po/uz.gmo
+++ b/po/uz.gmo
diff --git a/po/uz.po b/po/uz.po
index c6dd5fe..cf932aa 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "Matn"
 msgid "Photo"
 msgstr "Rasm"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr ""
 
@@ -207,7 +207,7 @@ msgstr "Skan qilish"
 msgid "Save document to a file"
 msgstr ""
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "Saqlash"
 
@@ -248,8 +248,7 @@ msgstr ""
 msgid "Crop"
 msgstr "Kesish"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "Мослашлар"
 
@@ -322,159 +321,193 @@ msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#: src/scanner.vala:841
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr ""
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr ""
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr ""
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Релиз версиясини кўрсатиш"
 
-#: src/simple-scan.vala:24
+#. Help string for command line --debug flag
+#: ../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 ""
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr ""
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
-#: src/simple-scan.vala:632
+#. 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/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr ""
 
-#: src/ui.vala:327
+#. 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 ""
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr ""
 
-#: src/ui.vala:377
+#. 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 ""
 
-#: src/ui.vala:382
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#: src/ui.vala:384
+#. Instructions to install driver software
+#: ../src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr ""
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr ""
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr ""
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr ""
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "Hamma fayllar"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr ""
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr ""
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr ""
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr ""
 
-#: src/ui.vala:673
+#. 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/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr ""
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr ""
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr ""
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr ""
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr ""
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr ""
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr ""
 
-#: src/ui.vala:1472
+#. 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"
@@ -490,181 +523,206 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Simple Scan haqida"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Sardorbek Pulatov https://launchpad.net/~prockrammer"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr ""
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Saqlamasdan chiqib ketish"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#: src/ui.vala:1581
+#. 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 ""
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#: src/ui.vala:1587
+#. 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 ""
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#: src/ui.vala:1598
+#. 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 ""
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#: src/ui.vala:1676
+#. 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 ""
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (default)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
-#: src/ui.vala:1793
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: src/ui.vala:1835
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr ""
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr ""
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr ""
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr ""
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr ""
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr ""
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "_Skaner almashrirish"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "Avtomatik"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr ""
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr ""
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr ""
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr ""
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr ""
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr ""
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr ""
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/vi.gmo b/po/vi.gmo
index 932fc98..4d67176 100644
--- a/po/vi.gmo
+++ b/po/vi.gmo
diff --git a/po/vi.po b/po/vi.po
index 9a14613..f28acc5 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:46+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "Văn bản"
 msgid "Photo"
 msgstr "Ảnh chụp"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr ""
 
@@ -207,7 +207,7 @@ msgstr ""
 msgid "Save document to a file"
 msgstr ""
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr ""
 
@@ -248,8 +248,7 @@ msgstr ""
 msgid "Crop"
 msgstr ""
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "Tùy thích"
 
@@ -322,159 +321,193 @@ msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#: src/scanner.vala:841
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Không nối được với máy quét hình"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Không quét hình được"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Lỗi khi giao dịch với máy quét hình"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Hiện phiên bản phát hành"
 
-#: src/simple-scan.vala:24
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "In ra thông tin gỡ lỗi"
 
-#: src/simple-scan.vala:26
+#: ../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"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Quét hình thất bại"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Công cụ quét hình"
 
-#: src/simple-scan.vala:632
+#. 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 ""
 "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:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr ""
 
-#: src/ui.vala:327
+#. 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 "Tên đăng nhập và mật mã cần thiết để truy cập '%s'"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Không phát hiện máy quét hình nào hết"
 
-#: src/ui.vala:377
+#. 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 "Vui lòng kiểm tra đã cắm và bật máy quét hình chưa"
 
-#: src/ui.vala:382
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#: src/ui.vala:384
+#. Instructions to install driver software
+#: ../src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "Lưu thành..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr ""
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr ""
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Tài liệu quét.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr ""
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr ""
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr ""
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr ""
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr ""
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Không lưu được tệp"
 
-#: src/ui.vala:673
+#. 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/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr ""
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr ""
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Không lưu được ảnh cho xem trước"
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr ""
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr ""
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr ""
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr ""
 
-#: src/ui.vala:1472
+#. 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"
@@ -502,15 +535,17 @@ msgstr ""
 "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/>."
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Về Simple Scan"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 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:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -518,167 +553,190 @@ msgstr ""
 "  Robert Ancell https://launchpad.net/~robert-ancell\n"
 "  Vu Do Quynh https://launchpad.net/~vu-do-quynh"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr ""
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr ""
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#: src/ui.vala:1581
+#. 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 ""
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#: src/ui.vala:1587
+#. 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 ""
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#: src/ui.vala:1598
+#. 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 ""
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#: src/ui.vala:1676
+#. 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 ""
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
-#: src/ui.vala:1793
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: src/ui.vala:1835
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr ""
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr ""
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr ""
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr ""
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr ""
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr ""
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr ""
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr ""
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr "Tối hơn"
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr ""
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr ""
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr ""
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr ""
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr ""
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr ""
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
index 3e9e8eb..7d723de 100644
--- a/po/zh_CN.gmo
+++ b/po/zh_CN.gmo
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 5d70a59..80953a2 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:46+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 "Language: zh_CN\n"
 
 #. Button to submit authorization dialog
@@ -89,8 +89,8 @@ msgstr "文本"
 msgid "Photo"
 msgstr "照片"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "重新排序页面"
 
@@ -208,7 +208,7 @@ msgstr "扫描"
 msgid "Save document to a file"
 msgstr "将文档保存为文件"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "保存"
 
@@ -249,8 +249,7 @@ msgstr "裁剪选中的页面"
 msgid "Crop"
 msgstr "剪裁"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "首选项"
 
@@ -325,157 +324,191 @@ msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr "扫描易使用 SANE 框架支持大多数现有的扫描仪。"
 
-#: src/scanner.vala:841
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "没有可用的扫描仪。请连接一个扫描仪。"
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "无法连接到扫描仪"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "无法开始扫描"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "与扫描仪通信错误"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "显示版本信息"
 
-#: src/simple-scan.vala:24
+#. Help string for command line --debug flag
+#: ../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 文件"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "扫描失败"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[设备...] - 扫描工具"
 
-#: src/simple-scan.vala:632
+#. 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/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr "关闭(_C)"
 
-#: src/ui.vala:327
+#. 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”需要用户名和密码"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "没有发现扫描仪"
 
-#: src/ui.vala:377
+#. 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 "请检查您的扫描仪已经连接并且打开"
 
-#: src/ui.vala:382
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:382
 msgid "Additional software needed"
 msgstr "需要安装其他软件"
 
-#: src/ui.vala:384
+#. Instructions to install driver software
+#: ../src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr "您需要为扫描仪安装驱动程序。"
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "保存为..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr "保存(_S)"
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "扫描的文件.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "图像文件"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "所有文件"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (多页文档)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (压缩)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (无损)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr "文件格式："
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "保存文件错误"
 
-#: src/ui.vala:673
+#. 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/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "保存当前文档？"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "放弃更改"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "无法保存用以预览的图像"
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "无法打开图像预览软件"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr "合并页"
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "合并页(反向)"
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr "反向"
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "保持不变"
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "无法打开帮助文件"
 
-#: src/ui.vala:1472
+#. 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"
@@ -500,15 +533,17 @@ msgstr ""
 "您应已收到附随于本程序的 GNU 通用公共授权的副本；如果没有，请参照\n"
 "<http://www.gnu.org/licenses/>."
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "关于扫描易"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "简易的文件扫描工具"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -519,7 +554,7 @@ msgstr ""
 "  Dingyuan Wang https://launchpad.net/~gumblex\n"
 "  Heling Yao https://launchpad.net/~hyao\n"
 "  Jimhu https://launchpad.net/~huyiwei\n"
-"  MR.wangmaoxin https://launchpad.net/~ddllkl\n"
+"  SuperWangCC https://launchpad.net/~ddllkl\n"
 "  Wang Dianjin https://launchpad.net/~tuhaihe\n"
 "  Wylmer Wang https://launchpad.net/~wantinghard\n"
 "  Xhacker Liu https://launchpad.net/~xhacker\n"
@@ -529,167 +564,190 @@ msgstr ""
 "  shijing https://launchpad.net/~shijing\n"
 "  zixue.liu https://launchpad.net/~zixue"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "退出前保存文档？"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "退出且不保存"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "您似乎有一个 Brother 扫描仪。"
 
-#: src/ui.vala:1581
+#. 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 "该驱动程序可在 <a href=\"http://support.brother.com\">兄弟网站</a>获得。"
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "您似乎有一个 Samsung 扫描仪。"
 
-#: src/ui.vala:1587
+#. 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 "该驱动程序可在<a href=\"http://samsung.com/support\">三星网站</a>获得。"
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "您似乎有一个 HP 扫描仪。"
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "您似乎有一个 Epson 扫描仪。"
 
-#: src/ui.vala:1598
+#. 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 "该驱动程序可在<a href=\"http://support.epson.com\">爱普生网站</a>获得。"
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr "安装驱动"
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "安装完成后，需要重新启动扫描易。"
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "安装驱动程序…"
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "成功安装驱动程序！"
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "无法安装驱动程序(错误码 %d)。"
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "安装驱动失败。"
 
-#: src/ui.vala:1676
+#. 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 "您需要安装 %s 包。"
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (默认)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (草稿)"
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (高分辨率)"
 
-#: src/ui.vala:1793
+#. 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
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr "新文档"
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr "文档"
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr "电子邮件..."
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr "打印..."
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr "帮助"
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr "关于"
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr "退出"
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "更换扫描仪(_S)"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "安装驱动(_I)"
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "自动"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr "较深"
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr "稍浅"
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr "较少"
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr "更多"
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr "最小值"
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr "最大值"
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr "正在保存文档..."
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "正在保存 %d/%d 页"
diff --git a/po/zh_HK.gmo b/po/zh_HK.gmo
index bf8d9d8..f32339b 100644
--- a/po/zh_HK.gmo
+++ b/po/zh_HK.gmo
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 65dedd2..cb75ad0 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:46+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "文字"
 msgid "Photo"
 msgstr "相片"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "重新排列頁面"
 
@@ -207,7 +207,7 @@ msgstr "掃描"
 msgid "Save document to a file"
 msgstr "將文件儲存到檔案"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "儲存"
 
@@ -248,8 +248,7 @@ msgstr "裁切所選的頁面"
 msgid "Crop"
 msgstr "裁切"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "偏好設定"
 
@@ -323,157 +322,191 @@ msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr "簡易掃描使用 SANE 框架以支援大部分現存掃描器。"
 
-#: src/scanner.vala:841
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "沒有可用的掃描器。請連接一部掃描器。"
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "無法連接到掃描器"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "無法起始掃描"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "與掃描器溝通時發生錯誤"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "顯示發行版本"
 
-#: src/simple-scan.vala:24
+#. Help string for command line --debug flag
+#: ../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 檔案"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "掃描失敗"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[裝置...] - 掃描公用程式"
 
-#: src/simple-scan.vala:632
+#. 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/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr "關閉(_C)"
 
-#: src/ui.vala:327
+#. 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'"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "未偵測到掃描器"
 
-#: src/ui.vala:377
+#. 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 "請檢查並確認你的掃描器已連接，並已開啟電源"
 
-#: src/ui.vala:382
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:382
 msgid "Additional software needed"
 msgstr "需要額外軟件"
 
-#: src/ui.vala:384
+#. Instructions to install driver software
+#: ../src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr "你需要為你的掃描器安裝驅動程式。"
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "另存為..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr "儲存(_S)"
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "已掃描的文件.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "影像檔案"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "所有檔案"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (多頁文件)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (壓縮)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (無損)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr "檔案格式："
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "儲存檔案失敗"
 
-#: src/ui.vala:673
+#. 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/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "是否儲存至目前文件？"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "放棄變更"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "無法儲存影像以供預覽"
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "無法開啟影像預覽應用程式"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr "合併邊緣"
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "合併邊緣 (反轉)"
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr "反轉"
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "維持不變"
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "無法開啟求助檔案。"
 
-#: src/ui.vala:1472
+#. 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"
@@ -495,15 +528,17 @@ msgstr ""
 "\n"
 "你應已收到附隨於本程式的GNU通用公共授權的副本；如果沒有，請參照 <http://www.gnu.org/licenses/>。"
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "關於簡易掃描"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "簡易文件掃描工具"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -512,169 +547,192 @@ msgstr ""
 "  Walter Cheuk https://launchpad.net/~wwycheuk\n"
 "  tomoe_musashi https://launchpad.net/~musashi"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "在結束前要儲存文件嗎？"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "直接退出而不儲存"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "你似乎有一部 Brother 掃描器。"
 
-#: src/ui.vala:1581
+#. 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 ""
 "這部掃描器的驅動程式可以在這裏找到：<a href=\"http://support.brother.com\">Brother 網站</a>。"
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "你似乎有一部 Samsung 掃描器。"
 
-#: src/ui.vala:1587
+#. 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 ""
 "這部掃描器的驅動程式可以在這裏找到：<a href=\"http://samsung.com/support\">Samsung 網站</a>。"
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "你似乎有一部 HP 掃描器。"
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "你似乎有一部 Epson 掃描器。"
 
-#: src/ui.vala:1598
+#. 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 "這部掃描器的驅動程式可以在這裏找到：<a href=\"http://support.epson.com\">Epson 網站</a>。"
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr "安裝驅動程式"
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "一旦安裝，你將需要重新啟動簡易掃描。"
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "正在安裝驅動程式..."
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "成功安裝驅動程式！"
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "驅動程式安裝失敗 (錯誤碼 %d)。"
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "驅動程式安裝失敗。"
 
-#: src/ui.vala:1676
+#. 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 "你需要安裝 %s 套件。"
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (預設)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (草稿)"
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (高解像度)"
 
-#: src/ui.vala:1793
+#. 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
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr "新文件"
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr "文件"
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr "電子郵件..."
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr "列印..."
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr "協助"
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr "關於"
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr "退出"
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "變更掃描器(_S)"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "安裝驅動程式(_I)"
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "自動"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr "較暗"
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr "較光"
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr "少"
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr "多"
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr "最小"
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr "最大"
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr "儲存文件中..."
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "正在儲存 %d / %d"
diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo
index 7c57b96..1a0f98b 100644
--- a/po/zh_TW.gmo
+++ b/po/zh_TW.gmo
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 61190e4..9f75863 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:46+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "文字"
 msgid "Photo"
 msgstr "相片"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "重新排列頁面"
 
@@ -207,7 +207,7 @@ msgstr "掃描"
 msgid "Save document to a file"
 msgstr "將文件儲存至檔案"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "儲存"
 
@@ -248,8 +248,7 @@ msgstr "裁切所選的頁面"
 msgid "Crop"
 msgstr "裁切"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "偏好設定"
 
@@ -323,157 +322,191 @@ msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr "簡易掃描使用 SANE 框架以支援大部分現存掃描器。"
 
-#: src/scanner.vala:841
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "沒有可用的掃描器。請連接一部掃描器。"
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "無法連接到掃描器"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "無法起始掃描"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "與掃描器溝通時發生錯誤"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "顯示發行版本"
 
-#: src/simple-scan.vala:24
+#. Help string for command line --debug flag
+#: ../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 檔案"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "掃描失敗"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[裝置...] - 掃描公用程式"
 
-#: src/simple-scan.vala:632
+#. 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/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr "關閉(_C)"
 
-#: src/ui.vala:327
+#. 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」需要提供使用者名稱與密碼"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "沒有偵測到掃描器"
 
-#: src/ui.vala:377
+#. 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 "請檢查您的掃描器是否連接，並且是否開啟電源"
 
-#: src/ui.vala:382
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:382
 msgid "Additional software needed"
 msgstr "需要額外軟體"
 
-#: src/ui.vala:384
+#. Instructions to install driver software
+#: ../src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr "您需要為您的掃描器安裝驅動程式。"
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "另存為..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr "儲存(_S)"
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "掃描的文件.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "影像檔"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "所有檔案"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (多頁文件)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (壓縮)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (無損)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr "檔案格式："
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "儲存檔案失敗"
 
-#: src/ui.vala:673
+#. 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/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "是否儲存目前文件？"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "放棄變更"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "無法儲存影像以供預覽"
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "無法開啟影像預覽應用程式"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr "合併邊緣"
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "合併邊緣 (相反次序)"
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr "反轉"
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "維持不變"
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "無法開啟幫助文件檔案"
 
-#: src/ui.vala:1472
+#. 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"
@@ -495,15 +528,17 @@ msgstr ""
 "\n"
 "您應已收到附隨於本程式的 GNU 通用公眾授權的副本；如果沒有，請參照 <http://www.gnu.org/licenses/>。"
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "關於「簡易掃描」"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "簡易文件掃描工具"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -516,169 +551,192 @@ msgstr ""
 "  nckuhuahua https://launchpad.net/~nckuhuahua\n"
 "  tomoe_musashi https://launchpad.net/~musashi"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "在結束前要儲存文件嗎？"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "直接退出而不儲存"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "您似乎有一台 Brother 掃描器。"
 
-#: src/ui.vala:1581
+#. 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 ""
 "您可以在這裡找到這台掃描器的驅動程式：<a href=\"http://support.brother.com\">Brother 網站</a>。"
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "您似乎有一台 Samsung 掃描器。"
 
-#: src/ui.vala:1587
+#. 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 ""
 "您可以在這裡找到這台掃描器的驅動程式：<a href=\"http://samsung.com/support\">Samsung 網站</a>。"
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "您似乎有一台 HP 掃描器。"
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "您似乎有一台 Epson 掃描器。"
 
-#: src/ui.vala:1598
+#. 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 "此裝置的驅動程式可以在 <a href=\"http://support.epson.com\">Epson 網站</a> 上找到。"
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr "安裝驅動程式"
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "一旦安裝，您將需要重新啟動簡易掃描。"
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "正在安裝驅動程式..."
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "成功安裝驅動程式！"
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "驅動程式安裝失敗 (錯誤碼 %d)。"
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "驅動程式安裝失敗。"
 
-#: src/ui.vala:1676
+#. 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 "要先安裝 %s 套件。"
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (預設)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (草稿)"
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (高解析度)"
 
-#: src/ui.vala:1793
+#. 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
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr "新文件"
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr "文件"
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr "電子郵件..."
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr "列印..."
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr "求助"
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr "關於"
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr "結束"
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "變更掃描器(_S)"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "安裝驅動程式(_I)"
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "自動"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr "較深"
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr "較淺"
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr "少"
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr "多"
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr "最小"
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr "最大"
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr "正在儲存文件..."
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "正在儲存 %2$d 頁中的第 %1$d 頁"
diff --git a/src/autosave-manager.c b/src/autosave-manager.c
index 0e78c5d..8dab65b 100644
--- a/src/autosave-manager.c
+++ b/src/autosave-manager.c
@@ -1,4 +1,4 @@
-/* autosave-manager.c generated by valac 0.32.1, the Vala compiler
+/* autosave-manager.c generated by valac 0.34.2, the Vala compiler
  * generated from autosave-manager.vala, do not modify */
 
 /*
diff --git a/src/book-view.c b/src/book-view.c
index 9246682..8c9b099 100644
--- a/src/book-view.c
+++ b/src/book-view.c
@@ -1,4 +1,4 @@
-/* book-view.c generated by valac 0.32.1, the Vala compiler
+/* book-view.c generated by valac 0.34.2, the Vala compiler
  * generated from book-view.vala, do not modify */
 
 /*
diff --git a/src/book.c b/src/book.c
index 0a7e2e9..1e7f4eb 100644
--- a/src/book.c
+++ b/src/book.c
@@ -1,4 +1,4 @@
-/* book.c generated by valac 0.32.1, the Vala compiler
+/* book.c generated by valac 0.34.2, the Vala compiler
  * generated from book.vala, do not modify */
 
 /*
@@ -78,9 +78,9 @@ typedef struct _PsWriterPrivate PsWriterPrivate;
 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;
-#define _g_list_free0(var) ((var == NULL) ? NULL : (var = (g_list_free (var), NULL)))
 typedef struct _ParamSpecPDFWriter ParamSpecPDFWriter;
 typedef struct _ParamSpecPsWriter ParamSpecPsWriter;
 
@@ -119,7 +119,9 @@ struct _PDFWriter {
 	volatile int ref_count;
 	PDFWriterPrivate * priv;
 	gsize offset;
-	GList* object_offsets;
+	guint* object_offsets;
+	gint object_offsets_length1;
+	gint _object_offsets_size_;
 };
 
 struct _PDFWriterClass {
@@ -214,13 +216,15 @@ 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);
-guint pdf_writer_start_object (PDFWriter* self);
+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);
@@ -243,28 +247,28 @@ static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify
 static gpointer _page_ref0 (gpointer self) {
 #line 45 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return self ? page_ref (self) : NULL;
-#line 247 "book.c"
+#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 254 "book.c"
+#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 261 "book.c"
+#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 268 "book.c"
+#line 272 "book.c"
 }
 
 
@@ -273,7 +277,7 @@ static void _g_list_free__page_unref0_ (GList* self) {
 	g_list_foreach (self, (GFunc) _page_unref0_, NULL);
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_list_free (self);
-#line 277 "book.c"
+#line 281 "book.c"
 }
 
 
@@ -287,14 +291,14 @@ Book* book_construct (GType object_type) {
 	self->priv->pages = NULL;
 #line 38 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return self;
-#line 291 "book.c"
+#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 298 "book.c"
+#line 302 "book.c"
 }
 
 
@@ -304,7 +308,7 @@ void book_clear (Book* self) {
 	g_return_if_fail (self != NULL);
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = self->priv->pages;
-#line 308 "book.c"
+#line 312 "book.c"
 	{
 		GList* page_collection = NULL;
 		GList* page_it = NULL;
@@ -312,14 +316,14 @@ void book_clear (Book* self) {
 		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 316 "book.c"
+#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 323 "book.c"
+#line 327 "book.c"
 			{
 				Page* _tmp2_ = NULL;
 				guint _tmp3_ = 0U;
@@ -339,7 +343,7 @@ void book_clear (Book* self) {
 				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 343 "book.c"
+#line 347 "book.c"
 			}
 		}
 	}
@@ -349,7 +353,7 @@ void book_clear (Book* self) {
 	self->priv->pages = NULL;
 #line 60 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_emit_by_name (self, "cleared");
-#line 353 "book.c"
+#line 357 "book.c"
 }
 
 
@@ -360,7 +364,7 @@ static void book_page_changed_cb (Book* self, Page* page) {
 	g_return_if_fail (page != NULL);
 #line 65 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	book_set_needs_saving (self, TRUE);
-#line 364 "book.c"
+#line 368 "book.c"
 }
 
 
@@ -394,7 +398,7 @@ void book_append_page (Book* self, Page* page) {
 	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 398 "book.c"
+#line 402 "book.c"
 }
 
 
@@ -423,7 +427,7 @@ void book_move_page (Book* self, Page* page, guint location) {
 	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 427 "book.c"
+#line 431 "book.c"
 }
 
 
@@ -437,7 +441,7 @@ void book_reverse (Book* self) {
 	new_pages = NULL;
 #line 89 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = self->priv->pages;
-#line 441 "book.c"
+#line 445 "book.c"
 	{
 		GList* page_collection = NULL;
 		GList* page_it = NULL;
@@ -445,14 +449,14 @@ void book_reverse (Book* self) {
 		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 449 "book.c"
+#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 456 "book.c"
+#line 460 "book.c"
 			{
 				Page* _tmp2_ = NULL;
 				Page* _tmp3_ = NULL;
@@ -464,7 +468,7 @@ void book_reverse (Book* self) {
 				new_pages = g_list_prepend (new_pages, _tmp3_);
 #line 89 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_page_unref0 (page);
-#line 468 "book.c"
+#line 472 "book.c"
 			}
 		}
 	}
@@ -482,7 +486,7 @@ void book_reverse (Book* self) {
 	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 486 "book.c"
+#line 490 "book.c"
 }
 
 
@@ -508,32 +512,32 @@ void book_combine_sides (Book* self) {
 	n_front = _tmp1_ - (_tmp3_ / 2);
 #line 100 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	new_pages = NULL;
-#line 512 "book.c"
+#line 516 "book.c"
 	{
 		gint i = 0;
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		i = 0;
-#line 517 "book.c"
+#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 524 "book.c"
+#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 531 "book.c"
+#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 537 "book.c"
+#line 541 "book.c"
 				}
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp4_ = FALSE;
@@ -547,13 +551,13 @@ void book_combine_sides (Book* self) {
 				if (!(((guint) _tmp6_) < _tmp8_)) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					break;
-#line 551 "book.c"
+#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 557 "book.c"
+#line 561 "book.c"
 					GList* _tmp10_ = NULL;
 					gint _tmp11_ = 0;
 					gconstpointer _tmp12_ = NULL;
@@ -568,7 +572,7 @@ void book_combine_sides (Book* self) {
 					_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 572 "book.c"
+#line 576 "book.c"
 				} else {
 					GList* _tmp14_ = NULL;
 					guint _tmp15_ = 0U;
@@ -587,7 +591,7 @@ void book_combine_sides (Book* self) {
 					_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 591 "book.c"
+#line 595 "book.c"
 				}
 			}
 		}
@@ -606,7 +610,7 @@ void book_combine_sides (Book* self) {
 	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 610 "book.c"
+#line 614 "book.c"
 }
 
 
@@ -617,32 +621,32 @@ void book_combine_sides_reverse (Book* self) {
 	g_return_if_fail (self != NULL);
 #line 116 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	new_pages = NULL;
-#line 621 "book.c"
+#line 625 "book.c"
 	{
 		gint i = 0;
 #line 117 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		i = 0;
-#line 626 "book.c"
+#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 633 "book.c"
+#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 640 "book.c"
+#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 646 "book.c"
+#line 650 "book.c"
 				}
 #line 117 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp0_ = FALSE;
@@ -656,13 +660,13 @@ void book_combine_sides_reverse (Book* self) {
 				if (!(((guint) _tmp2_) < _tmp4_)) {
 #line 117 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					break;
-#line 660 "book.c"
+#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 666 "book.c"
+#line 670 "book.c"
 					GList* _tmp6_ = NULL;
 					gint _tmp7_ = 0;
 					gconstpointer _tmp8_ = NULL;
@@ -677,7 +681,7 @@ void book_combine_sides_reverse (Book* self) {
 					_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 681 "book.c"
+#line 685 "book.c"
 				} else {
 					GList* _tmp10_ = NULL;
 					guint _tmp11_ = 0U;
@@ -699,7 +703,7 @@ void book_combine_sides_reverse (Book* self) {
 					_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 703 "book.c"
+#line 707 "book.c"
 				}
 			}
 		}
@@ -718,7 +722,7 @@ void book_combine_sides_reverse (Book* self) {
 	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 722 "book.c"
+#line 726 "book.c"
 }
 
 
@@ -755,7 +759,7 @@ void book_delete_page (Book* self, Page* page) {
 	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 759 "book.c"
+#line 763 "book.c"
 }
 
 
@@ -772,7 +776,7 @@ Page* book_get_page (Book* self, gint page_number) {
 	_tmp0_ = page_number;
 #line 141 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (_tmp0_ < 0) {
-#line 776 "book.c"
+#line 780 "book.c"
 		GList* _tmp1_ = NULL;
 		guint _tmp2_ = 0U;
 		gint _tmp3_ = 0;
@@ -784,7 +788,7 @@ Page* book_get_page (Book* self, gint page_number) {
 		_tmp3_ = page_number;
 #line 142 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		page_number = ((gint) _tmp2_) + _tmp3_;
-#line 788 "book.c"
+#line 792 "book.c"
 	}
 #line 143 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp4_ = self->priv->pages;
@@ -798,7 +802,7 @@ Page* book_get_page (Book* self, gint page_number) {
 	result = _tmp7_;
 #line 143 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
-#line 802 "book.c"
+#line 806 "book.c"
 }
 
 
@@ -821,7 +825,7 @@ guint book_get_page_index (Book* self, Page* page) {
 	result = (guint) _tmp2_;
 #line 148 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
-#line 825 "book.c"
+#line 829 "book.c"
 }
 
 
@@ -832,35 +836,35 @@ static gint string_last_index_of_char (const gchar* self, gunichar c, gint start
 	gunichar _tmp1_ = 0U;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1017 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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.32/vapi/glib-2.0.vapi"
+#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = start_index;
-#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = c;
-#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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.32/vapi/glib-2.0.vapi"
+#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 1020 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1020 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = _result_;
-#line 1020 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1020 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 850 "book.c"
+#line 854 "book.c"
 		gchar* _tmp4_ = NULL;
-#line 1021 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
-#line 1021 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 1021 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 858 "book.c"
+#line 862 "book.c"
 	} else {
-#line 1023 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1023 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = -1;
-#line 1023 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1023 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 864 "book.c"
+#line 868 "book.c"
 	}
 }
 
@@ -882,105 +886,105 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	glong _tmp19_ = 0L;
 	glong _tmp20_ = 0L;
 	gchar* _tmp21_ = NULL;
-#line 1328 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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.32/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	string_length = (glong) _tmp1_;
-#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = start;
-#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp2_ < ((glong) 0)) {
-#line 898 "book.c"
+#line 902 "book.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
-#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp3_ = string_length;
-#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = start;
-#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		start = _tmp3_ + _tmp4_;
-#line 907 "book.c"
+#line 911 "book.c"
 	}
-#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp5_ = end;
-#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp5_ < ((glong) 0)) {
-#line 913 "book.c"
+#line 917 "book.c"
 		glong _tmp6_ = 0L;
 		glong _tmp7_ = 0L;
-#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = string_length;
-#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp7_ = end;
-#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		end = _tmp6_ + _tmp7_;
-#line 922 "book.c"
+#line 926 "book.c"
 	}
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp9_ = start;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp9_ >= ((glong) 0)) {
-#line 928 "book.c"
+#line 932 "book.c"
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp10_ = start;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp11_ = string_length;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp10_ <= _tmp11_;
-#line 937 "book.c"
+#line 941 "book.c"
 	} else {
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = FALSE;
-#line 941 "book.c"
+#line 945 "book.c"
 	}
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp13_ = end;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp13_ >= ((glong) 0)) {
-#line 949 "book.c"
+#line 953 "book.c"
 		glong _tmp14_ = 0L;
 		glong _tmp15_ = 0L;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp14_ = end;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = _tmp14_ <= _tmp15_;
-#line 958 "book.c"
+#line 962 "book.c"
 	} else {
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = FALSE;
-#line 962 "book.c"
+#line 966 "book.c"
 	}
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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.32/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp16_ = start;
-#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = end;
-#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp18_ = start;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp19_ = end;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp20_ = start;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp21_;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 984 "book.c"
+#line 988 "book.c"
 }
 
 
@@ -1036,7 +1040,7 @@ static GFile* book_make_indexed_file (Book* self, const gchar* uri, gint i) {
 	_tmp1_ = _tmp0_;
 #line 153 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (_tmp1_ == ((guint) 1)) {
-#line 1040 "book.c"
+#line 1044 "book.c"
 		const gchar* _tmp2_ = NULL;
 		GFile* _tmp3_ = NULL;
 #line 154 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
@@ -1047,7 +1051,7 @@ static GFile* book_make_indexed_file (Book* self, const gchar* uri, gint i) {
 		result = _tmp3_;
 #line 154 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return result;
-#line 1051 "book.c"
+#line 1055 "book.c"
 	}
 #line 157 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp4_ = uri;
@@ -1075,7 +1079,7 @@ static GFile* book_make_indexed_file (Book* self, const gchar* uri, gint i) {
 	_tmp11_ = extension_index;
 #line 160 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (_tmp11_ >= 0) {
-#line 1079 "book.c"
+#line 1083 "book.c"
 		const gchar* _tmp12_ = NULL;
 		gint _tmp13_ = 0;
 		const gchar* _tmp14_ = NULL;
@@ -1126,7 +1130,7 @@ static GFile* book_make_indexed_file (Book* self, const gchar* uri, gint i) {
 		_g_free0 (prefix);
 #line 163 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		prefix = _tmp25_;
-#line 1130 "book.c"
+#line 1134 "book.c"
 	}
 #line 165 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp26_ = book_get_n_pages (self);
@@ -1202,7 +1206,7 @@ static GFile* book_make_indexed_file (Book* self, const gchar* uri, gint i) {
 	_g_free0 (basename);
 #line 168 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
-#line 1206 "book.c"
+#line 1210 "book.c"
 }
 
 
@@ -1214,19 +1218,19 @@ static void book_save_multi_file (Book* self, const gchar* type, gint quality, G
 	g_return_if_fail (type != NULL);
 #line 171 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (file != NULL);
-#line 1218 "book.c"
+#line 1222 "book.c"
 	{
 		gint i = 0;
 #line 173 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		i = 0;
-#line 1223 "book.c"
+#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 1230 "book.c"
+#line 1234 "book.c"
 				gint _tmp2_ = 0;
 				guint _tmp3_ = 0U;
 				guint _tmp4_ = 0U;
@@ -1245,13 +1249,13 @@ static void book_save_multi_file (Book* self, const gchar* type, gint quality, G
 				gint _tmp16_ = 0;
 #line 173 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if (!_tmp0_) {
-#line 1249 "book.c"
+#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 1255 "book.c"
+#line 1259 "book.c"
 				}
 #line 173 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp0_ = FALSE;
@@ -1265,7 +1269,7 @@ static void book_save_multi_file (Book* self, const gchar* type, gint quality, G
 				if (!(((guint) _tmp2_) < _tmp4_)) {
 #line 173 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					break;
-#line 1269 "book.c"
+#line 1273 "book.c"
 				}
 #line 175 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp5_ = i;
@@ -1305,7 +1309,7 @@ static void book_save_multi_file (Book* self, const gchar* type, gint quality, G
 					_page_unref0 (page);
 #line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					return;
-#line 1309 "book.c"
+#line 1313 "book.c"
 				}
 #line 177 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp16_ = i;
@@ -1313,7 +1317,7 @@ static void book_save_multi_file (Book* self, const gchar* type, gint quality, G
 				g_signal_emit_by_name (self, "saving", _tmp16_);
 #line 173 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_page_unref0 (page);
-#line 1317 "book.c"
+#line 1321 "book.c"
 			}
 		}
 	}
@@ -1358,14 +1362,14 @@ static void book_save_ps_pdf_surface (Book* self, cairo_surface_t* surface, GdkP
 	cairo_paint (context);
 #line 181 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_cairo_destroy0 (context);
-#line 1362 "book.c"
+#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 1369 "book.c"
+#line 1373 "book.c"
 }
 
 
@@ -1396,7 +1400,7 @@ static void book_save_ps (Book* self, GFile* file, GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return;
-#line 1400 "book.c"
+#line 1404 "book.c"
 	}
 #line 193 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2_ = ps_writer_new (stream);
@@ -1410,19 +1414,19 @@ static void book_save_ps (Book* self, GFile* file, GError** error) {
 	_tmp5_ = _cairo_surface_reference0 (_tmp4_);
 #line 194 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	surface = _tmp5_;
-#line 1414 "book.c"
+#line 1418 "book.c"
 	{
 		gint i = 0;
 #line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		i = 0;
-#line 1419 "book.c"
+#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 1426 "book.c"
+#line 1430 "book.c"
 				gint _tmp8_ = 0;
 				guint _tmp9_ = 0U;
 				guint _tmp10_ = 0U;
@@ -1458,13 +1462,13 @@ static void book_save_ps (Book* self, GFile* file, GError** error) {
 				gint _tmp36_ = 0;
 #line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if (!_tmp6_) {
-#line 1462 "book.c"
+#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 1468 "book.c"
+#line 1472 "book.c"
 				}
 #line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp6_ = FALSE;
@@ -1478,7 +1482,7 @@ static void book_save_ps (Book* self, GFile* file, GError** error) {
 				if (!(((guint) _tmp8_) < _tmp10_)) {
 #line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					break;
-#line 1482 "book.c"
+#line 1486 "book.c"
 				}
 #line 198 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp11_ = i;
@@ -1552,7 +1556,7 @@ static void book_save_ps (Book* self, GFile* file, GError** error) {
 				_g_object_unref0 (image);
 #line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_page_unref0 (page);
-#line 1556 "book.c"
+#line 1560 "book.c"
 			}
 		}
 	}
@@ -1562,7 +1566,7 @@ static void book_save_ps (Book* self, GFile* file, GError** error) {
 	_ps_writer_unref0 (writer);
 #line 190 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_object_unref0 (stream);
-#line 1566 "book.c"
+#line 1570 "book.c"
 }
 
 
@@ -1624,7 +1628,7 @@ static guint8* book_compress_zlib (Book* self, guint8* data, int data_length1, i
 	stream.avail_out = _tmp3__length1;
 #line 216 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	while (TRUE) {
-#line 1628 "book.c"
+#line 1632 "book.c"
 		z_stream _tmp4_ = {0};
 		guint _tmp5_ = 0U;
 		gint _tmp6_ = 0;
@@ -1636,7 +1640,7 @@ static guint8* book_compress_zlib (Book* self, guint8* data, int data_length1, i
 		if (!(_tmp5_ > ((guint) 0))) {
 #line 216 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			break;
-#line 1640 "book.c"
+#line 1644 "book.c"
 		}
 #line 218 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp6_ = deflate (&stream, (gint) Z_FINISH);
@@ -1644,7 +1648,7 @@ static guint8* book_compress_zlib (Book* self, guint8* data, int data_length1, i
 		if (_tmp6_ == ((gint) Z_STREAM_ERROR)) {
 #line 219 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			break;
-#line 1648 "book.c"
+#line 1652 "book.c"
 		}
 	}
 #line 222 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
@@ -1653,7 +1657,7 @@ static guint8* book_compress_zlib (Book* self, guint8* data, int data_length1, i
 	_tmp8_ = _tmp7_.avail_in;
 #line 222 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (_tmp8_ > ((guint) 0)) {
-#line 1657 "book.c"
+#line 1661 "book.c"
 		guint8* _tmp9_ = NULL;
 		gint _tmp9__length1 = 0;
 #line 223 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
@@ -1664,7 +1668,7 @@ static guint8* book_compress_zlib (Book* self, guint8* data, int data_length1, i
 		if (result_length1) {
 #line 223 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			*result_length1 = _tmp9__length1;
-#line 1668 "book.c"
+#line 1672 "book.c"
 		}
 #line 223 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		result = _tmp9_;
@@ -1674,7 +1678,7 @@ static guint8* book_compress_zlib (Book* self, guint8* data, int data_length1, i
 		deflateEnd (&stream);
 #line 223 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return result;
-#line 1678 "book.c"
+#line 1682 "book.c"
 	}
 #line 225 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp10_ = data;
@@ -1706,7 +1710,7 @@ static guint8* book_compress_zlib (Book* self, guint8* data, int data_length1, i
 	if (result_length1) {
 #line 228 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*result_length1 = _tmp15__length1;
-#line 1710 "book.c"
+#line 1714 "book.c"
 	}
 #line 228 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	result = _tmp15_;
@@ -1714,7 +1718,7 @@ static guint8* book_compress_zlib (Book* self, guint8* data, int data_length1, i
 	deflateEnd (&stream);
 #line 228 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
-#line 1718 "book.c"
+#line 1722 "book.c"
 }
 
 
@@ -1723,7 +1727,7 @@ static gboolean _book_write_pixbuf_data_gdk_pixbuf_save_func (guint8* buf, gsize
 	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 1727 "book.c"
+#line 1731 "book.c"
 }
 
 
@@ -1826,7 +1830,7 @@ static guint8* book_compress_jpeg (Book* self, GdkPixbuf* image, gint quality, g
 	values_length1 = 5;
 #line 237 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_values_size_ = values_length1;
-#line 1830 "book.c"
+#line 1834 "book.c"
 	{
 		GdkPixbuf* _tmp14_ = NULL;
 #line 240 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
@@ -1835,7 +1839,7 @@ static guint8* book_compress_jpeg (Book* self, GdkPixbuf* image, gint quality, g
 		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 1839 "book.c"
+#line 1843 "book.c"
 			goto __catch0_g_error;
 		}
 	}
@@ -1849,7 +1853,7 @@ static guint8* book_compress_jpeg (Book* self, GdkPixbuf* image, gint quality, g
 		_inner_error_ = NULL;
 #line 238 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_g_error_free0 (e);
-#line 1853 "book.c"
+#line 1857 "book.c"
 	}
 	__finally0:
 #line 238 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
@@ -1864,7 +1868,7 @@ static guint8* book_compress_jpeg (Book* self, GdkPixbuf* image, gint quality, g
 		g_clear_error (&_inner_error_);
 #line 238 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return NULL;
-#line 1868 "book.c"
+#line 1872 "book.c"
 	}
 #line 245 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp15_ = self->priv->jpeg_data;
@@ -1894,7 +1898,7 @@ static guint8* book_compress_jpeg (Book* self, GdkPixbuf* image, gint quality, g
 	if (result_length1) {
 #line 248 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*result_length1 = _tmp17__length1;
-#line 1898 "book.c"
+#line 1902 "book.c"
 	}
 #line 248 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	result = _tmp17_;
@@ -1904,7 +1908,7 @@ static guint8* book_compress_jpeg (Book* self, GdkPixbuf* image, gint quality, g
 	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 1908 "book.c"
+#line 1912 "book.c"
 }
 
 
@@ -1927,21 +1931,42 @@ static gboolean book_write_pixbuf_data (Book* self, guint8* buf, int buf_length1
 	result = TRUE;
 #line 254 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
-#line 1931 "book.c"
+#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 459 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return g_memdup (self, length * sizeof (guint8));
-#line 1938 "book.c"
+#line 1963 "book.c"
 }
 
 
 static guint8* _vala_array_dup2 (guint8* self, int length) {
-#line 466 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return g_memdup (self, length * sizeof (guint8));
-#line 1945 "book.c"
+#line 1970 "book.c"
 }
 
 
@@ -1953,99 +1978,176 @@ static void book_save_pdf (Book* self, GFile* file, gint quality, GError** error
 	GFileOutputStream* _tmp10_ = NULL;
 	PDFWriter* writer = NULL;
 	PDFWriter* _tmp11_ = NULL;
-	PDFWriter* _tmp12_ = NULL;
-	PDFWriter* _tmp13_ = 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;
-	gchar* _tmp18_ = NULL;
-	gchar* _tmp19_ = NULL;
-	PDFWriter* _tmp20_ = NULL;
-	PDFWriter* _tmp21_ = NULL;
-	PDFWriter* _tmp22_ = NULL;
+	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;
-	gchar* _tmp24_ = NULL;
-	gchar* _tmp25_ = NULL;
-	PDFWriter* _tmp26_ = NULL;
-	PDFWriter* _tmp27_ = NULL;
-	PDFWriter* _tmp28_ = NULL;
-	guint pages_number = 0U;
-	PDFWriter* _tmp29_ = NULL;
-	guint _tmp30_ = 0U;
-	PDFWriter* _tmp31_ = NULL;
-	guint _tmp32_ = 0U;
-	gchar* _tmp33_ = NULL;
-	gchar* _tmp34_ = NULL;
-	PDFWriter* _tmp35_ = NULL;
-	PDFWriter* _tmp36_ = NULL;
-	PDFWriter* _tmp37_ = NULL;
-	PDFWriter* _tmp48_ = NULL;
+	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;
-	guint _tmp51_ = 0U;
-	gchar* _tmp52_ = NULL;
-	gchar* _tmp53_ = NULL;
-	PDFWriter* _tmp54_ = NULL;
+	PDFWriter* _tmp51_ = NULL;
+	PDFWriter* _tmp52_ = NULL;
+	PDFWriter* _tmp53_ = NULL;
+	guint _tmp54_ = 0U;
 	PDFWriter* _tmp55_ = NULL;
-	PDFWriter* _tmp366_ = NULL;
-	guint info_number = 0U;
-	PDFWriter* _tmp367_ = NULL;
-	guint _tmp368_ = 0U;
-	PDFWriter* _tmp369_ = NULL;
-	guint _tmp370_ = 0U;
-	gchar* _tmp371_ = NULL;
-	gchar* _tmp372_ = NULL;
-	PDFWriter* _tmp373_ = NULL;
-	PDFWriter* _tmp374_ = NULL;
-	gchar* _tmp375_ = NULL;
-	gchar* _tmp376_ = NULL;
-	PDFWriter* _tmp377_ = NULL;
-	PDFWriter* _tmp378_ = NULL;
-	PDFWriter* _tmp379_ = 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* _tmp380_ = NULL;
-	gsize _tmp381_ = 0UL;
-	PDFWriter* _tmp382_ = NULL;
-	PDFWriter* _tmp383_ = NULL;
-	PDFWriter* _tmp384_ = NULL;
-	GList* _tmp385_ = NULL;
-	guint _tmp386_ = 0U;
-	gchar* _tmp387_ = NULL;
-	gchar* _tmp388_ = NULL;
-	PDFWriter* _tmp389_ = NULL;
-	PDFWriter* _tmp390_ = NULL;
-	GList* _tmp391_ = NULL;
-	PDFWriter* _tmp396_ = NULL;
-	PDFWriter* _tmp397_ = NULL;
-	PDFWriter* _tmp398_ = NULL;
-	PDFWriter* _tmp399_ = NULL;
-	PDFWriter* _tmp400_ = NULL;
-	GList* _tmp401_ = NULL;
-	guint _tmp402_ = 0U;
-	gchar* _tmp403_ = NULL;
-	gchar* _tmp404_ = NULL;
-	PDFWriter* _tmp405_ = NULL;
-	guint _tmp406_ = 0U;
-	gchar* _tmp407_ = NULL;
-	gchar* _tmp408_ = NULL;
-	PDFWriter* _tmp409_ = NULL;
-	guint _tmp410_ = 0U;
-	gchar* _tmp411_ = NULL;
-	gchar* _tmp412_ = NULL;
-	PDFWriter* _tmp413_ = NULL;
-	const gchar* _tmp414_ = NULL;
-	const gchar* _tmp415_ = NULL;
-	gchar* _tmp416_ = NULL;
-	gchar* _tmp417_ = NULL;
-	PDFWriter* _tmp418_ = NULL;
-	PDFWriter* _tmp419_ = NULL;
-	PDFWriter* _tmp420_ = NULL;
-	gsize _tmp421_ = 0UL;
-	gchar* _tmp422_ = NULL;
-	gchar* _tmp423_ = NULL;
-	PDFWriter* _tmp424_ = NULL;
+	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);
@@ -2055,19 +2157,19 @@ static void book_save_pdf (Book* self, GFile* file, gint quality, GError** error
 	_tmp0_ = g_strdup ("");
 #line 260 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	id = _tmp0_;
-#line 2059 "book.c"
+#line 2161 "book.c"
 	{
 		gint i = 0;
 #line 261 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		i = 0;
-#line 2064 "book.c"
+#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 2071 "book.c"
+#line 2173 "book.c"
 				gint _tmp3_ = 0;
 				const gchar* _tmp4_ = NULL;
 				guint32 _tmp5_ = 0U;
@@ -2076,13 +2178,13 @@ static void book_save_pdf (Book* self, GFile* file, gint quality, GError** error
 				gchar* _tmp8_ = NULL;
 #line 261 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if (!_tmp1_) {
-#line 2080 "book.c"
+#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 2086 "book.c"
+#line 2188 "book.c"
 				}
 #line 261 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp1_ = FALSE;
@@ -2092,7 +2194,7 @@ static void book_save_pdf (Book* self, GFile* file, gint quality, GError** error
 				if (!(_tmp3_ < 4)) {
 #line 261 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					break;
-#line 2096 "book.c"
+#line 2198 "book.c"
 				}
 #line 262 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp4_ = id;
@@ -2110,7 +2212,7 @@ static void book_save_pdf (Book* self, GFile* file, gint quality, GError** error
 				id = _tmp8_;
 #line 262 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_g_free0 (_tmp7_);
-#line 2114 "book.c"
+#line 2216 "book.c"
 			}
 		}
 	}
@@ -2128,7 +2230,7 @@ static void book_save_pdf (Book* self, GFile* file, gint quality, GError** error
 		_g_free0 (id);
 #line 264 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return;
-#line 2132 "book.c"
+#line 2234 "book.c"
 	}
 #line 265 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp11_ = pdf_writer_new (stream);
@@ -2137,2137 +2239,2769 @@ static void book_save_pdf (Book* self, GFile* file, gint quality, GError** error
 #line 268 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp12_ = writer;
 #line 268 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp12_, "%PDF-1.3\n");
+	_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"
-	_tmp13_ = writer;
+	_tmp19_ = pdf_writer_add_object (_tmp18_);
 #line 271 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp13_, "%\xe2\xe3\xcf\xd3\n");
+	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"
-	_tmp14_ = writer;
+	_tmp26_ = book_get_n_pages (self);
 #line 274 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp15_ = pdf_writer_start_object (_tmp14_);
+	_tmp27_ = _tmp26_;
 #line 274 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	catalog_number = _tmp15_;
-#line 275 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp16_ = writer;
-#line 275 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp17_ = catalog_number;
-#line 275 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp18_ = g_strdup_printf ("%u 0 obj\n", _tmp17_);
-#line 275 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp19_ = _tmp18_;
-#line 275 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp16_, _tmp19_);
-#line 275 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp19_);
-#line 276 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp20_ = writer;
-#line 276 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp20_, "<<\n");
-#line 277 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp21_ = writer;
-#line 277 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp21_, "/Type /Catalog\n");
-#line 280 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp22_ = writer;
-#line 280 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp23_ = catalog_number;
-#line 280 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp24_ = g_strdup_printf ("/Pages %u 0 R\n", _tmp23_ + 1);
-#line 280 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp25_ = _tmp24_;
-#line 280 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp22_, _tmp25_);
-#line 280 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp25_);
-#line 281 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp26_ = writer;
-#line 281 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp26_, ">>\n");
-#line 282 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp27_ = writer;
-#line 282 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp27_, "endobj\n");
-#line 300 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp28_ = writer;
-#line 300 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp28_, "\n");
-#line 301 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp29_ = writer;
-#line 301 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp30_ = pdf_writer_start_object (_tmp29_);
-#line 301 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pages_number = _tmp30_;
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp31_ = writer;
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp32_ = pages_number;
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp33_ = g_strdup_printf ("%u 0 obj\n", _tmp32_);
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp34_ = _tmp33_;
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp31_, _tmp34_);
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp34_);
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp35_ = writer;
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp35_, "<<\n");
-#line 304 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp36_ = writer;
-#line 304 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp36_, "/Type /Pages\n");
-#line 305 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp37_ = writer;
-#line 305 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp37_, "/Kids [");
-#line 2226 "book.c"
+	_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 306 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		i = 0;
-#line 2231 "book.c"
+#line 2305 "book.c"
 		{
-			gboolean _tmp38_ = FALSE;
-#line 306 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-			_tmp38_ = TRUE;
-#line 306 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+			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 2238 "book.c"
+#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;
-				guint _tmp41_ = 0U;
+				PDFWriter* _tmp41_ = NULL;
 				guint _tmp42_ = 0U;
-				PDFWriter* _tmp43_ = NULL;
-				guint _tmp44_ = 0U;
+				guint _tmp43_ = 0U;
+				guint* _tmp44_ = NULL;
+				gint _tmp44__length1 = 0;
 				gint _tmp45_ = 0;
-				gchar* _tmp46_ = NULL;
-				gchar* _tmp47_ = NULL;
-#line 306 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (!_tmp38_) {
-#line 2249 "book.c"
-					gint _tmp39_ = 0;
-#line 306 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp39_ = i;
-#line 306 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					i = _tmp39_ + 1;
-#line 2255 "book.c"
+				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 306 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp38_ = FALSE;
-#line 306 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp40_ = i;
-#line 306 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp41_ = book_get_n_pages (self);
-#line 306 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp42_ = _tmp41_;
-#line 306 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (!(((guint) _tmp40_) < _tmp42_)) {
-#line 306 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#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 2269 "book.c"
+#line 2356 "book.c"
 				}
-#line 307 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp43_ = writer;
-#line 307 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp44_ = pages_number;
-#line 307 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#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 307 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp46_ = g_strdup_printf (" %u 0 R", (_tmp44_ + 1) + (_tmp45_ * 3));
-#line 307 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp47_ = _tmp46_;
-#line 307 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp43_, _tmp47_);
-#line 307 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp47_);
-#line 2285 "book.c"
+#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 308 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp48_ = writer;
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp48_, " ]\n");
-#line 309 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp49_ = writer;
-#line 309 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp50_ = book_get_n_pages (self);
-#line 309 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp51_ = _tmp50_;
-#line 309 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp52_ = g_strdup_printf ("/Count %u\n", _tmp51_);
-#line 309 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp53_ = _tmp52_;
-#line 309 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp49_, _tmp53_);
-#line 309 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp53_);
-#line 310 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp54_ = writer;
-#line 310 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp54_, ">>\n");
-#line 311 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#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 311 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp55_, "endobj\n");
-#line 2315 "book.c"
-	{
-		gint i = 0;
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		i = 0;
-#line 2320 "book.c"
-		{
-			gboolean _tmp56_ = FALSE;
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-			_tmp56_ = TRUE;
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-			while (TRUE) {
-#line 2327 "book.c"
-				gint _tmp58_ = 0;
-				guint _tmp59_ = 0U;
-				guint _tmp60_ = 0U;
-				Page* page = NULL;
-				gint _tmp61_ = 0;
-				Page* _tmp62_ = NULL;
-				GdkPixbuf* image = NULL;
-				Page* _tmp63_ = NULL;
-				GdkPixbuf* _tmp64_ = NULL;
-				gint width = 0;
-				GdkPixbuf* _tmp65_ = NULL;
-				gint _tmp66_ = 0;
-				gint _tmp67_ = 0;
-				gint height = 0;
-				GdkPixbuf* _tmp68_ = NULL;
-				gint _tmp69_ = 0;
-				gint _tmp70_ = 0;
-				guint8* pixels = NULL;
-				GdkPixbuf* _tmp71_ = NULL;
-				guint8* _tmp72_ = NULL;
-				gint pixels_length1 = 0;
-				gint _pixels_size_ = 0;
-				gdouble page_width = 0.0;
-				gint _tmp73_ = 0;
-				Page* _tmp74_ = NULL;
-				gint _tmp75_ = 0;
-				gint _tmp76_ = 0;
-				gdouble page_height = 0.0;
-				gint _tmp77_ = 0;
-				Page* _tmp78_ = NULL;
-				gint _tmp79_ = 0;
-				gint _tmp80_ = 0;
-				gint depth = 0;
-				gchar* color_space = NULL;
-				gchar* _tmp81_ = NULL;
-				gchar* filter = NULL;
-				gchar* width_buffer = NULL;
-				gchar* _tmp82_ = NULL;
-				gint width_buffer_length1 = 0;
-				gint _width_buffer_size_ = 0;
-				gchar* height_buffer = NULL;
-				gchar* _tmp83_ = NULL;
-				gint height_buffer_length1 = 0;
-				gint _height_buffer_size_ = 0;
-				guint8* data = NULL;
-				gint data_length1 = 0;
-				gint _data_size_ = 0;
-				Page* _tmp84_ = NULL;
-				gboolean _tmp85_ = FALSE;
-				gboolean _tmp86_ = FALSE;
-				guint8* compressed_data = NULL;
-				guint8* _tmp240_ = NULL;
-				gint _tmp240__length1 = 0;
-				gint _tmp241_ = 0;
-				guint8* _tmp242_ = NULL;
-				gint compressed_data_length1 = 0;
-				gint _compressed_data_size_ = 0;
-				guint8* _tmp243_ = NULL;
-				gint _tmp243__length1 = 0;
-				PDFWriter* _tmp261_ = NULL;
-				guint number = 0U;
-				PDFWriter* _tmp262_ = NULL;
-				guint _tmp263_ = 0U;
-				PDFWriter* _tmp264_ = NULL;
-				guint _tmp265_ = 0U;
-				gchar* _tmp266_ = NULL;
-				gchar* _tmp267_ = NULL;
-				PDFWriter* _tmp268_ = NULL;
-				PDFWriter* _tmp269_ = NULL;
-				PDFWriter* _tmp270_ = NULL;
-				guint _tmp271_ = 0U;
-				gchar* _tmp272_ = NULL;
-				gchar* _tmp273_ = NULL;
-				PDFWriter* _tmp274_ = NULL;
-				gint _tmp275_ = 0;
-				guint _tmp276_ = 0U;
-				gchar* _tmp277_ = NULL;
-				gchar* _tmp278_ = NULL;
-				PDFWriter* _tmp279_ = NULL;
-				gdouble _tmp280_ = 0.0;
-				gchar* _tmp281_ = NULL;
-				gint _tmp281__length1 = 0;
-				const gchar* _tmp282_ = NULL;
-				gdouble _tmp283_ = 0.0;
-				gchar* _tmp284_ = NULL;
-				gint _tmp284__length1 = 0;
-				const gchar* _tmp285_ = NULL;
-				gchar* _tmp286_ = NULL;
-				gchar* _tmp287_ = NULL;
-				PDFWriter* _tmp288_ = NULL;
-				guint _tmp289_ = 0U;
-				gchar* _tmp290_ = NULL;
-				gchar* _tmp291_ = NULL;
-				PDFWriter* _tmp292_ = NULL;
-				PDFWriter* _tmp293_ = NULL;
-				PDFWriter* _tmp294_ = NULL;
-				PDFWriter* _tmp295_ = NULL;
-				guint _tmp296_ = 0U;
-				PDFWriter* _tmp297_ = NULL;
-				guint _tmp298_ = 0U;
-				gchar* _tmp299_ = NULL;
-				gchar* _tmp300_ = NULL;
-				PDFWriter* _tmp301_ = NULL;
-				PDFWriter* _tmp302_ = NULL;
-				PDFWriter* _tmp303_ = NULL;
-				PDFWriter* _tmp304_ = NULL;
-				gint _tmp305_ = 0;
-				gchar* _tmp306_ = NULL;
-				gchar* _tmp307_ = NULL;
-				PDFWriter* _tmp308_ = NULL;
-				gint _tmp309_ = 0;
-				gchar* _tmp310_ = NULL;
-				gchar* _tmp311_ = NULL;
-				PDFWriter* _tmp312_ = NULL;
-				const gchar* _tmp313_ = NULL;
-				gchar* _tmp314_ = NULL;
-				gchar* _tmp315_ = NULL;
-				PDFWriter* _tmp316_ = NULL;
-				gint _tmp317_ = 0;
-				gchar* _tmp318_ = NULL;
-				gchar* _tmp319_ = NULL;
-				PDFWriter* _tmp320_ = NULL;
-				guint8* _tmp321_ = NULL;
-				gint _tmp321__length1 = 0;
-				gchar* _tmp322_ = NULL;
-				gchar* _tmp323_ = NULL;
-				const gchar* _tmp324_ = NULL;
-				PDFWriter* _tmp329_ = NULL;
-				PDFWriter* _tmp330_ = NULL;
-				PDFWriter* _tmp331_ = NULL;
-				guint8* _tmp332_ = NULL;
-				gint _tmp332__length1 = 0;
-				PDFWriter* _tmp333_ = NULL;
-				PDFWriter* _tmp334_ = NULL;
-				PDFWriter* _tmp335_ = NULL;
-				gchar* command = NULL;
-				gdouble _tmp336_ = 0.0;
-				gchar* _tmp337_ = NULL;
-				gint _tmp337__length1 = 0;
-				const gchar* _tmp338_ = NULL;
-				gdouble _tmp339_ = 0.0;
-				gchar* _tmp340_ = NULL;
-				gint _tmp340__length1 = 0;
-				const gchar* _tmp341_ = NULL;
-				gint _tmp342_ = 0;
-				gchar* _tmp343_ = NULL;
-				PDFWriter* _tmp344_ = NULL;
-				PDFWriter* _tmp345_ = NULL;
-				guint _tmp346_ = 0U;
-				PDFWriter* _tmp347_ = NULL;
-				guint _tmp348_ = 0U;
-				gchar* _tmp349_ = NULL;
-				gchar* _tmp350_ = NULL;
-				PDFWriter* _tmp351_ = NULL;
-				PDFWriter* _tmp352_ = NULL;
-				const gchar* _tmp353_ = NULL;
-				gint _tmp354_ = 0;
-				gint _tmp355_ = 0;
-				gchar* _tmp356_ = NULL;
-				gchar* _tmp357_ = NULL;
-				PDFWriter* _tmp358_ = NULL;
-				PDFWriter* _tmp359_ = NULL;
-				PDFWriter* _tmp360_ = NULL;
-				const gchar* _tmp361_ = NULL;
-				PDFWriter* _tmp362_ = NULL;
-				PDFWriter* _tmp363_ = NULL;
-				PDFWriter* _tmp364_ = NULL;
-				gint _tmp365_ = 0;
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (!_tmp56_) {
-#line 2498 "book.c"
-					gint _tmp57_ = 0;
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp57_ = i;
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					i = _tmp57_ + 1;
-#line 2504 "book.c"
-				}
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp56_ = FALSE;
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp58_ = i;
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp59_ = book_get_n_pages (self);
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp60_ = _tmp59_;
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (!(((guint) _tmp58_) < _tmp60_)) {
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					break;
-#line 2518 "book.c"
-				}
-#line 315 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp61_ = i;
-#line 315 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp62_ = book_get_page (self, _tmp61_);
-#line 315 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				page = _tmp62_;
-#line 316 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp63_ = page;
-#line 316 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp64_ = page_get_image (_tmp63_, TRUE);
-#line 316 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				image = _tmp64_;
-#line 317 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp65_ = image;
-#line 317 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp66_ = gdk_pixbuf_get_width (_tmp65_);
-#line 317 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp67_ = _tmp66_;
-#line 317 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				width = _tmp67_;
-#line 318 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp68_ = image;
-#line 318 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp69_ = gdk_pixbuf_get_height (_tmp68_);
-#line 318 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp70_ = _tmp69_;
-#line 318 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				height = _tmp70_;
-#line 319 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp71_ = image;
-#line 319 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp72_ = gdk_pixbuf_get_pixels (_tmp71_);
-#line 319 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pixels = _tmp72_;
-#line 319 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pixels_length1 = -1;
-#line 319 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_pixels_size_ = pixels_length1;
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp73_ = width;
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp74_ = page;
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp75_ = page_get_dpi (_tmp74_);
+#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"
-				_tmp76_ = _tmp75_;
+	_tmp86_ = writer;
 #line 320 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				page_width = (_tmp73_ * 72.0) / _tmp76_;
+	pdf_writer_write_string (_tmp86_, "\n");
 #line 321 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp77_ = height;
+	_tmp87_ = writer;
 #line 321 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp78_ = page;
+	_tmp88_ = metadata_number;
 #line 321 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp79_ = page_get_dpi (_tmp78_);
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp80_ = _tmp79_;
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				page_height = (_tmp77_ * 72.0) / _tmp80_;
+	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"
-				depth = 8;
+	_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"
-				_tmp81_ = g_strdup ("DeviceRGB");
+	_tmp94_ = writer;
 #line 324 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				color_space = _tmp81_;
+	pdf_writer_write_string (_tmp94_, "/Type /Metadata\n");
 #line 325 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				filter = NULL;
+	_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"
-				_tmp82_ = g_new0 (gchar, G_ASCII_DTOSTR_BUF_SIZE);
+	_tmp96_ = writer;
 #line 326 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				width_buffer = _tmp82_;
+	_tmp97_ = metadata;
 #line 326 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				width_buffer_length1 = G_ASCII_DTOSTR_BUF_SIZE;
+	_tmp98_ = strlen (_tmp97_);
 #line 326 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_width_buffer_size_ = width_buffer_length1;
-#line 327 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp83_ = g_new0 (gchar, G_ASCII_DTOSTR_BUF_SIZE);
-#line 327 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				height_buffer = _tmp83_;
+	_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"
-				height_buffer_length1 = G_ASCII_DTOSTR_BUF_SIZE;
+	_tmp102_ = writer;
 #line 327 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_height_buffer_size_ = height_buffer_length1;
-#line 329 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp84_ = page;
+	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"
-				_tmp85_ = page_get_is_color (_tmp84_);
+	_tmp104_ = writer;
 #line 329 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp86_ = _tmp85_;
+	_tmp105_ = metadata;
 #line 329 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (_tmp86_) {
-#line 2610 "book.c"
-					gchar* _tmp87_ = NULL;
-					gint data_length = 0;
-					gint _tmp88_ = 0;
-					gint _tmp89_ = 0;
-					gint _tmp90_ = 0;
-					guint8* _tmp91_ = NULL;
+	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"
-					depth = 8;
-#line 332 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp87_ = g_strdup ("DeviceRGB");
+	_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"
-					_g_free0 (color_space);
+	_tmp108_ = writer;
 #line 332 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					color_space = _tmp87_;
-#line 333 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp88_ = height;
-#line 333 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp89_ = width;
-#line 333 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					data_length = (_tmp88_ * _tmp89_) * 3;
-#line 334 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp90_ = data_length;
-#line 334 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp91_ = g_new0 (guint8, _tmp90_);
-#line 334 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					data = (g_free (data), NULL);
-#line 334 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					data = _tmp91_;
-#line 334 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					data_length1 = _tmp90_;
-#line 334 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_data_size_ = data_length1;
-#line 2643 "book.c"
-					{
-						gint row = 0;
+	pdf_writer_write_string (_tmp108_, "endobj\n");
 #line 335 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						row = 0;
-#line 2648 "book.c"
-						{
-							gboolean _tmp92_ = FALSE;
+	_tmp109_ = writer;
 #line 335 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp92_ = TRUE;
-#line 335 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							while (TRUE) {
-#line 2655 "book.c"
-								gint _tmp94_ = 0;
-								gint _tmp95_ = 0;
-								gint in_offset = 0;
-								gint _tmp96_ = 0;
-								GdkPixbuf* _tmp97_ = NULL;
-								gint _tmp98_ = 0;
-								gint _tmp99_ = 0;
-								gint out_offset = 0;
-								gint _tmp100_ = 0;
-								gint _tmp101_ = 0;
-#line 335 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								if (!_tmp92_) {
-#line 2668 "book.c"
-									gint _tmp93_ = 0;
-#line 335 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									_tmp93_ = row;
-#line 335 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									row = _tmp93_ + 1;
-#line 2674 "book.c"
-								}
-#line 335 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								_tmp92_ = FALSE;
-#line 335 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								_tmp94_ = row;
-#line 335 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								_tmp95_ = height;
-#line 335 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								if (!(_tmp94_ < _tmp95_)) {
-#line 335 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									break;
-#line 2686 "book.c"
-								}
+	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"
-								_tmp96_ = row;
+	_tmp112_ = writer;
 #line 337 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								_tmp97_ = image;
+	_tmp113_ = pages_number;
 #line 337 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								_tmp98_ = gdk_pixbuf_get_rowstride (_tmp97_);
+	_tmp114_ = g_strdup_printf ("%u 0 obj\n", _tmp113_);
 #line 337 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								_tmp99_ = _tmp98_;
+	_tmp115_ = _tmp114_;
 #line 337 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								in_offset = _tmp96_ * _tmp99_;
-#line 338 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								_tmp100_ = row;
+	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"
-								_tmp101_ = width;
+	_tmp116_ = writer;
 #line 338 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								out_offset = (_tmp100_ * _tmp101_) * 3;
-#line 2704 "book.c"
-								{
-									gint x = 0;
-#line 339 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									x = 0;
-#line 2709 "book.c"
-									{
-										gboolean _tmp102_ = FALSE;
+	pdf_writer_write_string (_tmp116_, "<<\n");
 #line 339 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp102_ = TRUE;
+	_tmp117_ = writer;
 #line 339 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										while (TRUE) {
-#line 2716 "book.c"
-											gint _tmp104_ = 0;
-											gint _tmp105_ = 0;
-											gint in_o = 0;
-											gint _tmp106_ = 0;
-											gint _tmp107_ = 0;
-											gint out_o = 0;
-											gint _tmp108_ = 0;
-											gint _tmp109_ = 0;
-											guint8* _tmp110_ = NULL;
-											gint _tmp110__length1 = 0;
-											gint _tmp111_ = 0;
-											guint8* _tmp112_ = NULL;
-											gint _tmp112__length1 = 0;
-											gint _tmp113_ = 0;
-											guint8 _tmp114_ = 0U;
-											guint8 _tmp115_ = 0U;
-											guint8* _tmp116_ = NULL;
-											gint _tmp116__length1 = 0;
-											gint _tmp117_ = 0;
-											guint8* _tmp118_ = NULL;
-											gint _tmp118__length1 = 0;
-											gint _tmp119_ = 0;
-											guint8 _tmp120_ = 0U;
-											guint8 _tmp121_ = 0U;
-											guint8* _tmp122_ = NULL;
-											gint _tmp122__length1 = 0;
-											gint _tmp123_ = 0;
-											guint8* _tmp124_ = NULL;
-											gint _tmp124__length1 = 0;
-											gint _tmp125_ = 0;
-											guint8 _tmp126_ = 0U;
-											guint8 _tmp127_ = 0U;
-#line 339 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											if (!_tmp102_) {
-#line 2751 "book.c"
-												gint _tmp103_ = 0;
-#line 339 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp103_ = x;
-#line 339 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												x = _tmp103_ + 1;
-#line 2757 "book.c"
-											}
-#line 339 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp102_ = FALSE;
-#line 339 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp104_ = x;
-#line 339 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp105_ = width;
-#line 339 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											if (!(_tmp104_ < _tmp105_)) {
-#line 339 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												break;
-#line 2769 "book.c"
-											}
+	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"
-											_tmp106_ = in_offset;
+		i = 0;
+#line 2635 "book.c"
+		{
+			gboolean _tmp119_ = FALSE;
 #line 341 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp107_ = x;
+			_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"
-											in_o = _tmp106_ + (_tmp107_ * 3);
+				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"
-											_tmp108_ = out_offset;
+				_tmp124_ = writer;
 #line 342 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp109_ = x;
+				_tmp125_ = page_numbers;
 #line 342 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											out_o = _tmp108_ + (_tmp109_ * 3);
-#line 344 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp110_ = data;
-#line 344 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp110__length1 = data_length1;
+				_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"
-											_tmp111_ = out_o;
+	_tmp131_ = writer;
 #line 344 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp112_ = pixels;
+	_tmp132_ = book_get_n_pages (self);
 #line 344 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp112__length1 = pixels_length1;
+	_tmp133_ = _tmp132_;
 #line 344 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp113_ = in_o;
+	_tmp134_ = g_strdup_printf ("/Count %u\n", _tmp133_);
 #line 344 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp114_ = _tmp112_[_tmp113_];
+	_tmp135_ = _tmp134_;
 #line 344 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp110_[_tmp111_] = _tmp114_;
+	pdf_writer_write_string (_tmp131_, _tmp135_);
 #line 344 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp115_ = _tmp110_[_tmp111_];
-#line 345 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp116_ = data;
-#line 345 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp116__length1 = data_length1;
-#line 345 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp117_ = out_o;
-#line 345 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp118_ = pixels;
-#line 345 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp118__length1 = pixels_length1;
-#line 345 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp119_ = in_o;
-#line 345 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp120_ = _tmp118_[_tmp119_ + 1];
+	_g_free0 (_tmp135_);
 #line 345 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp116_[_tmp117_ + 1] = _tmp120_;
+	_tmp136_ = writer;
 #line 345 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp121_ = _tmp116_[_tmp117_ + 1];
+	pdf_writer_write_string (_tmp136_, ">>\n");
 #line 346 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp122_ = data;
+	_tmp137_ = writer;
 #line 346 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp122__length1 = data_length1;
-#line 346 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp123_ = out_o;
-#line 346 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp124_ = pixels;
-#line 346 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp124__length1 = pixels_length1;
-#line 346 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp125_ = in_o;
-#line 346 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp126_ = _tmp124_[_tmp125_ + 2];
-#line 346 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp122_[_tmp123_ + 2] = _tmp126_;
-#line 346 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp127_ = _tmp122_[_tmp123_ + 2];
-#line 2837 "book.c"
-										}
-									}
-								}
-							}
-						}
-					}
-				} else {
-					Page* _tmp128_ = NULL;
-					gint _tmp129_ = 0;
-					gint _tmp130_ = 0;
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp128_ = page;
+	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"
-					_tmp129_ = page_get_depth (_tmp128_);
+				_tmp143_ = i;
 #line 350 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp130_ = _tmp129_;
+				_tmp144_ = book_get_page (self, _tmp143_);
 #line 350 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					if (_tmp130_ == 2) {
-#line 2856 "book.c"
-						gint shift_count = 0;
-						gchar* _tmp131_ = NULL;
-						gint data_length = 0;
-						gint _tmp132_ = 0;
-						gint _tmp133_ = 0;
-						gint _tmp134_ = 0;
-						guint8* _tmp135_ = NULL;
-						gint offset = 0;
+				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"
-						shift_count = 6;
+				_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"
-						depth = 2;
+				_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"
-						_tmp131_ = g_strdup ("DeviceGray");
+				_tmp153_ = image;
 #line 354 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_g_free0 (color_space);
+				_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"
-						color_space = _tmp131_;
+				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"
-						_tmp132_ = height;
+				_tmp155_ = width;
 #line 355 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp133_ = width;
+				_tmp156_ = page;
 #line 355 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						data_length = _tmp132_ * (((_tmp133_ * 2) + 7) / 8);
-#line 356 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp134_ = data_length;
+				_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"
-						_tmp135_ = g_new0 (guint8, _tmp134_);
+				_tmp159_ = height;
 #line 356 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						data = (g_free (data), NULL);
+				_tmp160_ = page;
 #line 356 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						data = _tmp135_;
+				_tmp161_ = page_get_dpi (_tmp160_);
 #line 356 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						data_length1 = _tmp134_;
+				_tmp162_ = _tmp161_;
 #line 356 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_data_size_ = data_length1;
-#line 357 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						offset = 0;
-#line 2895 "book.c"
-						{
-							gint row = 0;
-#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							row = 0;
-#line 2900 "book.c"
-							{
-								gboolean _tmp136_ = FALSE;
-#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								_tmp136_ = TRUE;
-#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								while (TRUE) {
-#line 2907 "book.c"
-									gint _tmp138_ = 0;
-									gint _tmp139_ = 0;
-									gint _tmp140_ = 0;
-									gint in_offset = 0;
-									gint _tmp142_ = 0;
-									GdkPixbuf* _tmp143_ = NULL;
-									gint _tmp144_ = 0;
-									gint _tmp145_ = 0;
-#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									if (!_tmp136_) {
-#line 2918 "book.c"
-										gint _tmp137_ = 0;
-#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp137_ = row;
-#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										row = _tmp137_ + 1;
-#line 2924 "book.c"
-									}
-#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									_tmp136_ = FALSE;
-#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									_tmp138_ = row;
-#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									_tmp139_ = height;
+				page_height = (_tmp159_ * 72.0) / _tmp162_;
 #line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									if (!(_tmp138_ < _tmp139_)) {
-#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										break;
-#line 2936 "book.c"
-									}
+				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"
-									_tmp140_ = shift_count;
+				_tmp164_ = g_new0 (gchar, G_ASCII_DTOSTR_BUF_SIZE);
 #line 361 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									if (_tmp140_ != 6) {
-#line 2942 "book.c"
-										gint _tmp141_ = 0;
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp141_ = offset;
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										offset = _tmp141_ + 1;
+				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"
-										shift_count = 6;
-#line 2950 "book.c"
-									}
-#line 367 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									_tmp142_ = row;
-#line 367 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									_tmp143_ = image;
+				_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"
-									_tmp144_ = gdk_pixbuf_get_rowstride (_tmp143_);
+					_tmp169_ = g_strdup ("DeviceRGB");
 #line 367 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									_tmp145_ = _tmp144_;
+					_g_free0 (color_space);
 #line 367 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									in_offset = _tmp142_ * _tmp145_;
-#line 2962 "book.c"
-									{
-										gint x = 0;
-#line 368 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										x = 0;
-#line 2967 "book.c"
-										{
-											gboolean _tmp146_ = FALSE;
-#line 368 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp146_ = TRUE;
-#line 368 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											while (TRUE) {
-#line 2974 "book.c"
-												gint _tmp148_ = 0;
-												gint _tmp149_ = 0;
-												gint _tmp150_ = 0;
-												guint8 p = 0U;
-												guint8* _tmp154_ = NULL;
-												gint _tmp154__length1 = 0;
-												gint _tmp155_ = 0;
-												gint _tmp156_ = 0;
-												guint8 _tmp157_ = 0U;
-												guint8 _tmp158_ = 0U;
-												gint _tmp173_ = 0;
-#line 368 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												if (!_tmp146_) {
-#line 2988 "book.c"
-													gint _tmp147_ = 0;
-#line 368 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp147_ = x;
-#line 368 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													x = _tmp147_ + 1;
-#line 2994 "book.c"
-												}
+					color_space = _tmp169_;
 #line 368 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp146_ = FALSE;
+					_tmp170_ = height;
 #line 368 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp148_ = x;
+					_tmp171_ = width;
 #line 368 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp149_ = width;
-#line 368 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												if (!(_tmp148_ < _tmp149_)) {
-#line 368 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													break;
-#line 3006 "book.c"
-												}
-#line 371 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp150_ = shift_count;
-#line 371 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												if (_tmp150_ == 6) {
-#line 3012 "book.c"
-													guint8* _tmp151_ = NULL;
-													gint _tmp151__length1 = 0;
-													gint _tmp152_ = 0;
-													guint8 _tmp153_ = 0U;
+					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"
-													_tmp151_ = data;
+								_tmp178_ = row;
 #line 372 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp151__length1 = data_length1;
+								_tmp179_ = image;
 #line 372 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp152_ = offset;
+								_tmp180_ = gdk_pixbuf_get_rowstride (_tmp179_);
 #line 372 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp151_[_tmp152_] = (guint8) 0;
+								_tmp181_ = _tmp180_;
 #line 372 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp153_ = _tmp151_[_tmp152_];
-#line 3027 "book.c"
-												}
-#line 375 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp154_ = pixels;
-#line 375 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp154__length1 = pixels_length1;
-#line 375 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp155_ = in_offset;
-#line 375 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp156_ = x;
-#line 375 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp157_ = _tmp154_[_tmp155_ + (_tmp156_ * 3)];
-#line 375 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												p = _tmp157_;
+								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"
-												_tmp158_ = p;
+											_tmp188_ = in_offset;
 #line 376 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												if (((gint) _tmp158_) >= 192) {
-#line 3045 "book.c"
-													guint8* _tmp159_ = NULL;
-													gint _tmp159__length1 = 0;
-													gint _tmp160_ = 0;
-													gint _tmp161_ = 0;
-													guint8 _tmp162_ = 0U;
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp159_ = data;
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp159__length1 = data_length1;
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp160_ = offset;
+											_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"
-													_tmp161_ = shift_count;
+											_tmp190_ = out_offset;
 #line 377 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp159_[_tmp160_] |= (guint8) (3 << _tmp161_);
+											_tmp191_ = x;
 #line 377 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp162_ = _tmp159_[_tmp160_];
-#line 3063 "book.c"
-												} else {
-													guint8 _tmp163_ = 0U;
-#line 378 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp163_ = p;
-#line 378 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													if (((gint) _tmp163_) >= 128) {
-#line 3070 "book.c"
-														guint8* _tmp164_ = NULL;
-														gint _tmp164__length1 = 0;
-														gint _tmp165_ = 0;
-														gint _tmp166_ = 0;
-														guint8 _tmp167_ = 0U;
+											out_o = _tmp190_ + (_tmp191_ * 3);
 #line 379 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp164_ = data;
+											_tmp192_ = data;
 #line 379 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp164__length1 = data_length1;
+											_tmp192__length1 = data_length1;
 #line 379 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp165_ = offset;
+											_tmp193_ = out_o;
 #line 379 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp166_ = shift_count;
+											_tmp194_ = pixels;
 #line 379 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp164_[_tmp165_] |= (guint8) (2 << _tmp166_);
+											_tmp194__length1 = pixels_length1;
 #line 379 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp167_ = _tmp164_[_tmp165_];
-#line 3088 "book.c"
-													} else {
-														guint8 _tmp168_ = 0U;
+											_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"
-														_tmp168_ = p;
+											_tmp200_ = pixels;
 #line 380 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														if (((gint) _tmp168_) >= 64) {
-#line 3095 "book.c"
-															guint8* _tmp169_ = NULL;
-															gint _tmp169__length1 = 0;
-															gint _tmp170_ = 0;
-															gint _tmp171_ = 0;
-															guint8 _tmp172_ = 0U;
+											_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"
-															_tmp169_ = data;
+											_tmp204_ = data;
 #line 381 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-															_tmp169__length1 = data_length1;
+											_tmp204__length1 = data_length1;
 #line 381 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-															_tmp170_ = offset;
+											_tmp205_ = out_o;
 #line 381 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-															_tmp171_ = shift_count;
+											_tmp206_ = pixels;
 #line 381 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-															_tmp169_[_tmp170_] |= (guint8) (1 << _tmp171_);
+											_tmp206__length1 = pixels_length1;
 #line 381 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-															_tmp172_ = _tmp169_[_tmp170_];
-#line 3113 "book.c"
-														}
-													}
-												}
-#line 384 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp173_ = shift_count;
-#line 384 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												if (_tmp173_ == 0) {
-#line 3121 "book.c"
-													gint _tmp174_ = 0;
-#line 386 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp174_ = offset;
-#line 386 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													offset = _tmp174_ + 1;
-#line 387 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													shift_count = 6;
-#line 3129 "book.c"
-												} else {
-													gint _tmp175_ = 0;
-#line 390 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp175_ = shift_count;
-#line 390 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													shift_count = _tmp175_ - 2;
-#line 3136 "book.c"
-												}
-											}
+											_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* _tmp176_ = NULL;
-						gint _tmp177_ = 0;
-						gint _tmp178_ = 0;
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp176_ = page;
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp177_ = page_get_depth (_tmp176_);
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp178_ = _tmp177_;
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						if (_tmp178_ == 1) {
-#line 3156 "book.c"
-							gint mask = 0;
-							gchar* _tmp179_ = NULL;
-							gint data_length = 0;
-							gint _tmp180_ = 0;
-							gint _tmp181_ = 0;
-							gint _tmp182_ = 0;
-							guint8* _tmp183_ = NULL;
-							gint offset = 0;
+					}
+				} 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"
-							mask = 0x80;
+									_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"
-							depth = 1;
-#line 399 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp179_ = g_strdup ("DeviceGray");
-#line 399 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_g_free0 (color_space);
+										_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"
-							color_space = _tmp179_;
-#line 400 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp180_ = height;
-#line 400 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp181_ = width;
-#line 400 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							data_length = _tmp180_ * ((_tmp181_ + 7) / 8);
-#line 401 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp182_ = data_length;
-#line 401 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp183_ = g_new0 (guint8, _tmp182_);
-#line 401 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							data = (g_free (data), NULL);
-#line 401 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							data = _tmp183_;
-#line 401 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							data_length1 = _tmp182_;
-#line 401 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_data_size_ = data_length1;
+										shift_count = 6;
+#line 3394 "book.c"
+									}
 #line 402 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							offset = 0;
-#line 3195 "book.c"
-							{
-								gint row = 0;
+									_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"
-								row = 0;
-#line 3200 "book.c"
-								{
-									gboolean _tmp184_ = FALSE;
+										x = 0;
+#line 3411 "book.c"
+										{
+											gboolean _tmp228_ = FALSE;
 #line 403 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									_tmp184_ = TRUE;
+											_tmp228_ = TRUE;
 #line 403 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									while (TRUE) {
-#line 3207 "book.c"
-										gint _tmp186_ = 0;
-										gint _tmp187_ = 0;
-										gint _tmp188_ = 0;
-										gint in_offset = 0;
-										gint _tmp190_ = 0;
-										GdkPixbuf* _tmp191_ = NULL;
-										gint _tmp192_ = 0;
-										gint _tmp193_ = 0;
+											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 (!_tmp184_) {
-#line 3218 "book.c"
-											gint _tmp185_ = 0;
+												if (!_tmp228_) {
+#line 3432 "book.c"
+													gint _tmp229_ = 0;
 #line 403 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp185_ = row;
+													_tmp229_ = x;
 #line 403 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											row = _tmp185_ + 1;
-#line 3224 "book.c"
-										}
+													x = _tmp229_ + 1;
+#line 3438 "book.c"
+												}
 #line 403 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp184_ = FALSE;
+												_tmp228_ = FALSE;
 #line 403 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp186_ = row;
+												_tmp230_ = x;
 #line 403 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp187_ = height;
+												_tmp231_ = width;
 #line 403 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										if (!(_tmp186_ < _tmp187_)) {
+												if (!(_tmp230_ < _tmp231_)) {
 #line 403 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											break;
-#line 3236 "book.c"
-										}
+													break;
+#line 3450 "book.c"
+												}
 #line 406 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp188_ = mask;
+												_tmp232_ = shift_count;
 #line 406 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										if (_tmp188_ != 0x80) {
-#line 3242 "book.c"
-											gint _tmp189_ = 0;
-#line 408 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp189_ = offset;
-#line 408 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											offset = _tmp189_ + 1;
-#line 409 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											mask = 0x80;
-#line 3250 "book.c"
-										}
+												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"
-										_tmp190_ = row;
+													_tmp241_ = data;
 #line 412 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp191_ = image;
+													_tmp241__length1 = data_length1;
 #line 412 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp192_ = gdk_pixbuf_get_rowstride (_tmp191_);
+													_tmp242_ = offset;
 #line 412 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp193_ = _tmp192_;
+													_tmp243_ = shift_count;
 #line 412 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										in_offset = _tmp190_ * _tmp193_;
-#line 3262 "book.c"
-										{
-											gint x = 0;
-#line 413 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											x = 0;
-#line 3267 "book.c"
-											{
-												gboolean _tmp194_ = FALSE;
-#line 413 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp194_ = TRUE;
-#line 413 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												while (TRUE) {
-#line 3274 "book.c"
-													gint _tmp196_ = 0;
-													gint _tmp197_ = 0;
-													gint _tmp198_ = 0;
-													guint8* _tmp202_ = NULL;
-													gint _tmp202__length1 = 0;
-													gint _tmp203_ = 0;
-													gint _tmp204_ = 0;
-													guint8 _tmp205_ = 0U;
-													gint _tmp210_ = 0;
-													gint _tmp211_ = 0;
-#line 413 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													if (!_tmp194_) {
-#line 3287 "book.c"
-														gint _tmp195_ = 0;
-#line 413 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp195_ = x;
-#line 413 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														x = _tmp195_ + 1;
-#line 3293 "book.c"
-													}
-#line 413 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp194_ = FALSE;
-#line 413 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp196_ = x;
-#line 413 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp197_ = width;
+													_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"
-													if (!(_tmp196_ < _tmp197_)) {
+													_tmp245_ = p;
 #line 413 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														break;
-#line 3305 "book.c"
-													}
+													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"
-													_tmp198_ = mask;
+															_tmp251__length1 = data_length1;
 #line 416 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													if (_tmp198_ == 0x80) {
-#line 3311 "book.c"
-														guint8* _tmp199_ = NULL;
-														gint _tmp199__length1 = 0;
-														gint _tmp200_ = 0;
-														guint8 _tmp201_ = 0U;
-#line 417 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp199_ = data;
-#line 417 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp199__length1 = data_length1;
-#line 417 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp200_ = offset;
-#line 417 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp199_[_tmp200_] = (guint8) 0;
-#line 417 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp201_ = _tmp199_[_tmp200_];
-#line 3326 "book.c"
+															_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 420 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp202_ = pixels;
-#line 420 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp202__length1 = pixels_length1;
-#line 420 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp203_ = in_offset;
-#line 420 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp204_ = x;
-#line 420 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp205_ = _tmp202_[_tmp203_ + (_tmp204_ * 3)];
-#line 420 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													if (((gint) _tmp205_) != 0) {
-#line 3340 "book.c"
-														guint8* _tmp206_ = NULL;
-														gint _tmp206__length1 = 0;
-														gint _tmp207_ = 0;
-														gint _tmp208_ = 0;
-														guint8 _tmp209_ = 0U;
-#line 421 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp206_ = data;
-#line 421 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp206__length1 = data_length1;
-#line 421 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp207_ = offset;
-#line 421 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp208_ = mask;
+												}
+#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"
-														_tmp206_[_tmp207_] |= (guint8) _tmp208_;
+													_tmp256_ = offset;
 #line 421 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp209_ = _tmp206_[_tmp207_];
-#line 3358 "book.c"
-													}
-#line 424 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp210_ = mask;
-#line 424 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													mask = _tmp210_ >> 1;
+													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"
-													_tmp211_ = mask;
+													_tmp257_ = shift_count;
 #line 425 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													if (_tmp211_ == 0) {
-#line 3368 "book.c"
-														gint _tmp212_ = 0;
-#line 427 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp212_ = offset;
-#line 427 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														offset = _tmp212_ + 1;
-#line 428 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														mask = 0x80;
-#line 3376 "book.c"
-													}
+													shift_count = _tmp257_ - 2;
+#line 3580 "book.c"
 												}
 											}
 										}
 									}
 								}
 							}
-						} else {
-							gchar* _tmp213_ = NULL;
+						}
+					} 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 _tmp214_ = 0;
-							gint _tmp215_ = 0;
-							gint _tmp216_ = 0;
-							guint8* _tmp217_ = NULL;
+							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"
-							depth = 8;
+							_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"
-							_tmp213_ = g_strdup ("DeviceGray");
+							_tmp264_ = data_length;
 #line 436 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_g_free0 (color_space);
+							_tmp265_ = g_new0 (guint8, _tmp264_);
 #line 436 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							color_space = _tmp213_;
-#line 437 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp214_ = height;
-#line 437 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp215_ = width;
-#line 437 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							data_length = _tmp214_ * _tmp215_;
-#line 438 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp216_ = data_length;
-#line 438 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp217_ = g_new0 (guint8, _tmp216_);
-#line 438 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							data = (g_free (data), NULL);
-#line 438 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							data = _tmp217_;
-#line 438 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							data_length1 = _tmp216_;
-#line 438 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#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 3417 "book.c"
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							offset = 0;
+#line 3639 "book.c"
 							{
 								gint row = 0;
-#line 439 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 								row = 0;
-#line 3422 "book.c"
+#line 3644 "book.c"
 								{
-									gboolean _tmp218_ = FALSE;
-#line 439 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									_tmp218_ = TRUE;
-#line 439 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+									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 3429 "book.c"
-										gint _tmp220_ = 0;
-										gint _tmp221_ = 0;
+#line 3651 "book.c"
+										gint _tmp268_ = 0;
+										gint _tmp269_ = 0;
+										gint _tmp270_ = 0;
 										gint in_offset = 0;
-										gint _tmp222_ = 0;
-										GdkPixbuf* _tmp223_ = NULL;
-										gint _tmp224_ = 0;
-										gint _tmp225_ = 0;
-										gint out_offset = 0;
-										gint _tmp226_ = 0;
-										gint _tmp227_ = 0;
-#line 439 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										if (!_tmp218_) {
-#line 3442 "book.c"
-											gint _tmp219_ = 0;
-#line 439 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp219_ = row;
-#line 439 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											row = _tmp219_ + 1;
-#line 3448 "book.c"
+										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 439 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp218_ = FALSE;
-#line 439 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp220_ = row;
-#line 439 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp221_ = height;
-#line 439 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										if (!(_tmp220_ < _tmp221_)) {
-#line 439 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#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 3460 "book.c"
+#line 3680 "book.c"
 										}
 #line 441 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp222_ = row;
-#line 441 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp223_ = image;
-#line 441 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp224_ = gdk_pixbuf_get_rowstride (_tmp223_);
+										_tmp270_ = mask;
 #line 441 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp225_ = _tmp224_;
-#line 441 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										in_offset = _tmp222_ * _tmp225_;
-#line 442 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp226_ = row;
-#line 442 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp227_ = width;
-#line 442 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										out_offset = _tmp226_ * _tmp227_;
-#line 3478 "book.c"
+										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 443 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 448 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											x = 0;
-#line 3483 "book.c"
+#line 3711 "book.c"
 											{
-												gboolean _tmp228_ = FALSE;
-#line 443 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp228_ = TRUE;
-#line 443 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+												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 3490 "book.c"
-													gint _tmp230_ = 0;
-													gint _tmp231_ = 0;
-													guint8* _tmp232_ = NULL;
-													gint _tmp232__length1 = 0;
-													gint _tmp233_ = 0;
-													gint _tmp234_ = 0;
-													guint8* _tmp235_ = NULL;
-													gint _tmp235__length1 = 0;
-													gint _tmp236_ = 0;
-													gint _tmp237_ = 0;
-													guint8 _tmp238_ = 0U;
-													guint8 _tmp239_ = 0U;
-#line 443 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													if (!_tmp228_) {
-#line 3505 "book.c"
-														gint _tmp229_ = 0;
-#line 443 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp229_ = x;
-#line 443 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														x = _tmp229_ + 1;
-#line 3511 "book.c"
+#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 443 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp228_ = FALSE;
-#line 443 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp230_ = x;
-#line 443 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp231_ = width;
-#line 443 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													if (!(_tmp230_ < _tmp231_)) {
-#line 443 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#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 3523 "book.c"
+#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 444 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp232_ = data;
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp232__length1 = data_length1;
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp233_ = out_offset;
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp234_ = x;
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp235_ = pixels;
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp235__length1 = pixels_length1;
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp236_ = in_offset;
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp237_ = x;
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp238_ = _tmp235_[_tmp236_ + (_tmp237_ * 3)];
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp232_[_tmp233_ + _tmp234_] = _tmp238_;
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp239_ = _tmp232_[_tmp233_ + _tmp234_];
-#line 3547 "book.c"
-												}
-											}
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-#line 449 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp240_ = data;
-#line 449 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp240__length1 = data_length1;
-#line 449 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp242_ = book_compress_zlib (self, _tmp240_, _tmp240__length1, &_tmp241_);
-#line 449 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				compressed_data = _tmp242_;
-#line 449 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				compressed_data_length1 = _tmp241_;
-#line 449 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_compressed_data_size_ = compressed_data_length1;
-#line 450 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp243_ = compressed_data;
-#line 450 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp243__length1 = compressed_data_length1;
-#line 450 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (_tmp243_ != NULL) {
-#line 3575 "book.c"
-					gint _tmp244_ = 0;
-					const gchar* _tmp257_ = NULL;
-#line 453 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp244_ = depth;
-#line 453 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					if (_tmp244_ > 1) {
-#line 3582 "book.c"
-						guint8* jpeg_data = NULL;
-						GdkPixbuf* _tmp245_ = NULL;
-						gint _tmp246_ = 0;
-						Page* _tmp247_ = NULL;
-						gint _tmp248_ = 0;
-						gint _tmp249_ = 0;
-						gint _tmp250_ = 0;
-						guint8* _tmp251_ = NULL;
-						gint jpeg_data_length1 = 0;
-						gint _jpeg_data_size_ = 0;
-						guint8* _tmp252_ = NULL;
-						gint _tmp252__length1 = 0;
-						guint8* _tmp253_ = NULL;
-						gint _tmp253__length1 = 0;
-#line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp245_ = image;
-#line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp246_ = quality;
-#line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp247_ = page;
 #line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp248_ = page_get_dpi (_tmp247_);
+													_tmp284_ = pixels;
 #line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp249_ = _tmp248_;
+													_tmp284__length1 = pixels_length1;
 #line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp251_ = book_compress_jpeg (self, _tmp245_, _tmp246_, _tmp249_, &_tmp250_);
+													_tmp285_ = in_offset;
 #line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						jpeg_data = _tmp251_;
+													_tmp286_ = x;
 #line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						jpeg_data_length1 = _tmp250_;
+													_tmp287_ = _tmp284_[_tmp285_ + (_tmp286_ * 3)];
 #line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_jpeg_data_size_ = jpeg_data_length1;
+													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"
-						_tmp252_ = jpeg_data;
+														_tmp288_ = data;
 #line 456 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp252__length1 = jpeg_data_length1;
+														_tmp288__length1 = data_length1;
 #line 456 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp253_ = compressed_data;
+														_tmp289_ = offset;
 #line 456 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp253__length1 = compressed_data_length1;
+														_tmp290_ = mask;
 #line 456 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						if (_tmp252__length1 < _tmp253__length1) {
-#line 3625 "book.c"
-							gchar* _tmp254_ = NULL;
-							guint8* _tmp255_ = NULL;
-							gint _tmp255__length1 = 0;
-							guint8* _tmp256_ = NULL;
-							gint _tmp256__length1 = 0;
-#line 458 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp254_ = g_strdup ("DCTDecode");
-#line 458 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_g_free0 (filter);
-#line 458 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							filter = _tmp254_;
-#line 459 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp255_ = jpeg_data;
-#line 459 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp255__length1 = jpeg_data_length1;
-#line 459 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp256_ = (_tmp255_ != NULL) ? _vala_array_dup1 (_tmp255_, _tmp255__length1) : ((gpointer) _tmp255_);
-#line 459 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp256__length1 = _tmp255__length1;
-#line 459 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							data = (g_free (data), NULL);
-#line 459 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							data = _tmp256_;
+														_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"
-							data_length1 = _tmp256__length1;
+													_tmp292_ = mask;
 #line 459 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_data_size_ = data_length1;
-#line 3653 "book.c"
-						}
-#line 453 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						jpeg_data = (g_free (jpeg_data), NULL);
-#line 3657 "book.c"
-					}
+													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"
-					_tmp257_ = filter;
-#line 463 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					if (_tmp257_ == NULL) {
-#line 3663 "book.c"
-						gchar* _tmp258_ = NULL;
-						guint8* _tmp259_ = NULL;
-						gint _tmp259__length1 = 0;
-						guint8* _tmp260_ = NULL;
-						gint _tmp260__length1 = 0;
-#line 465 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp258_ = g_strdup ("FlateDecode");
-#line 465 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_g_free0 (filter);
-#line 465 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						filter = _tmp258_;
-#line 466 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp259_ = compressed_data;
-#line 466 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp259__length1 = compressed_data_length1;
-#line 466 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp260_ = (_tmp259_ != NULL) ? _vala_array_dup2 (_tmp259_, _tmp259__length1) : ((gpointer) _tmp259_);
-#line 466 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp260__length1 = _tmp259__length1;
-#line 466 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						data = (g_free (data), NULL);
-#line 466 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						data = _tmp260_;
-#line 466 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						data_length1 = _tmp260__length1;
-#line 466 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_data_size_ = data_length1;
-#line 3691 "book.c"
-					}
-				}
+														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"
-				_tmp261_ = writer;
+							_tmp295_ = g_strdup ("DeviceGray");
 #line 471 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp261_, "\n");
+							_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"
-				_tmp262_ = writer;
+							_tmp296_ = height;
 #line 472 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp263_ = pdf_writer_start_object (_tmp262_);
+							_tmp297_ = width;
 #line 472 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				number = _tmp263_;
+							data_length = _tmp296_ * _tmp297_;
 #line 473 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp264_ = writer;
+							_tmp298_ = data_length;
 #line 473 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp265_ = number;
+							_tmp299_ = g_new0 (guint8, _tmp298_);
 #line 473 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp266_ = g_strdup_printf ("%u 0 obj\n", _tmp265_);
+							data = (g_free (data), NULL);
 #line 473 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp267_ = _tmp266_;
+							data = _tmp299_;
 #line 473 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp264_, _tmp267_);
+							data_length1 = _tmp298_;
 #line 473 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp267_);
+							_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"
-				_tmp268_ = writer;
+									_tmp300_ = TRUE;
 #line 474 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp268_, "<<\n");
-#line 475 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp269_ = writer;
-#line 475 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp269_, "/Type /Page\n");
-#line 476 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp270_ = writer;
+									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"
-				_tmp271_ = pages_number;
+										_tmp304_ = row;
 #line 476 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp272_ = g_strdup_printf ("/Parent %u 0 R\n", _tmp271_);
+										_tmp305_ = image;
 #line 476 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp273_ = _tmp272_;
+										_tmp306_ = gdk_pixbuf_get_rowstride (_tmp305_);
 #line 476 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp270_, _tmp273_);
+										_tmp307_ = _tmp306_;
 #line 476 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp273_);
+										in_offset = _tmp304_ * _tmp307_;
 #line 477 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp274_ = writer;
+										_tmp308_ = row;
 #line 477 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp275_ = i;
+										_tmp309_ = width;
 #line 477 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp276_ = number;
-#line 477 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp277_ = g_strdup_printf ("/Resources << /XObject << /Im%d %u 0 R >> >>\n", _tmp275_, _tmp276_ + 1);
-#line 477 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp278_ = _tmp277_;
-#line 477 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp274_, _tmp278_);
-#line 477 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp278_);
-#line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp279_ = writer;
-#line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp280_ = page_width;
+										out_offset = _tmp308_ * _tmp309_;
+#line 3922 "book.c"
+										{
+											gint x = 0;
 #line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp281_ = width_buffer;
+											x = 0;
+#line 3927 "book.c"
+											{
+												gboolean _tmp310_ = FALSE;
 #line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp281__length1 = width_buffer_length1;
+												_tmp310_ = TRUE;
 #line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp282_ = g_ascii_formatd (_tmp281_, _tmp281__length1, "%.2f", _tmp280_);
+												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"
-				_tmp283_ = page_height;
+													if (!_tmp310_) {
+#line 3949 "book.c"
+														gint _tmp311_ = 0;
 #line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp284_ = height_buffer;
+														_tmp311_ = x;
 #line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp284__length1 = height_buffer_length1;
+														x = _tmp311_ + 1;
+#line 3955 "book.c"
+													}
 #line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp285_ = g_ascii_formatd (_tmp284_, _tmp284__length1, "%.2f", _tmp283_);
+													_tmp310_ = FALSE;
 #line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp286_ = g_strdup_printf ("/MediaBox [ 0 0 %s %s ]\n", _tmp282_, _tmp285_);
+													_tmp312_ = x;
 #line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp287_ = _tmp286_;
+													_tmp313_ = width;
 #line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp279_, _tmp287_);
+													if (!(_tmp312_ < _tmp313_)) {
 #line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp287_);
+														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"
-				_tmp288_ = writer;
+													_tmp314__length1 = data_length1;
 #line 479 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp289_ = number;
+													_tmp315_ = out_offset;
 #line 479 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp290_ = g_strdup_printf ("/Contents %u 0 R\n", _tmp289_ + 2);
+													_tmp316_ = x;
 #line 479 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp291_ = _tmp290_;
+													_tmp317_ = pixels;
 #line 479 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp288_, _tmp291_);
+													_tmp317__length1 = pixels_length1;
 #line 479 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp291_);
-#line 480 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp292_ = writer;
-#line 480 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp292_, ">>\n");
-#line 481 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp293_ = writer;
-#line 481 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp293_, "endobj\n");
+													_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"
-				_tmp294_ = writer;
+				compressed_data = _tmp324_;
 #line 484 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp294_, "\n");
+				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"
-				_tmp295_ = writer;
+				_tmp325_ = compressed_data;
 #line 485 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp296_ = pdf_writer_start_object (_tmp295_);
+				_tmp325__length1 = compressed_data_length1;
 #line 485 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				number = _tmp296_;
-#line 486 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp297_ = writer;
-#line 486 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp298_ = number;
-#line 486 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp299_ = g_strdup_printf ("%u 0 obj\n", _tmp298_);
-#line 486 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp300_ = _tmp299_;
-#line 486 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp297_, _tmp300_);
-#line 486 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp300_);
-#line 487 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp301_ = writer;
-#line 487 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp301_, "<<\n");
+				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"
-				_tmp302_ = writer;
+					_tmp326_ = depth;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp302_, "/Type /XObject\n");
-#line 489 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp303_ = writer;
-#line 489 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp303_, "/Subtype /Image\n");
+					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"
-				_tmp304_ = writer;
+						_tmp327_ = image;
 #line 490 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp305_ = width;
+						_tmp328_ = quality;
 #line 490 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp306_ = g_strdup_printf ("/Width %d\n", _tmp305_);
+						_tmp329_ = page;
 #line 490 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp307_ = _tmp306_;
+						_tmp330_ = page_get_dpi (_tmp329_);
 #line 490 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp304_, _tmp307_);
+						_tmp331_ = _tmp330_;
 #line 490 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp307_);
-#line 491 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp308_ = writer;
+						_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"
-				_tmp309_ = height;
+						_tmp334_ = jpeg_data;
 #line 491 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp310_ = g_strdup_printf ("/Height %d\n", _tmp309_);
+						_tmp334__length1 = jpeg_data_length1;
 #line 491 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp311_ = _tmp310_;
+						_tmp335_ = compressed_data;
 #line 491 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp308_, _tmp311_);
+						_tmp335__length1 = compressed_data_length1;
 #line 491 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp311_);
-#line 492 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp312_ = writer;
-#line 492 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp313_ = color_space;
-#line 492 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp314_ = g_strdup_printf ("/ColorSpace /%s\n", _tmp313_);
-#line 492 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp315_ = _tmp314_;
-#line 492 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp312_, _tmp315_);
-#line 492 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp315_);
+						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"
-				_tmp316_ = writer;
+							_tmp336_ = g_strdup ("DCTDecode");
 #line 493 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp317_ = depth;
-#line 493 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp318_ = g_strdup_printf ("/BitsPerComponent %d\n", _tmp317_);
-#line 493 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp319_ = _tmp318_;
-#line 493 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp316_, _tmp319_);
+							_g_free0 (filter);
 #line 493 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp319_);
+							filter = _tmp336_;
 #line 494 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp320_ = writer;
+							_tmp337_ = jpeg_data;
 #line 494 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp321_ = data;
+							_tmp337__length1 = jpeg_data_length1;
 #line 494 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp321__length1 = data_length1;
+							_tmp338_ = (_tmp337_ != NULL) ? _vala_array_dup1 (_tmp337_, _tmp337__length1) : ((gpointer) _tmp337_);
 #line 494 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp322_ = g_strdup_printf ("/Length %d\n", _tmp321__length1);
+							_tmp338__length1 = _tmp337__length1;
 #line 494 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp323_ = _tmp322_;
+							data = (g_free (data), NULL);
 #line 494 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp320_, _tmp323_);
+							data = _tmp338_;
 #line 494 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp323_);
-#line 495 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp324_ = filter;
-#line 495 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (_tmp324_ != NULL) {
-#line 3896 "book.c"
-					PDFWriter* _tmp325_ = NULL;
-					const gchar* _tmp326_ = NULL;
-					gchar* _tmp327_ = NULL;
-					gchar* _tmp328_ = NULL;
-#line 496 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp325_ = writer;
-#line 496 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp326_ = filter;
-#line 496 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp327_ = g_strdup_printf ("/Filter /%s\n", _tmp326_);
-#line 496 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp328_ = _tmp327_;
-#line 496 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					pdf_writer_write_string (_tmp325_, _tmp328_);
-#line 496 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_g_free0 (_tmp328_);
-#line 3913 "book.c"
-				}
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp329_ = writer;
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp329_, ">>\n");
+							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"
-				_tmp330_ = writer;
+					_tmp339_ = filter;
 #line 498 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp330_, "stream\n");
-#line 499 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp331_ = writer;
-#line 499 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp332_ = data;
-#line 499 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp332__length1 = data_length1;
-#line 499 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write (_tmp331_, _tmp332_, _tmp332__length1);
+					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"
-				_tmp333_ = writer;
+						_tmp340_ = g_strdup ("FlateDecode");
 #line 500 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp333_, "\n");
+						_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"
-				_tmp334_ = writer;
+						_tmp341__length1 = compressed_data_length1;
 #line 501 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp334_, "endstream\n");
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp335_ = writer;
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp335_, "endobj\n");
-#line 505 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp336_ = page_width;
-#line 505 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp337_ = width_buffer;
-#line 505 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp337__length1 = width_buffer_length1;
-#line 505 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp338_ = g_ascii_formatd (_tmp337_, _tmp337__length1, "%f", _tmp336_);
-#line 505 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp339_ = page_height;
-#line 505 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp340_ = height_buffer;
-#line 505 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp340__length1 = height_buffer_length1;
-#line 505 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp341_ = g_ascii_formatd (_tmp340_, _tmp340__length1, "%f", _tmp339_);
-#line 505 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp342_ = i;
-#line 505 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp343_ = g_strdup_printf ("q\n%s 0 0 %s 0 0 cm\n/Im%d Do\nQ", _tmp338_, _tmp341_, _tmp342_);
-#line 505 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				command = _tmp343_;
+						_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"
-				_tmp344_ = writer;
+				_tmp343_ = writer;
 #line 506 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp344_, "\n");
+				pdf_writer_write_string (_tmp343_, "\n");
 #line 507 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp345_ = writer;
+				_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_ = pdf_writer_start_object (_tmp345_);
+				_tmp346_ = i;
 #line 507 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				number = _tmp346_;
+				_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"
-				_tmp347_ = writer;
+				_tmp349__length1 = page_numbers_length1;
 #line 508 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp348_ = number;
+				_tmp350_ = i;
 #line 508 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp349_ = g_strdup_printf ("%u 0 obj\n", _tmp348_);
+				_tmp351_ = _tmp349_[_tmp350_];
 #line 508 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp350_ = _tmp349_;
+				_tmp352_ = g_strdup_printf ("%u 0 obj\n", _tmp351_);
 #line 508 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp347_, _tmp350_);
+				_tmp353_ = _tmp352_;
 #line 508 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp350_);
+				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"
-				_tmp351_ = writer;
+				_tmp354_ = writer;
 #line 509 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp351_, "<<\n");
-#line 510 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp352_ = writer;
-#line 510 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp353_ = command;
-#line 510 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp354_ = strlen (_tmp353_);
-#line 510 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp355_ = _tmp354_;
+				pdf_writer_write_string (_tmp354_, "<<\n");
 #line 510 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp356_ = g_strdup_printf ("/Length %d\n", _tmp355_);
+				_tmp355_ = writer;
 #line 510 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp357_ = _tmp356_;
-#line 510 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp352_, _tmp357_);
-#line 510 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp357_);
+				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"
-				_tmp358_ = writer;
+				_tmp359_ = _tmp358_;
 #line 511 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp358_, ">>\n");
+				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"
-				_tmp359_ = writer;
+				_tmp362__length1 = page_image_numbers_length1;
 #line 512 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp359_, "stream\n");
+				_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"
-				_tmp360_ = writer;
+				_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"
-				_tmp361_ = command;
+				_tmp371_ = page_height;
 #line 513 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp360_, _tmp361_);
+				_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"
-				_tmp362_ = writer;
+				_tmp379_ = _tmp377_[_tmp378_];
 #line 514 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp362_, "\n");
+				_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"
-				_tmp363_ = writer;
+				_tmp382_ = writer;
 #line 515 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp363_, "endstream\n");
+				pdf_writer_write_string (_tmp382_, ">>\n");
 #line 516 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp364_ = writer;
+				_tmp383_ = writer;
 #line 516 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp364_, "endobj\n");
-#line 518 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp365_ = i;
-#line 518 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				g_signal_emit_by_name (self, "saving", _tmp365_);
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (command);
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				compressed_data = (g_free (compressed_data), NULL);
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				data = (g_free (data), NULL);
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				height_buffer = (g_free (height_buffer), NULL);
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				width_buffer = (g_free (width_buffer), NULL);
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (filter);
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (color_space);
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_object_unref0 (image);
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_page_unref0 (page);
-#line 4055 "book.c"
-			}
-		}
-	}
+				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"
-	_tmp366_ = writer;
+				_tmp395_ = writer;
 #line 522 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp366_, "\n");
+				pdf_writer_write_string (_tmp395_, "<<\n");
 #line 523 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp367_ = writer;
+				_tmp396_ = writer;
 #line 523 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp368_ = pdf_writer_start_object (_tmp367_);
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	info_number = _tmp368_;
-#line 524 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp369_ = writer;
-#line 524 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp370_ = info_number;
-#line 524 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp371_ = g_strdup_printf ("%u 0 obj\n", _tmp370_);
-#line 524 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp372_ = _tmp371_;
+				pdf_writer_write_string (_tmp396_, "/Type /XObject\n");
 #line 524 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp369_, _tmp372_);
+				_tmp397_ = writer;
 #line 524 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp372_);
+				pdf_writer_write_string (_tmp397_, "/Subtype /Image\n");
 #line 525 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp373_ = writer;
+				_tmp398_ = writer;
 #line 525 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp373_, "<<\n");
+				_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"
-	_tmp374_ = writer;
+				_tmp403_ = height;
 #line 526 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp375_ = g_strdup_printf ("/Creator (Simple Scan %s)\n", VERSION);
+				_tmp404_ = g_strdup_printf ("/Height %d\n", _tmp403_);
 #line 526 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp376_ = _tmp375_;
+				_tmp405_ = _tmp404_;
 #line 526 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp374_, _tmp376_);
+				pdf_writer_write_string (_tmp402_, _tmp405_);
 #line 526 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp376_);
+				_g_free0 (_tmp405_);
 #line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp377_ = writer;
+				_tmp406_ = writer;
 #line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp377_, ">>\n");
+				_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"
-	_tmp378_ = writer;
+				_tmp411_ = depth;
 #line 528 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp378_, "endobj\n");
+				_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"
-	_tmp379_ = writer;
+					_tmp419_ = writer;
 #line 531 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp379_, "\n");
-#line 532 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp380_ = writer;
+					_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"
-	_tmp381_ = _tmp380_->offset;
+				_tmp423_ = writer;
 #line 532 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	xref_offset = _tmp381_;
+				pdf_writer_write_string (_tmp423_, ">>\n");
 #line 533 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp382_ = writer;
+				_tmp424_ = writer;
 #line 533 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp382_, "xref\n");
-#line 534 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp383_ = writer;
+				pdf_writer_write_string (_tmp424_, "stream\n");
 #line 534 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp384_ = writer;
+				_tmp425_ = writer;
 #line 534 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp385_ = _tmp384_->object_offsets;
+				_tmp426_ = data;
 #line 534 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp386_ = g_list_length (_tmp385_);
+				_tmp426__length1 = data_length1;
 #line 534 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp387_ = g_strdup_printf ("0 %zu\n", (gsize) (_tmp386_ + 1));
-#line 534 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp388_ = _tmp387_;
-#line 534 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp383_, _tmp388_);
-#line 534 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp388_);
+				pdf_writer_write (_tmp425_, _tmp426_, _tmp426__length1);
 #line 535 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp389_ = writer;
+				_tmp427_ = writer;
 #line 535 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp389_, "0000000000 65535 f \n");
-#line 536 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp390_ = writer;
-#line 536 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp391_ = _tmp390_->object_offsets;
-#line 4141 "book.c"
-	{
-		GList* offset_collection = NULL;
-		GList* offset_it = NULL;
+				pdf_writer_write_string (_tmp427_, "\n");
 #line 536 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		offset_collection = _tmp391_;
+				_tmp428_ = writer;
 #line 536 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		for (offset_it = offset_collection; offset_it != NULL; offset_it = offset_it->next) {
-#line 4149 "book.c"
-			guint offset = 0U;
-#line 536 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-			offset = (guint) ((guintptr) offset_it->data);
-#line 4153 "book.c"
-			{
-				PDFWriter* _tmp392_ = NULL;
-				guint _tmp393_ = 0U;
-				gchar* _tmp394_ = NULL;
-				gchar* _tmp395_ = NULL;
-#line 537 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp392_ = writer;
-#line 537 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp393_ = offset;
+				pdf_writer_write_string (_tmp428_, "endstream\n");
 #line 537 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp394_ = g_strdup_printf ("%010zu 00000 n \n", (gsize) _tmp393_);
+				_tmp429_ = writer;
 #line 537 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp395_ = _tmp394_;
-#line 537 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp392_, _tmp395_);
-#line 537 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp395_);
-#line 4171 "book.c"
-			}
-		}
-	}
+				pdf_writer_write_string (_tmp429_, "endobj\n");
 #line 540 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp396_ = writer;
+				_tmp430_ = writer;
 #line 540 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp396_, "\n");
+				pdf_writer_write_string (_tmp430_, "\n");
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp397_ = writer;
+				_tmp431_ = writer;
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp397_, "trailer\n");
+				_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"
-	_tmp398_ = writer;
+				_tmp433_ = writer;
 #line 542 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp398_, "<<\n");
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp399_ = writer;
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp400_ = writer;
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp401_ = _tmp400_->object_offsets;
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp402_ = g_list_length (_tmp401_);
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp403_ = g_strdup_printf ("/Size %zu\n", (gsize) (_tmp402_ + 1));
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp404_ = _tmp403_;
+				_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"
-	pdf_writer_write_string (_tmp399_, _tmp404_);
+				_tmp437_ = writer;
 #line 543 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp404_);
-#line 544 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp405_ = writer;
-#line 544 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp406_ = info_number;
-#line 544 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp407_ = g_strdup_printf ("/Info %u 0 R\n", _tmp406_);
-#line 544 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp408_ = _tmp407_;
+				pdf_writer_write_string (_tmp437_, "<<\n");
 #line 544 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp405_, _tmp408_);
+				_tmp438_ = writer;
 #line 544 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp408_);
+				pdf_writer_write_string (_tmp438_, "/Type /StructTreeRoot\n");
 #line 545 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp409_ = writer;
+				_tmp439_ = writer;
 #line 545 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp410_ = catalog_number;
-#line 545 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp411_ = g_strdup_printf ("/Root %u 0 R\n", _tmp410_);
-#line 545 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp412_ = _tmp411_;
-#line 545 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp409_, _tmp412_);
-#line 545 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp412_);
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp413_ = writer;
+				pdf_writer_write_string (_tmp439_, ">>\n");
 #line 546 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp414_ = id;
+				_tmp440_ = writer;
 #line 546 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp415_ = id;
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp416_ = g_strdup_printf ("/ID [<%s> <%s>]\n", _tmp414_, _tmp415_);
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp417_ = _tmp416_;
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp413_, _tmp417_);
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp417_);
-#line 547 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp418_ = writer;
-#line 547 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp418_, ">>\n");
-#line 548 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp419_ = writer;
-#line 548 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp419_, "startxref\n");
+				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"
-	_tmp420_ = writer;
+				_tmp442_ = width_buffer;
 #line 549 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp421_ = xref_offset;
+				_tmp442__length1 = width_buffer_length1;
 #line 549 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp422_ = g_strdup_printf ("%zu\n", _tmp421_);
+				_tmp443_ = g_ascii_formatd (_tmp442_, _tmp442__length1, "%f", _tmp441_);
 #line 549 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp423_ = _tmp422_;
+				_tmp444_ = page_height;
 #line 549 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp420_, _tmp423_);
+				_tmp445_ = height_buffer;
 #line 549 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp423_);
+				_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"
-	_tmp424_ = writer;
+				_tmp449_ = writer;
 #line 550 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp424_, "%%EOF\n");
+				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 4271 "book.c"
+#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"
 }
 
 
@@ -4275,110 +5009,110 @@ void book_save (Book* self, const gchar* type, gint quality, GFile* file, GError
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	GQuark _tmp3_ = 0U;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	static GQuark _tmp2_label0 = 0;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	static GQuark _tmp2_label1 = 0;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	static GQuark _tmp2_label2 = 0;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	static GQuark _tmp2_label3 = 0;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	static GQuark _tmp2_label4 = 0;
-#line 4289 "book.c"
+#line 5009 "book.c"
 	GError * _inner_error_ = NULL;
-#line 553 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (self != NULL);
-#line 553 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (type != NULL);
-#line 553 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (file != NULL);
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = type;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = _tmp0_;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp3_ = (NULL == _tmp1_) ? 0 : g_quark_from_string (_tmp1_);
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#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 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		switch (0) {
-#line 4307 "book.c"
+#line 5027 "book.c"
 			default:
 			{
 				const gchar* _tmp4_ = NULL;
 				gint _tmp5_ = 0;
 				GFile* _tmp6_ = NULL;
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp4_ = type;
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp5_ = quality;
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp6_ = file;
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				book_save_multi_file (self, _tmp4_, _tmp5_, _tmp6_, &_inner_error_);
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					g_propagate_error (error, _inner_error_);
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					return;
-#line 4327 "book.c"
+#line 5047 "book.c"
 				}
-#line 561 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 616 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				break;
-#line 4331 "book.c"
+#line 5051 "book.c"
 			}
 		}
 	} else if (_tmp3_ == ((0 != _tmp2_label3) ? _tmp2_label3 : (_tmp2_label3 = g_quark_from_static_string ("ps")))) {
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		switch (0) {
-#line 4337 "book.c"
+#line 5057 "book.c"
 			default:
 			{
 				GFile* _tmp7_ = NULL;
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp7_ = file;
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				book_save_ps (self, _tmp7_, &_inner_error_);
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					g_propagate_error (error, _inner_error_);
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					return;
-#line 4351 "book.c"
+#line 5071 "book.c"
 				}
-#line 564 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 619 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				break;
-#line 4355 "book.c"
+#line 5075 "book.c"
 			}
 		}
 	} else if (_tmp3_ == ((0 != _tmp2_label4) ? _tmp2_label4 : (_tmp2_label4 = g_quark_from_static_string ("pdf")))) {
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		switch (0) {
-#line 4361 "book.c"
+#line 5081 "book.c"
 			default:
 			{
 				GFile* _tmp8_ = NULL;
 				gint _tmp9_ = 0;
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp8_ = file;
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp9_ = quality;
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				book_save_pdf (self, _tmp8_, _tmp9_, &_inner_error_);
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					g_propagate_error (error, _inner_error_);
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					return;
-#line 4378 "book.c"
+#line 5098 "book.c"
 				}
-#line 567 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 622 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				break;
-#line 4382 "book.c"
+#line 5102 "book.c"
 			}
 		}
 	}
@@ -4399,7 +5133,7 @@ guint book_get_n_pages (Book* self) {
 	result = _tmp1_;
 #line 16 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
-#line 4403 "book.c"
+#line 5123 "book.c"
 }
 
 
@@ -4414,7 +5148,7 @@ gboolean book_get_needs_saving (Book* self) {
 	result = _tmp0_;
 #line 21 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
-#line 4418 "book.c"
+#line 5138 "book.c"
 }
 
 
@@ -4432,7 +5166,7 @@ void book_set_needs_saving (Book* self, gboolean value) {
 	if (_tmp0_ == _tmp1_) {
 #line 25 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return;
-#line 4436 "book.c"
+#line 5156 "book.c"
 	}
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2_ = value;
@@ -4440,7 +5174,7 @@ void book_set_needs_saving (Book* self, gboolean value) {
 	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 4444 "book.c"
+#line 5164 "book.c"
 }
 
 
@@ -4459,26 +5193,26 @@ static void g_cclosure_user_marshal_VOID__PAGE (GClosure * closure, GValue * ret
 		data1 = closure->data;
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 4463 "book.c"
+#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 4469 "book.c"
+#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 4475 "book.c"
+#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 4482 "book.c"
+#line 5202 "book.c"
 }
 
 
@@ -4487,7 +5221,7 @@ static void value_book_free_value (GValue* value) {
 	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 4491 "book.c"
+#line 5211 "book.c"
 	}
 }
 
@@ -4497,11 +5231,11 @@ static void value_book_copy_value (const GValue* src_value, GValue* dest_value)
 	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 4501 "book.c"
+#line 5221 "book.c"
 	} else {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4505 "book.c"
+#line 5225 "book.c"
 	}
 }
 
@@ -4509,37 +5243,37 @@ static void value_book_copy_value (const GValue* src_value, GValue* dest_value)
 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 4513 "book.c"
+#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 4520 "book.c"
+#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 4527 "book.c"
+#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 4531 "book.c"
+#line 5251 "book.c"
 		}
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = book_ref (object);
-#line 4535 "book.c"
+#line 5255 "book.c"
 	} else {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
-#line 4539 "book.c"
+#line 5259 "book.c"
 	}
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return NULL;
-#line 4543 "book.c"
+#line 5263 "book.c"
 }
 
 
@@ -4550,25 +5284,25 @@ static gchar* value_book_lcopy_value (const GValue* value, guint n_collect_value
 	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 4554 "book.c"
+#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 4560 "book.c"
+#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 4564 "book.c"
+#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 4568 "book.c"
+#line 5288 "book.c"
 	}
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return NULL;
-#line 4572 "book.c"
+#line 5292 "book.c"
 }
 
 
@@ -4582,7 +5316,7 @@ GParamSpec* param_spec_book (const gchar* name, const gchar* nick, const gchar*
 	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 4586 "book.c"
+#line 5306 "book.c"
 }
 
 
@@ -4591,7 +5325,7 @@ gpointer value_get_book (const GValue* value) {
 	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 4595 "book.c"
+#line 5315 "book.c"
 }
 
 
@@ -4611,17 +5345,17 @@ void value_set_book (GValue* value, gpointer v_object) {
 		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 4615 "book.c"
+#line 5335 "book.c"
 	} else {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
-#line 4619 "book.c"
+#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 4625 "book.c"
+#line 5345 "book.c"
 	}
 }
 
@@ -4640,17 +5374,17 @@ void value_take_book (GValue* value, gpointer v_object) {
 		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 4644 "book.c"
+#line 5364 "book.c"
 	} else {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
-#line 4648 "book.c"
+#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 4654 "book.c"
+#line 5374 "book.c"
 	}
 }
 
@@ -4674,7 +5408,7 @@ static void book_class_init (BookClass * klass) {
 	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 4678 "book.c"
+#line 5398 "book.c"
 }
 
 
@@ -4683,7 +5417,7 @@ static void book_instance_init (Book * self) {
 	self->priv = BOOK_GET_PRIVATE (self);
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->ref_count = 1;
-#line 4687 "book.c"
+#line 5407 "book.c"
 }
 
 
@@ -4696,7 +5430,7 @@ static void book_finalize (Book* obj) {
 	g_signal_handlers_destroy (self);
 #line 45 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = self->priv->pages;
-#line 4700 "book.c"
+#line 5420 "book.c"
 	{
 		GList* page_collection = NULL;
 		GList* page_it = NULL;
@@ -4704,14 +5438,14 @@ static void book_finalize (Book* obj) {
 		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 4708 "book.c"
+#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 4715 "book.c"
+#line 5435 "book.c"
 			{
 				Page* _tmp2_ = NULL;
 				guint _tmp3_ = 0U;
@@ -4731,7 +5465,7 @@ static void book_finalize (Book* obj) {
 				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 4735 "book.c"
+#line 5455 "book.c"
 			}
 		}
 	}
@@ -4739,7 +5473,7 @@ static void book_finalize (Book* obj) {
 	__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 4743 "book.c"
+#line 5463 "book.c"
 }
 
 
@@ -4764,7 +5498,7 @@ gpointer book_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return instance;
-#line 4768 "book.c"
+#line 5488 "book.c"
 }
 
 
@@ -4777,15 +5511,15 @@ void book_unref (gpointer instance) {
 		BOOK_GET_CLASS (self)->finalize (self);
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 4781 "book.c"
+#line 5501 "book.c"
 	}
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 580 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 635 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 4789 "book.c"
+#line 5509 "book.c"
 }
 
 
@@ -4793,28 +5527,39 @@ PDFWriter* pdf_writer_construct (GType object_type, GFileOutputStream* stream) {
 	PDFWriter* self = NULL;
 	GFileOutputStream* _tmp0_ = NULL;
 	GFileOutputStream* _tmp1_ = NULL;
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	guint* _tmp2_ = NULL;
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (stream != NULL, NULL);
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self = (PDFWriter*) g_type_create_instance (object_type);
-#line 580 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 635 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = stream;
-#line 580 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 635 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 580 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 635 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_object_unref0 (self->priv->stream);
-#line 580 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 635 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->priv->stream = _tmp1_;
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#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 4811 "book.c"
+#line 5542 "book.c"
 }
 
 
 PDFWriter* pdf_writer_new (GFileOutputStream* stream) {
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return pdf_writer_construct (TYPE_PDF_WRITER, stream);
-#line 4818 "book.c"
+#line 5549 "book.c"
 }
 
 
@@ -4823,24 +5568,24 @@ void pdf_writer_write (PDFWriter* self, guint8* data, int data_length1) {
 	guint8* _tmp5_ = NULL;
 	gint _tmp5__length1 = 0;
 	GError * _inner_error_ = NULL;
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 639 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (self != NULL);
-#line 4829 "book.c"
+#line 5560 "book.c"
 	{
 		GFileOutputStream* _tmp0_ = NULL;
 		guint8* _tmp1_ = NULL;
 		gint _tmp1__length1 = 0;
-#line 587 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp0_ = self->priv->stream;
-#line 587 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp1_ = data;
-#line 587 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp1__length1 = data_length1;
-#line 587 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#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 587 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4844 "book.c"
+#line 5575 "book.c"
 			goto __catch1_g_error;
 		}
 	}
@@ -4850,40 +5595,40 @@ void pdf_writer_write (PDFWriter* self, guint8* data, int data_length1) {
 		GError* e = NULL;
 		GError* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		e = _inner_error_;
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_inner_error_ = NULL;
-#line 591 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp2_ = e;
-#line 591 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp3_ = _tmp2_->message;
-#line 591 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		g_warning ("book.vala:591: Error writing PDF: %s", _tmp3_);
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#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 4866 "book.c"
+#line 5597 "book.c"
 	}
 	__finally1:
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#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 585 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_clear_error (&_inner_error_);
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return;
-#line 4877 "book.c"
+#line 5608 "book.c"
 	}
-#line 593 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 649 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp4_ = self->offset;
-#line 593 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 649 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp5_ = data;
-#line 593 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 649 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp5__length1 = data_length1;
-#line 593 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 649 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->offset = _tmp4_ + _tmp5__length1;
-#line 4887 "book.c"
+#line 5618 "book.c"
 }
 
 
@@ -4902,49 +5647,49 @@ static gchar* string_to_utf8 (const gchar* self, int* result_length1) {
 	gint _tmp6_ = 0;
 	gchar* _tmp7_ = NULL;
 	gint _tmp7__length1 = 0;
-#line 1405 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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.32/vapi/glib-2.0.vapi"
+#line 1406 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1406 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1406 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1406 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1406 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = g_new0 (gchar, _tmp1_ + 1);
-#line 1406 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1406 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 1406 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1406 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_result__length1 = _tmp1_ + 1;
-#line 1406 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1406 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	__result__size_ = _result__length1;
-#line 1407 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = _result__length1;
-#line 1407 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_result__length1 = _tmp3_ - 1;
-#line 1408 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1408 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp4_ = _result_;
-#line 1408 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1408 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp4__length1 = _result__length1;
-#line 1408 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1408 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp5_ = strlen (self);
-#line 1408 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1408 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp6_ = _tmp5_;
-#line 1408 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1408 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	memcpy (_tmp4_, self, (gsize) _tmp6_);
-#line 1409 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1409 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp7_ = _result_;
-#line 1409 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1409 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp7__length1 = _result__length1;
-#line 1409 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1409 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (result_length1) {
-#line 1409 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1409 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		*result_length1 = _tmp7__length1;
-#line 4942 "book.c"
+#line 5673 "book.c"
 	}
-#line 1409 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1409 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp7_;
-#line 1409 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1409 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 4948 "book.c"
+#line 5679 "book.c"
 }
 
 
@@ -4954,262 +5699,312 @@ void pdf_writer_write_string (PDFWriter* self, const gchar* text) {
 	gchar* _tmp2_ = NULL;
 	guint8* _tmp3_ = NULL;
 	gint _tmp3__length1 = 0;
-#line 596 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (self != NULL);
-#line 596 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (text != NULL);
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = text;
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2_ = string_to_utf8 (_tmp0_, &_tmp1_);
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp3_ = (guint8*) _tmp2_;
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp3__length1 = (_tmp1_ * sizeof (gchar)) / sizeof (guint8);
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write (self, _tmp3_, (_tmp1_ * sizeof (gchar)) / sizeof (guint8));
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp3_ = (g_free (_tmp3_), NULL);
-#line 4974 "book.c"
+#line 5705 "book.c"
 }
 
 
-guint pdf_writer_start_object (PDFWriter* self) {
+guint pdf_writer_add_object (PDFWriter* self) {
 	guint result = 0U;
-	gsize _tmp0_ = 0UL;
-	GList* _tmp1_ = NULL;
-	guint _tmp2_ = 0U;
-#line 601 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	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 603 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp0_ = self->offset;
-#line 603 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	self->object_offsets = g_list_append (self->object_offsets, (gpointer) ((guintptr) ((guint) _tmp0_)));
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp1_ = self->object_offsets;
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp2_ = g_list_length (_tmp1_);
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	result = _tmp2_;
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#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 4997 "book.c"
+#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 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	value->data[0].v_pointer = NULL;
-#line 5004 "book.c"
+#line 5785 "book.c"
 }
 
 
 static void value_pdf_writer_free_value (GValue* value) {
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (value->data[0].v_pointer) {
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		pdf_writer_unref (value->data[0].v_pointer);
-#line 5013 "book.c"
+#line 5794 "book.c"
 	}
 }
 
 
 static void value_pdf_writer_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (src_value->data[0].v_pointer) {
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#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 5023 "book.c"
+#line 5804 "book.c"
 	} else {
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 5027 "book.c"
+#line 5808 "book.c"
 	}
 }
 
 
 static gpointer value_pdf_writer_peek_pointer (const GValue* value) {
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return value->data[0].v_pointer;
-#line 5035 "book.c"
+#line 5816 "book.c"
 }
 
 
 static gchar* value_pdf_writer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (collect_values[0].v_pointer) {
-#line 5042 "book.c"
+#line 5823 "book.c"
 		PDFWriter* object;
 		object = collect_values[0].v_pointer;
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#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 5049 "book.c"
+#line 5830 "book.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#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 5053 "book.c"
+#line 5834 "book.c"
 		}
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = pdf_writer_ref (object);
-#line 5057 "book.c"
+#line 5838 "book.c"
 	} else {
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
-#line 5061 "book.c"
+#line 5842 "book.c"
 	}
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return NULL;
-#line 5065 "book.c"
+#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 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (!object_p) {
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#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 5076 "book.c"
+#line 5857 "book.c"
 	}
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (!value->data[0].v_pointer) {
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = NULL;
-#line 5082 "book.c"
+#line 5863 "book.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = value->data[0].v_pointer;
-#line 5086 "book.c"
+#line 5867 "book.c"
 	} else {
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = pdf_writer_ref (value->data[0].v_pointer);
-#line 5090 "book.c"
+#line 5871 "book.c"
 	}
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return NULL;
-#line 5094 "book.c"
+#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 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#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 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#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 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return G_PARAM_SPEC (spec);
-#line 5108 "book.c"
+#line 5889 "book.c"
 }
 
 
 gpointer value_get_pdf_writer (const GValue* value) {
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#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 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return value->data[0].v_pointer;
-#line 5117 "book.c"
+#line 5898 "book.c"
 }
 
 
 void value_set_pdf_writer (GValue* value, gpointer v_object) {
 	PDFWriter* old;
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#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 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	old = value->data[0].v_pointer;
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (v_object) {
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#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 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#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 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = v_object;
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		pdf_writer_ref (value->data[0].v_pointer);
-#line 5137 "book.c"
+#line 5918 "book.c"
 	} else {
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
-#line 5141 "book.c"
+#line 5922 "book.c"
 	}
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (old) {
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		pdf_writer_unref (old);
-#line 5147 "book.c"
+#line 5928 "book.c"
 	}
 }
 
 
 void value_take_pdf_writer (GValue* value, gpointer v_object) {
 	PDFWriter* old;
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#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 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	old = value->data[0].v_pointer;
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (v_object) {
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#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 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#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 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = v_object;
-#line 5166 "book.c"
+#line 5947 "book.c"
 	} else {
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
-#line 5170 "book.c"
+#line 5951 "book.c"
 	}
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (old) {
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		pdf_writer_unref (old);
-#line 5176 "book.c"
+#line 5957 "book.c"
 	}
 }
 
 
 static void pdf_writer_class_init (PDFWriterClass * klass) {
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_parent_class = g_type_class_peek_parent (klass);
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	((PDFWriterClass *) klass)->finalize = pdf_writer_finalize;
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_type_class_add_private (klass, sizeof (PDFWriterPrivate));
-#line 5188 "book.c"
+#line 5969 "book.c"
 }
 
 
 static void pdf_writer_instance_init (PDFWriter * self) {
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->priv = PDF_WRITER_GET_PRIVATE (self);
-#line 574 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 629 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->offset = (gsize) 0;
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->ref_count = 1;
-#line 5199 "book.c"
+#line 5980 "book.c"
 }
 
 
 static void pdf_writer_finalize (PDFWriter* obj) {
 	PDFWriter * self;
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PDF_WRITER, PDFWriter);
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_handlers_destroy (self);
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_list_free0 (self->object_offsets);
-#line 576 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#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 5213 "book.c"
+#line 5994 "book.c"
 }
 
 
@@ -5230,24 +6025,24 @@ GType pdf_writer_get_type (void) {
 gpointer pdf_writer_ref (gpointer instance) {
 	PDFWriter* self;
 	self = instance;
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return instance;
-#line 5238 "book.c"
+#line 6019 "book.c"
 }
 
 
 void pdf_writer_unref (gpointer instance) {
 	PDFWriter* self;
 	self = instance;
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		PDF_WRITER_GET_CLASS (self)->finalize (self);
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 5251 "book.c"
+#line 6032 "book.c"
 	}
 }
 
@@ -5255,9 +6050,9 @@ void pdf_writer_unref (gpointer instance) {
 static cairo_status_t _ps_writer_write_cairo_data_cairo_write_func_t (gpointer self, guchar* data, int data_length1) {
 	cairo_status_t result;
 	result = ps_writer_write_cairo_data ((PsWriter*) self, data, data_length1);
-#line 616 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 679 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
-#line 5261 "book.c"
+#line 6042 "book.c"
 }
 
 
@@ -5266,58 +6061,58 @@ PsWriter* ps_writer_construct (GType object_type, GFileOutputStream* stream) {
 	GFileOutputStream* _tmp0_ = NULL;
 	GFileOutputStream* _tmp1_ = NULL;
 	cairo_surface_t* _tmp2_ = NULL;
-#line 613 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 676 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (stream != NULL, NULL);
-#line 613 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 676 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self = (PsWriter*) g_type_create_instance (object_type);
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 678 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = stream;
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 678 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 678 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_object_unref0 (self->stream);
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 678 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->stream = _tmp1_;
-#line 616 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#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 616 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 679 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_cairo_surface_destroy0 (self->surface);
-#line 616 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 679 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->surface = _tmp2_;
-#line 613 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 676 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return self;
-#line 5290 "book.c"
+#line 6071 "book.c"
 }
 
 
 PsWriter* ps_writer_new (GFileOutputStream* stream) {
-#line 613 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 676 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return ps_writer_construct (TYPE_PS_WRITER, stream);
-#line 5297 "book.c"
+#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 619 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 682 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 5306 "book.c"
+#line 6087 "book.c"
 	{
 		GFileOutputStream* _tmp0_ = NULL;
 		guint8* _tmp1_ = NULL;
 		gint _tmp1__length1 = 0;
-#line 623 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 686 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp0_ = self->stream;
-#line 623 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 686 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp1_ = data;
-#line 623 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 686 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp1__length1 = data_length1;
-#line 623 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#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 623 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 686 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5321 "book.c"
+#line 6102 "book.c"
 			goto __catch2_g_error;
 		}
 	}
@@ -5327,250 +6122,250 @@ static cairo_status_t ps_writer_write_cairo_data (PsWriter* self, guint8* data,
 		GError* e = NULL;
 		GError* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 684 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		e = _inner_error_;
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 684 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_inner_error_ = NULL;
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 690 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp2_ = e;
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 690 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp3_ = _tmp2_->message;
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		g_warning ("book.vala:627: Error writing data: %s", _tmp3_);
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#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 628 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 691 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_g_error_free0 (e);
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 691 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return result;
-#line 5347 "book.c"
+#line 6128 "book.c"
 	}
 	__finally2:
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 684 "/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"
+#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 621 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 684 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_clear_error (&_inner_error_);
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 684 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return 0;
-#line 5358 "book.c"
+#line 6139 "book.c"
 	}
-#line 631 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 694 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	result = CAIRO_STATUS_SUCCESS;
-#line 631 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 694 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
-#line 5364 "book.c"
+#line 6145 "book.c"
 }
 
 
 static void value_ps_writer_init (GValue* value) {
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	value->data[0].v_pointer = NULL;
-#line 5371 "book.c"
+#line 6152 "book.c"
 }
 
 
 static void value_ps_writer_free_value (GValue* value) {
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (value->data[0].v_pointer) {
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		ps_writer_unref (value->data[0].v_pointer);
-#line 5380 "book.c"
+#line 6161 "book.c"
 	}
 }
 
 
 static void value_ps_writer_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (src_value->data[0].v_pointer) {
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#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 5390 "book.c"
+#line 6171 "book.c"
 	} else {
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 5394 "book.c"
+#line 6175 "book.c"
 	}
 }
 
 
 static gpointer value_ps_writer_peek_pointer (const GValue* value) {
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return value->data[0].v_pointer;
-#line 5402 "book.c"
+#line 6183 "book.c"
 }
 
 
 static gchar* value_ps_writer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (collect_values[0].v_pointer) {
-#line 5409 "book.c"
+#line 6190 "book.c"
 		PsWriter* object;
 		object = collect_values[0].v_pointer;
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#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 5416 "book.c"
+#line 6197 "book.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#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 5420 "book.c"
+#line 6201 "book.c"
 		}
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = ps_writer_ref (object);
-#line 5424 "book.c"
+#line 6205 "book.c"
 	} else {
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
-#line 5428 "book.c"
+#line 6209 "book.c"
 	}
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return NULL;
-#line 5432 "book.c"
+#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 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (!object_p) {
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#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 5443 "book.c"
+#line 6224 "book.c"
 	}
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (!value->data[0].v_pointer) {
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = NULL;
-#line 5449 "book.c"
+#line 6230 "book.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = value->data[0].v_pointer;
-#line 5453 "book.c"
+#line 6234 "book.c"
 	} else {
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = ps_writer_ref (value->data[0].v_pointer);
-#line 5457 "book.c"
+#line 6238 "book.c"
 	}
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return NULL;
-#line 5461 "book.c"
+#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 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#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 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#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 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return G_PARAM_SPEC (spec);
-#line 5475 "book.c"
+#line 6256 "book.c"
 }
 
 
 gpointer value_get_ps_writer (const GValue* value) {
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#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 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return value->data[0].v_pointer;
-#line 5484 "book.c"
+#line 6265 "book.c"
 }
 
 
 void value_set_ps_writer (GValue* value, gpointer v_object) {
 	PsWriter* old;
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#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 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	old = value->data[0].v_pointer;
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (v_object) {
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#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 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#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 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = v_object;
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		ps_writer_ref (value->data[0].v_pointer);
-#line 5504 "book.c"
+#line 6285 "book.c"
 	} else {
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
-#line 5508 "book.c"
+#line 6289 "book.c"
 	}
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (old) {
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		ps_writer_unref (old);
-#line 5514 "book.c"
+#line 6295 "book.c"
 	}
 }
 
 
 void value_take_ps_writer (GValue* value, gpointer v_object) {
 	PsWriter* old;
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#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 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	old = value->data[0].v_pointer;
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (v_object) {
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#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 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#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 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = v_object;
-#line 5533 "book.c"
+#line 6314 "book.c"
 	} else {
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
-#line 5537 "book.c"
+#line 6318 "book.c"
 	}
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (old) {
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		ps_writer_unref (old);
-#line 5543 "book.c"
+#line 6324 "book.c"
 	}
 }
 
 
 static void ps_writer_class_init (PsWriterClass * klass) {
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	ps_writer_parent_class = g_type_class_peek_parent (klass);
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	((PsWriterClass *) klass)->finalize = ps_writer_finalize;
-#line 5553 "book.c"
+#line 6334 "book.c"
 }
 
 
 static void ps_writer_instance_init (PsWriter * self) {
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->ref_count = 1;
-#line 5560 "book.c"
+#line 6341 "book.c"
 }
 
 
 static void ps_writer_finalize (PsWriter* obj) {
 	PsWriter * self;
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PS_WRITER, PsWriter);
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_handlers_destroy (self);
-#line 610 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 673 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_cairo_surface_destroy0 (self->surface);
-#line 611 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 674 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_object_unref0 (self->stream);
-#line 5574 "book.c"
+#line 6355 "book.c"
 }
 
 
@@ -5591,24 +6386,24 @@ GType ps_writer_get_type (void) {
 gpointer ps_writer_ref (gpointer instance) {
 	PsWriter* self;
 	self = instance;
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return instance;
-#line 5599 "book.c"
+#line 6380 "book.c"
 }
 
 
 void ps_writer_unref (gpointer instance) {
 	PsWriter* self;
 	self = instance;
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		PS_WRITER_GET_CLASS (self)->finalize (self);
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 5612 "book.c"
+#line 6393 "book.c"
 	}
 }
 
diff --git a/src/book.vala b/src/book.vala
index 5782838..4119cfc 100644
--- a/src/book.vala
+++ b/src/book.vala
@@ -264,6 +264,22 @@ public class Book
         var stream = file.replace (null, false, FileCreateFlags.NONE, null);
         var writer = new PDFWriter (stream);
 
+        /* Choose object numbers */
+        var catalog_number = writer.add_object ();
+        var metadata_number = writer.add_object ();
+        var pages_number = writer.add_object ();
+        var info_number = writer.add_object ();
+        var page_numbers = new uint[n_pages];
+        var page_image_numbers = new uint[n_pages];
+        var page_content_numbers = new uint[n_pages];
+        for (var i = 0; i < n_pages; i++)
+        {
+            page_numbers[i] = writer.add_object ();
+            page_image_numbers[i] = writer.add_object ();
+            page_content_numbers[i] = writer.add_object ();
+        }
+        var struct_tree_root_number = writer.add_object ();
+
         /* Header */
         writer.write_string ("%PDF-1.3\n");
 
@@ -271,40 +287,59 @@ public class Book
         writer.write_string ("%\xe2\xe3\xcf\xd3\n");
 
         /* Catalog */
-        var catalog_number = writer.start_object ();
+        writer.start_object (catalog_number);
         writer.write_string ("%u 0 obj\n".printf (catalog_number));
         writer.write_string ("<<\n");
         writer.write_string ("/Type /Catalog\n");
-        //FIXMEwriter.write_string ("/Metadata %u 0 R\n".printf (catalog_number + 1));
-        //FIXMEwriter.write_string ("/MarkInfo << /Marked true >>");
-        writer.write_string ("/Pages %u 0 R\n".printf (catalog_number + 1)); //+2
+        writer.write_string ("/Metadata %u 0 R\n".printf (metadata_number));
+        writer.write_string ("/MarkInfo << /Marked true >>\n");
+        writer.write_string ("/StructTreeRoot %u 0 R\n".printf (struct_tree_root_number));
+        writer.write_string ("/Pages %u 0 R\n".printf (pages_number));
         writer.write_string (">>\n");
         writer.write_string ("endobj\n");
 
         /* Metadata */
-        /* FIXME writer.write_string ("\n");
-        number = writer.start_object ();
-        writer.write_string ("%u 0 obj\n".printf (number));
+        var now = new DateTime.now_local ();
+        var date_string = now.format ("%FT%H:%M:%S%:z");
+        /* NOTE: The id has to be hardcoded to this value according to the spec... */
+        var metadata = """<?xpacket begin="%s" id="W5M0MpCehiHzreSzNTczkc9d"?>
+<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:xmp="http://ns.adobe.com/xap/1.0/">
+  <rdf:Description rdf:about=""
+                   xmlns:pdfaid="http://www.aiim.org/pdfa/ns/id/"
+                   xmlns:xmp="http://ns.adobe.com/xap/1.0/">
+    <pdfaid:part>1</pdfaid:part>
+    <pdfaid:conformance>A</pdfaid:conformance>
+    <xmp:CreatorTool>Simple Scan %s</xmp:CreatorTool>
+    <xmp:CreateDate>%s</xmp:CreateDate>
+    <xmp:ModifyDate>%s</xmp:ModifyDate>
+    <xmp:MetadataDate>%s</xmp:MetadataDate>
+  </rdf:Description>
+</rdf:RDF>
+<?xpacket end="w"?>""".printf (((unichar) 0xFEFF).to_string (), VERSION, date_string, date_string, date_string);
+        writer.write_string ("\n");
+        writer.start_object (metadata_number);
+        writer.write_string ("%u 0 obj\n".printf (metadata_number));
         writer.write_string ("<<\n");
         writer.write_string ("/Type /Metadata\n");
         writer.write_string ("/Subtype /XML\n");
-        writer.write_string ("/Length %u\n".printf (...));
+        writer.write_string ("/Length %u\n".printf (metadata.length));
         writer.write_string (">>\n");
         writer.write_string ("stream\n");
-        // ...
+        writer.write_string (metadata);
         writer.write_string ("\n");
         writer.write_string ("endstream\n");
-        writer.write_string ("endobj\n");*/
+        writer.write_string ("endobj\n");
 
         /* Pages */
         writer.write_string ("\n");
-        var pages_number = writer.start_object ();
+        writer.start_object (pages_number);
         writer.write_string ("%u 0 obj\n".printf (pages_number));
         writer.write_string ("<<\n");
         writer.write_string ("/Type /Pages\n");
         writer.write_string ("/Kids [");
         for (var i = 0; i < n_pages; i++)
-            writer.write_string (" %u 0 R".printf (pages_number + 1 + (i*3)));
+            writer.write_string (" %u 0 R".printf (page_numbers[i]));
         writer.write_string (" ]\n");
         writer.write_string ("/Count %u\n".printf (n_pages));
         writer.write_string (">>\n");
@@ -469,21 +504,21 @@ public class Book
 
             /* Page */
             writer.write_string ("\n");
-            var number = writer.start_object ();
-            writer.write_string ("%u 0 obj\n".printf (number));
+            writer.start_object (page_numbers[i]);
+            writer.write_string ("%u 0 obj\n".printf (page_numbers[i]));
             writer.write_string ("<<\n");
             writer.write_string ("/Type /Page\n");
             writer.write_string ("/Parent %u 0 R\n".printf (pages_number));
-            writer.write_string ("/Resources << /XObject << /Im%d %u 0 R >> >>\n".printf (i, number+1));
+            writer.write_string ("/Resources << /XObject << /Im%d %u 0 R >> >>\n".printf (i, page_image_numbers[i]));
             writer.write_string ("/MediaBox [ 0 0 %s %s ]\n".printf (page_width.format (width_buffer, "%.2f"), page_height.format (height_buffer, "%.2f")));
-            writer.write_string ("/Contents %u 0 R\n".printf (number+2));
+            writer.write_string ("/Contents %u 0 R\n".printf (page_content_numbers[i]));
             writer.write_string (">>\n");
             writer.write_string ("endobj\n");
 
             /* Page image */
             writer.write_string ("\n");
-            number = writer.start_object ();
-            writer.write_string ("%u 0 obj\n".printf (number));
+            writer.start_object (page_image_numbers[i]);
+            writer.write_string ("%u 0 obj\n".printf (page_image_numbers[i]));
             writer.write_string ("<<\n");
             writer.write_string ("/Type /XObject\n");
             writer.write_string ("/Subtype /Image\n");
@@ -501,11 +536,20 @@ public class Book
             writer.write_string ("endstream\n");
             writer.write_string ("endobj\n");
 
+            /* Structure tree */
+            writer.write_string ("\n");
+            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 (">>\n");
+            writer.write_string ("endobj\n");
+
             /* Page contents */
             var command = "q\n%s 0 0 %s 0 0 cm\n/Im%d Do\nQ".printf (page_width.format (width_buffer, "%f"), page_height.format (height_buffer, "%f"), i);
             writer.write_string ("\n");
-            number = writer.start_object ();
-            writer.write_string ("%u 0 obj\n".printf (number));
+            writer.start_object (page_content_numbers[i]);
+            writer.write_string ("%u 0 obj\n".printf (page_content_numbers[i]));
             writer.write_string ("<<\n");
             writer.write_string ("/Length %d\n".printf (command.length));
             writer.write_string (">>\n");
@@ -520,7 +564,7 @@ public class Book
 
         /* Info */
         writer.write_string ("\n");
-        var info_number = writer.start_object ();
+        writer.start_object (info_number);
         writer.write_string ("%u 0 obj\n".printf (info_number));
         writer.write_string ("<<\n");
         writer.write_string ("/Creator (Simple Scan %s)\n".printf (VERSION));
@@ -531,16 +575,19 @@ public class Book
         writer.write_string ("\n");
         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 ("0000000000 65535 f \n");
-        foreach (var offset in writer.object_offsets)
-            writer.write_string ("%010zu 00000 n \n".printf (offset));
+        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)));
+        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)));
+            else
+                writer.write_string ("%010zu 00000 n \n".printf (writer.object_offsets[i]));
 
         /* Trailer */
         writer.write_string ("\n");
         writer.write_string ("trailer\n");
         writer.write_string ("<<\n");
-        writer.write_string ("/Size %zu\n".printf (writer.object_offsets.length () + 1));
+        writer.write_string ("/Size %zu\n".printf (writer.object_offsets.length + 1));
         writer.write_string ("/Info %u 0 R\n".printf (info_number));
         writer.write_string ("/Root %u 0 R\n".printf (catalog_number));
         writer.write_string ("/ID [<%s> <%s>]\n".printf (id, id));
@@ -550,6 +597,14 @@ public class Book
         writer.write_string ("%%EOF\n");
     }
 
+    static int next_empty_object (PDFWriter writer, int start)
+    {
+        for (var i = start; i < writer.object_offsets.length; i++)
+            if (writer.object_offsets[i] == 0)
+                return i + 1;
+        return 0;
+    }
+
     public void save (string type, int quality, File file) throws Error
     {
         switch (type)
@@ -572,12 +627,13 @@ public class Book
 private class PDFWriter
 {
     public size_t offset = 0;
-    public List<uint> object_offsets;
+    public uint[] object_offsets;
     private FileOutputStream stream;
 
     public PDFWriter (FileOutputStream stream)
     {
         this.stream = stream;
+        object_offsets = new uint[0];
     }
 
     public void write (uint8[] data)
@@ -598,10 +654,17 @@ private class PDFWriter
         write ((uint8[]) text.to_utf8 ());
     }
 
-    public uint start_object ()
+    public uint add_object ()
+    {
+        object_offsets.resize (object_offsets.length + 1);
+        var index = object_offsets.length - 1;
+        object_offsets[index] = 0;
+        return index + 1;
+    }
+
+    public void start_object (uint index)
     {
-        object_offsets.append ((uint)offset);
-        return object_offsets.length ();
+        object_offsets[index - 1] = (uint)offset;
     }
 }
 
diff --git a/src/page-view.c b/src/page-view.c
index 8657814..c5ca2c1 100644
--- a/src/page-view.c
+++ b/src/page-view.c
@@ -1,4 +1,4 @@
-/* page-view.c generated by valac 0.32.1, the Vala compiler
+/* page-view.c generated by valac 0.34.2, the Vala compiler
  * generated from page-view.vala, do not modify */
 
 /*
diff --git a/src/page.c b/src/page.c
index 2f72fa0..0f9681f 100644
--- a/src/page.c
+++ b/src/page.c
@@ -1,4 +1,4 @@
-/* page.c generated by valac 0.32.1, the Vala compiler
+/* page.c generated by valac 0.34.2, the Vala compiler
  * generated from page.vala, do not modify */
 
 /*
@@ -2711,47 +2711,47 @@ static gchar* string_to_utf8 (const gchar* self, int* result_length1) {
 	gint _tmp6_ = 0;
 	gchar* _tmp7_ = NULL;
 	gint _tmp7__length1 = 0;
-#line 1405 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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.32/vapi/glib-2.0.vapi"
+#line 1406 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1406 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1406 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1406 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1406 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = g_new0 (gchar, _tmp1_ + 1);
-#line 1406 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1406 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 1406 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1406 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_result__length1 = _tmp1_ + 1;
-#line 1406 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1406 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	__result__size_ = _result__length1;
-#line 1407 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = _result__length1;
-#line 1407 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_result__length1 = _tmp3_ - 1;
-#line 1408 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1408 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp4_ = _result_;
-#line 1408 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1408 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp4__length1 = _result__length1;
-#line 1408 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1408 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp5_ = strlen (self);
-#line 1408 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1408 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp6_ = _tmp5_;
-#line 1408 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1408 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	memcpy (_tmp4_, self, (gsize) _tmp6_);
-#line 1409 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1409 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp7_ = _result_;
-#line 1409 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1409 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp7__length1 = _result__length1;
-#line 1409 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1409 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (result_length1) {
-#line 1409 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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.32/vapi/glib-2.0.vapi"
+#line 1409 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp7_;
-#line 1409 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1409 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 2757 "page.c"
 }
diff --git a/src/scanner.c b/src/scanner.c
index cdbbd35..bd82662 100644
--- a/src/scanner.c
+++ b/src/scanner.c
@@ -1,4 +1,4 @@
-/* scanner.c generated by valac 0.32.1, the Vala compiler
+/* scanner.c generated by valac 0.34.2, the Vala compiler
  * generated from scanner.vala, do not modify */
 
 /*
@@ -4421,17 +4421,17 @@ 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.32/vapi/glib-2.0.vapi"
+#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.32/vapi/glib-2.0.vapi"
+#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.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 4437 "scanner.c"
 }
@@ -4738,11 +4738,11 @@ static gchar* sane_status_to_string (SANE_Status status) {
 static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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.32/vapi/glib-2.0.vapi"
+#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.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
 #line 4748 "scanner.c"
 	{
@@ -4757,73 +4757,73 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		const gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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.32/vapi/glib-2.0.vapi"
+#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.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
 #line 4788 "scanner.c"
 		}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
 #line 4815 "scanner.c"
 		}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = _tmp9_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 4829 "scanner.c"
 	}
@@ -4831,24 +4831,24 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 	__catch15_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return NULL;
 #line 4854 "scanner.c"
 	}
@@ -6274,15 +6274,15 @@ static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
 	glong _tmp0_ = 0L;
 	gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 6282 "scanner.c"
 }
diff --git a/src/simple-scan.c b/src/simple-scan.c
index 93b9e2c..4ffc5a0 100644
--- a/src/simple-scan.c
+++ b/src/simple-scan.c
@@ -1,4 +1,4 @@
-/* simple-scan.c generated by valac 0.32.1, the Vala compiler
+/* simple-scan.c generated by valac 0.34.2, the Vala compiler
  * generated from simple-scan.vala, do not modify */
 
 /*
@@ -973,13 +973,13 @@ static void _g_free0_ (gpointer var) {
 static gint g_ptr_array_get_length (GPtrArray* self) {
 	gint result;
 	guint _tmp0_ = 0U;
-#line 4807 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 4858 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 4807 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 4858 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = self->len;
-#line 4807 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 4858 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = (gint) _tmp0_;
-#line 4807 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 4858 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 985 "simple-scan.c"
 }
@@ -987,11 +987,11 @@ static gint g_ptr_array_get_length (GPtrArray* self) {
 
 static void g_ptr_array_set_length (GPtrArray* self, gint value) {
 	gint _tmp0_ = 0;
-#line 4808 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 4859 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_if_fail (self != NULL);
-#line 4808 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 4859 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = value;
-#line 4808 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 4859 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_ptr_array_set_size (self, _tmp0_);
 #line 997 "simple-scan.c"
 }
@@ -3022,37 +3022,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	glong _tmp1_ = 0L;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 3057 "simple-scan.c"
 	}
@@ -3072,112 +3072,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	glong _tmp20_ = 0L;
 	glong _tmp21_ = 0L;
 	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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.32/vapi/glib-2.0.vapi"
+#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.32/vapi/glib-2.0.vapi"
+#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.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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.32/vapi/glib-2.0.vapi"
+#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.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 3182 "simple-scan.c"
 }
diff --git a/src/simple-scan.vala b/src/simple-scan.vala
index 81e21e4..9d1b9fd 100644
--- a/src/simple-scan.vala
+++ b/src/simple-scan.vala
@@ -14,7 +14,7 @@ public class SimpleScan : Gtk.Application
     static bool show_version;
     static bool debug_enabled;
     static string? fix_pdf_filename = null;
-    public static const OptionEntry[] options =
+    public const OptionEntry[] options =
     {
         { "version", 'v', 0, OptionArg.NONE, ref show_version,
           /* Help string for command line --version flag */
diff --git a/src/ui.c b/src/ui.c
index 9535ce2..fd417eb 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -1,4 +1,4 @@
-/* ui.c generated by valac 0.32.1, the Vala compiler
+/* ui.c generated by valac 0.34.2, the Vala compiler
  * generated from ui.vala, do not modify */
 
 /*
@@ -710,7 +710,7 @@ 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_desktop (UserInterface* self, const gchar* name);
+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);
@@ -739,6 +739,7 @@ ProgressBarDialog* progress_bar_dialog_new (GtkApplicationWindow* parent, const
 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_);
@@ -790,98 +791,98 @@ static const GActionEntry USER_INTERFACE_action_entries[10] = {{"new_document",
 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 794 "ui.c"
+#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 801 "ui.c"
+#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 808 "ui.c"
+#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 815 "ui.c"
+#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 822 "ui.c"
+#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 829 "ui.c"
+#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 836 "ui.c"
+#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 843 "ui.c"
+#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 850 "ui.c"
+#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 857 "ui.c"
+#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 864 "ui.c"
+#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 871 "ui.c"
+#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 878 "ui.c"
+#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 885 "ui.c"
+#line 886 "ui.c"
 }
 
 
@@ -959,7 +960,7 @@ UserInterface* user_interface_construct (GType object_type) {
 	_tmp13_ = _tmp12_;
 #line 277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp13_ == ((guint) 0)) {
-#line 963 "ui.c"
+#line 964 "ui.c"
 		Book* _tmp14_ = NULL;
 #line 279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_add_default_page (self);
@@ -967,7 +968,7 @@ UserInterface* user_interface_construct (GType object_type) {
 		_tmp14_ = self->priv->_book;
 #line 280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		book_set_needs_saving (_tmp14_, FALSE);
-#line 971 "ui.c"
+#line 972 "ui.c"
 	} else {
 		BookView* _tmp15_ = NULL;
 		Book* _tmp16_ = NULL;
@@ -985,18 +986,18 @@ UserInterface* user_interface_construct (GType object_type) {
 		book_view_set_selected_page (_tmp15_, _tmp18_);
 #line 283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_page_unref0 (_tmp18_);
-#line 989 "ui.c"
+#line 990 "ui.c"
 	}
 #line 261 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self;
-#line 993 "ui.c"
+#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 1000 "ui.c"
+#line 1001 "ui.c"
 }
 
 
@@ -1021,14 +1022,14 @@ static gboolean user_interface_find_scan_device (UserInterface* self, const gcha
 	_vala_iter = _tmp1_;
 #line 297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 1025 "ui.c"
+#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 1032 "ui.c"
+#line 1033 "ui.c"
 				gchar* d = NULL;
 				GtkListStore* _tmp8_ = NULL;
 				GtkTreeIter _tmp9_ = {0};
@@ -1036,14 +1037,14 @@ static gboolean user_interface_find_scan_device (UserInterface* self, const gcha
 				const gchar* _tmp11_ = NULL;
 #line 299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (!_tmp3_) {
-#line 1040 "ui.c"
+#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 1047 "ui.c"
+#line 1048 "ui.c"
 						GtkListStore* _tmp6_ = NULL;
 						gboolean _tmp7_ = FALSE;
 #line 305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -1052,17 +1053,17 @@ static gboolean user_interface_find_scan_device (UserInterface* self, const gcha
 						_tmp7_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp6_, &_vala_iter);
 #line 305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp4_ = _tmp7_;
-#line 1056 "ui.c"
+#line 1057 "ui.c"
 					} else {
 #line 305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp4_ = FALSE;
-#line 1060 "ui.c"
+#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 1066 "ui.c"
+#line 1067 "ui.c"
 					}
 				}
 #line 299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -1081,11 +1082,11 @@ static gboolean user_interface_find_scan_device (UserInterface* self, const gcha
 				if (g_strcmp0 (_tmp10_, _tmp11_) == 0) {
 #line 304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					have_iter = TRUE;
-#line 1085 "ui.c"
+#line 1086 "ui.c"
 				}
 #line 299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (d);
-#line 1089 "ui.c"
+#line 1090 "ui.c"
 			}
 		}
 	}
@@ -1095,11 +1096,11 @@ static gboolean user_interface_find_scan_device (UserInterface* self, const gcha
 	if (iter) {
 #line 308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*iter = _vala_iter;
-#line 1099 "ui.c"
+#line 1100 "ui.c"
 	}
 #line 308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 1103 "ui.c"
+#line 1104 "ui.c"
 }
 
 
@@ -1137,7 +1138,7 @@ static void user_interface_show_error_dialog (UserInterface* self, const gchar*
 	gtk_widget_destroy ((GtkWidget*) dialog);
 #line 311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (dialog);
-#line 1141 "ui.c"
+#line 1142 "ui.c"
 }
 
 
@@ -1228,21 +1229,21 @@ void user_interface_authorize (UserInterface* self, const gchar* resource, gchar
 	if (username) {
 #line 324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*username = _vala_username;
-#line 1232 "ui.c"
+#line 1233 "ui.c"
 	} else {
 #line 324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_vala_username);
-#line 1236 "ui.c"
+#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 1242 "ui.c"
+#line 1243 "ui.c"
 	} else {
 #line 324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_vala_password);
-#line 1246 "ui.c"
+#line 1247 "ui.c"
 	}
 }
 
@@ -1263,7 +1264,7 @@ static void user_interface_device_combo_changed_cb (UserInterface* self, GtkWidg
 	if (_tmp0_) {
 #line 345 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 1267 "ui.c"
+#line 1268 "ui.c"
 	}
 #line 346 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->user_selected_device = TRUE;
@@ -1279,7 +1280,7 @@ static void user_interface_device_combo_changed_cb (UserInterface* self, GtkWidg
 	_g_free0 (_tmp3_);
 #line 347 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp4_) {
-#line 1283 "ui.c"
+#line 1284 "ui.c"
 		GSettings* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
@@ -1296,7 +1297,7 @@ static void user_interface_device_combo_changed_cb (UserInterface* self, GtkWidg
 		g_settings_set_string (_tmp5_, "selected-device", _tmp8_);
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_tmp8_);
-#line 1300 "ui.c"
+#line 1301 "ui.c"
 	}
 }
 
@@ -1304,7 +1305,7 @@ static void user_interface_device_combo_changed_cb (UserInterface* self, GtkWidg
 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 1308 "ui.c"
+#line 1309 "ui.c"
 }
 
 
@@ -1346,7 +1347,7 @@ static void user_interface_update_info_bar (UserInterface* self) {
 	_tmp0_ = self->priv->have_error;
 #line 359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
-#line 1350 "ui.c"
+#line 1351 "ui.c"
 		gchar* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
@@ -1383,7 +1384,7 @@ static void user_interface_update_info_bar (UserInterface* self) {
 		_tmp6_ = self->priv->error_change_scanner_hint;
 #line 366 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		show_change_scanner_button = _tmp6_;
-#line 1387 "ui.c"
+#line 1388 "ui.c"
 	} else {
 		GtkListStore* _tmp7_ = NULL;
 		gint _tmp8_ = 0;
@@ -1393,7 +1394,7 @@ static void user_interface_update_info_bar (UserInterface* self) {
 		_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 1397 "ui.c"
+#line 1398 "ui.c"
 			gchar* _tmp9_ = NULL;
 			const gchar* _tmp10_ = NULL;
 #line 370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -1408,7 +1409,7 @@ static void user_interface_update_info_bar (UserInterface* self) {
 			_tmp10_ = self->priv->missing_driver;
 #line 372 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (_tmp10_ == NULL) {
-#line 1412 "ui.c"
+#line 1413 "ui.c"
 				const gchar* _tmp11_ = NULL;
 				gchar* _tmp12_ = NULL;
 				const gchar* _tmp13_ = NULL;
@@ -1429,7 +1430,7 @@ static void user_interface_update_info_bar (UserInterface* self) {
 				_g_free0 (text);
 #line 377 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				text = _tmp14_;
-#line 1433 "ui.c"
+#line 1434 "ui.c"
 			} else {
 				const gchar* _tmp15_ = NULL;
 				gchar* _tmp16_ = NULL;
@@ -1453,7 +1454,7 @@ static void user_interface_update_info_bar (UserInterface* self) {
 				text = _tmp18_;
 #line 385 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				show_install_button = TRUE;
-#line 1457 "ui.c"
+#line 1458 "ui.c"
 			}
 		} else {
 			GtkInfoBar* _tmp19_ = NULL;
@@ -1469,7 +1470,7 @@ static void user_interface_update_info_bar (UserInterface* self) {
 			_g_free0 (title);
 #line 391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			return;
-#line 1473 "ui.c"
+#line 1474 "ui.c"
 		}
 	}
 #line 394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -1528,14 +1529,14 @@ static void user_interface_update_info_bar (UserInterface* self) {
 	_g_free0 (text);
 #line 351 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (title);
-#line 1532 "ui.c"
+#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 1539 "ui.c"
+#line 1540 "ui.c"
 }
 
 
@@ -1566,7 +1567,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const
 	_tmp2_ = self->priv->user_selected_device;
 #line 415 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 1570 "ui.c"
+#line 1571 "ui.c"
 		GtkComboBox* _tmp3_ = NULL;
 		gint _tmp4_ = 0;
 		gint _tmp5_ = 0;
@@ -1578,13 +1579,13 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const
 		_tmp5_ = _tmp4_;
 #line 416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		have_selection = _tmp5_ >= 0;
-#line 1582 "ui.c"
+#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 1588 "ui.c"
+#line 1589 "ui.c"
 	{
 		GList* device_collection = NULL;
 		GList* device_it = NULL;
@@ -1592,14 +1593,14 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const
 		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 1596 "ui.c"
+#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 1603 "ui.c"
+#line 1604 "ui.c"
 			{
 				gint n_delete = 0;
 				GtkListStore* _tmp8_ = NULL;
@@ -1620,18 +1621,18 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const
 				iter = _tmp10_;
 #line 425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp11_) {
-#line 1624 "ui.c"
+#line 1625 "ui.c"
 					gint i = 0;
 #line 427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					i = 0;
-#line 1628 "ui.c"
+#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 1635 "ui.c"
+#line 1636 "ui.c"
 							gchar* name = NULL;
 							gboolean matched = FALSE;
 							GtkListStore* _tmp15_ = NULL;
@@ -1643,7 +1644,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const
 							gint _tmp22_ = 0;
 #line 428 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							if (!_tmp12_) {
-#line 1647 "ui.c"
+#line 1648 "ui.c"
 								GtkListStore* _tmp13_ = NULL;
 								gboolean _tmp14_ = FALSE;
 #line 442 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -1654,7 +1655,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const
 								if (!_tmp14_) {
 #line 442 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 									break;
-#line 1658 "ui.c"
+#line 1659 "ui.c"
 								}
 							}
 #line 428 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -1677,7 +1678,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const
 							_tmp20_ = matched;
 #line 436 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							if (_tmp20_) {
-#line 1681 "ui.c"
+#line 1682 "ui.c"
 								gint _tmp21_ = 0;
 #line 438 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_tmp21_ = i;
@@ -1687,7 +1688,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const
 								_g_free0 (name);
 #line 439 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								break;
-#line 1691 "ui.c"
+#line 1692 "ui.c"
 							}
 #line 441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp22_ = i;
@@ -1695,7 +1696,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const
 							i = _tmp22_ + 1;
 #line 428 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_g_free0 (name);
-#line 1699 "ui.c"
+#line 1700 "ui.c"
 						}
 					}
 				}
@@ -1703,7 +1704,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const
 				_tmp23_ = n_delete;
 #line 446 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp23_ >= 0) {
-#line 1707 "ui.c"
+#line 1708 "ui.c"
 					gint i = 0;
 					GtkListStore* _tmp24_ = NULL;
 					GtkTreeIter _tmp25_ = {0};
@@ -1719,7 +1720,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const
 					_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 1723 "ui.c"
+#line 1724 "ui.c"
 					{
 						gboolean _tmp28_ = FALSE;
 #line 453 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -1728,7 +1729,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const
 						_tmp28_ = TRUE;
 #line 453 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						while (TRUE) {
-#line 1732 "ui.c"
+#line 1733 "ui.c"
 							gint _tmp30_ = 0;
 							gint _tmp31_ = 0;
 							GtkListStore* _tmp32_ = NULL;
@@ -1738,13 +1739,13 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const
 							GtkTreeIter _tmp36_ = {0};
 #line 453 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							if (!_tmp28_) {
-#line 1742 "ui.c"
+#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 1748 "ui.c"
+#line 1749 "ui.c"
 							}
 #line 453 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp28_ = FALSE;
@@ -1756,7 +1757,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const
 							if (!(_tmp30_ < _tmp31_)) {
 #line 453 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								break;
-#line 1760 "ui.c"
+#line 1761 "ui.c"
 							}
 #line 455 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp32_ = self->priv->device_model;
@@ -1772,7 +1773,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const
 							_tmp36_ = iter;
 #line 456 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							gtk_list_store_remove (_tmp35_, &_tmp36_);
-#line 1776 "ui.c"
+#line 1777 "ui.c"
 						}
 					}
 				} else {
@@ -1807,7 +1808,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const
 					_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 1811 "ui.c"
+#line 1812 "ui.c"
 				}
 #line 464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp46_ = index;
@@ -1815,13 +1816,13 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const
 				index = _tmp46_ + 1;
 #line 420 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_scan_device_unref0 (device);
-#line 1819 "ui.c"
+#line 1820 "ui.c"
 			}
 		}
 	}
 #line 468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	while (TRUE) {
-#line 1825 "ui.c"
+#line 1826 "ui.c"
 		GtkListStore* _tmp47_ = NULL;
 		gint _tmp48_ = 0;
 		GtkTreeIter _tmp49_ = {0};
@@ -1840,7 +1841,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const
 		if (!_tmp50_) {
 #line 468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 1844 "ui.c"
+#line 1845 "ui.c"
 		}
 #line 469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp51_ = self->priv->device_model;
@@ -1848,13 +1849,13 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const
 		_tmp52_ = iter;
 #line 469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_list_store_remove (_tmp51_, &_tmp52_);
-#line 1852 "ui.c"
+#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 1858 "ui.c"
+#line 1859 "ui.c"
 		gchar* device = NULL;
 		GSettings* _tmp54_ = NULL;
 		gchar* _tmp55_ = NULL;
@@ -1870,7 +1871,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const
 		_tmp57_ = device;
 #line 475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp57_ != NULL) {
-#line 1874 "ui.c"
+#line 1875 "ui.c"
 			const gchar* _tmp58_ = NULL;
 			GtkTreeIter _tmp59_ = {0};
 			gboolean _tmp60_ = FALSE;
@@ -1882,15 +1883,15 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const
 			iter = _tmp59_;
 #line 475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp56_ = _tmp60_;
-#line 1886 "ui.c"
+#line 1887 "ui.c"
 		} else {
 #line 475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp56_ = FALSE;
-#line 1890 "ui.c"
+#line 1891 "ui.c"
 		}
 #line 475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp56_) {
-#line 1894 "ui.c"
+#line 1895 "ui.c"
 			GtkComboBox* _tmp61_ = NULL;
 			GtkTreeIter _tmp62_ = {0};
 #line 476 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -1899,24 +1900,24 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const
 			_tmp62_ = iter;
 #line 476 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			gtk_combo_box_set_active_iter (_tmp61_, &_tmp62_);
-#line 1903 "ui.c"
+#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 1910 "ui.c"
+#line 1911 "ui.c"
 		}
 #line 472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (device);
-#line 1914 "ui.c"
+#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 1920 "ui.c"
+#line 1921 "ui.c"
 }
 
 
@@ -1953,7 +1954,7 @@ static void user_interface_add_default_page (UserInterface* self) {
 	book_view_set_selected_page (_tmp6_, page);
 #line 486 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 1957 "ui.c"
+#line 1958 "ui.c"
 }
 
 
@@ -1962,7 +1963,7 @@ static Block1Data* block1_data_ref (Block1Data* _data1_) {
 	g_atomic_int_inc (&_data1_->_ref_count_);
 #line 496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return _data1_;
-#line 1966 "ui.c"
+#line 1967 "ui.c"
 }
 
 
@@ -1971,7 +1972,7 @@ static void block1_data_unref (void * _userdata_) {
 	_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 1975 "ui.c"
+#line 1976 "ui.c"
 		UserInterface* self;
 #line 496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self = _data1_->self;
@@ -1983,7 +1984,7 @@ static void block1_data_unref (void * _userdata_) {
 		_g_object_unref0 (self);
 #line 496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_slice_free (Block1Data, _data1_);
-#line 1987 "ui.c"
+#line 1988 "ui.c"
 	}
 }
 
@@ -1991,7 +1992,7 @@ static void block1_data_unref (void * _userdata_) {
 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 1995 "ui.c"
+#line 1996 "ui.c"
 }
 
 
@@ -2002,35 +2003,35 @@ static gint string_last_index_of_char (const gchar* self, gunichar c, gint start
 	gunichar _tmp1_ = 0U;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1017 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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.32/vapi/glib-2.0.vapi"
+#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = start_index;
-#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = c;
-#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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.32/vapi/glib-2.0.vapi"
+#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 1020 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1020 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = _result_;
-#line 1020 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1020 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 2020 "ui.c"
+#line 2021 "ui.c"
 		gchar* _tmp4_ = NULL;
-#line 1021 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
-#line 1021 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 1021 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 2028 "ui.c"
+#line 2029 "ui.c"
 	} else {
-#line 1023 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1023 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = -1;
-#line 1023 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1023 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 2034 "ui.c"
+#line 2035 "ui.c"
 	}
 }
 
@@ -2052,105 +2053,105 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	glong _tmp19_ = 0L;
 	glong _tmp20_ = 0L;
 	gchar* _tmp21_ = NULL;
-#line 1328 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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.32/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	string_length = (glong) _tmp1_;
-#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = start;
-#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp2_ < ((glong) 0)) {
-#line 2068 "ui.c"
+#line 2069 "ui.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
-#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp3_ = string_length;
-#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = start;
-#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		start = _tmp3_ + _tmp4_;
-#line 2077 "ui.c"
+#line 2078 "ui.c"
 	}
-#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp5_ = end;
-#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp5_ < ((glong) 0)) {
-#line 2083 "ui.c"
+#line 2084 "ui.c"
 		glong _tmp6_ = 0L;
 		glong _tmp7_ = 0L;
-#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = string_length;
-#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp7_ = end;
-#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		end = _tmp6_ + _tmp7_;
-#line 2092 "ui.c"
+#line 2093 "ui.c"
 	}
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp9_ = start;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp9_ >= ((glong) 0)) {
-#line 2098 "ui.c"
+#line 2099 "ui.c"
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp10_ = start;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp11_ = string_length;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp10_ <= _tmp11_;
-#line 2107 "ui.c"
+#line 2108 "ui.c"
 	} else {
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = FALSE;
-#line 2111 "ui.c"
+#line 2112 "ui.c"
 	}
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp13_ = end;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp13_ >= ((glong) 0)) {
-#line 2119 "ui.c"
+#line 2120 "ui.c"
 		glong _tmp14_ = 0L;
 		glong _tmp15_ = 0L;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp14_ = end;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = _tmp14_ <= _tmp15_;
-#line 2128 "ui.c"
+#line 2129 "ui.c"
 	} else {
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = FALSE;
-#line 2132 "ui.c"
+#line 2133 "ui.c"
 	}
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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.32/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp16_ = start;
-#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = end;
-#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp18_ = start;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp19_ = end;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp20_ = start;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp21_;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 2154 "ui.c"
+#line 2155 "ui.c"
 }
 
 
@@ -2191,7 +2192,7 @@ static void __lambda5_ (Block1Data* _data1_) {
 	i = _tmp2_;
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp3_) {
-#line 2195 "ui.c"
+#line 2196 "ui.c"
 		GtkListStore* _tmp4_ = NULL;
 		GtkTreeIter _tmp5_ = {0};
 #line 573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -2200,7 +2201,7 @@ static void __lambda5_ (Block1Data* _data1_) {
 		_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 2204 "ui.c"
+#line 2205 "ui.c"
 	}
 #line 575 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = self->priv->save_dialog;
@@ -2224,7 +2225,7 @@ static void __lambda5_ (Block1Data* _data1_) {
 	_tmp12_ = extension_index;
 #line 580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp12_ >= 0) {
-#line 2228 "ui.c"
+#line 2229 "ui.c"
 		const gchar* _tmp13_ = NULL;
 		gint _tmp14_ = 0;
 		gchar* _tmp15_ = NULL;
@@ -2238,7 +2239,7 @@ static void __lambda5_ (Block1Data* _data1_) {
 		_g_free0 (filename);
 #line 581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		filename = _tmp15_;
-#line 2242 "ui.c"
+#line 2243 "ui.c"
 	}
 #line 582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = filename;
@@ -2262,14 +2263,14 @@ static void __lambda5_ (Block1Data* _data1_) {
 	_g_free0 (path);
 #line 568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (extension);
-#line 2266 "ui.c"
+#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 2273 "ui.c"
+#line 2274 "ui.c"
 }
 
 
@@ -2382,18 +2383,18 @@ static gchar* user_interface_choose_file_location (UserInterface* self) {
 	if (_tmp3_ == NULL) {
 #line 502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = TRUE;
-#line 2386 "ui.c"
+#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 2393 "ui.c"
+#line 2394 "ui.c"
 	}
 #line 502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 2397 "ui.c"
+#line 2398 "ui.c"
 		const gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
 #line 503 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -2404,7 +2405,7 @@ static gchar* user_interface_choose_file_location (UserInterface* self) {
 		_g_free0 (directory);
 #line 503 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		directory = _tmp6_;
-#line 2408 "ui.c"
+#line 2409 "ui.c"
 	}
 #line 505 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = _ ("Save As...");
@@ -2630,7 +2631,7 @@ static gchar* user_interface_choose_file_location (UserInterface* self) {
 	_tmp71_ = response;
 #line 590 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp71_ == ((gint) GTK_RESPONSE_ACCEPT)) {
-#line 2634 "ui.c"
+#line 2635 "ui.c"
 		gchar* extension = NULL;
 		gchar* _tmp72_ = NULL;
 		GtkTreeIter i = {0};
@@ -2663,7 +2664,7 @@ static gchar* user_interface_choose_file_location (UserInterface* self) {
 		i = _tmp74_;
 #line 594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp75_) {
-#line 2667 "ui.c"
+#line 2668 "ui.c"
 			GtkListStore* _tmp76_ = NULL;
 			GtkTreeIter _tmp77_ = {0};
 #line 595 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -2672,7 +2673,7 @@ static gchar* user_interface_choose_file_location (UserInterface* self) {
 			_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 2676 "ui.c"
+#line 2677 "ui.c"
 		}
 #line 597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp78_ = self->priv->save_dialog;
@@ -2696,7 +2697,7 @@ static gchar* user_interface_choose_file_location (UserInterface* self) {
 		_tmp84_ = extension_index;
 #line 601 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp84_ < 0) {
-#line 2700 "ui.c"
+#line 2701 "ui.c"
 			const gchar* _tmp85_ = NULL;
 			const gchar* _tmp86_ = NULL;
 			gchar* _tmp87_ = NULL;
@@ -2710,7 +2711,7 @@ static gchar* user_interface_choose_file_location (UserInterface* self) {
 			_g_free0 (path);
 #line 602 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			path = _tmp87_;
-#line 2714 "ui.c"
+#line 2715 "ui.c"
 		}
 #line 604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp88_ = path;
@@ -2732,7 +2733,7 @@ static gchar* user_interface_choose_file_location (UserInterface* self) {
 		_g_free0 (path);
 #line 590 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (extension);
-#line 2736 "ui.c"
+#line 2737 "ui.c"
 	}
 #line 607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp92_ = self->priv->settings;
@@ -2772,7 +2773,7 @@ static gchar* user_interface_choose_file_location (UserInterface* self) {
 	_data1_ = NULL;
 #line 612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 2776 "ui.c"
+#line 2777 "ui.c"
 }
 
 
@@ -2803,21 +2804,21 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 	_tmp1_ = self->priv->book_uri;
 #line 618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp1_ != NULL) {
-#line 2807 "ui.c"
+#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 2813 "ui.c"
+#line 2814 "ui.c"
 	} else {
 #line 618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = FALSE;
-#line 2817 "ui.c"
+#line 2818 "ui.c"
 	}
 #line 618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
-#line 2821 "ui.c"
+#line 2822 "ui.c"
 		const gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 #line 619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -2828,7 +2829,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 		_g_free0 (uri);
 #line 619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		uri = _tmp4_;
-#line 2832 "ui.c"
+#line 2833 "ui.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 #line 621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -2837,7 +2838,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 		_g_free0 (uri);
 #line 621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		uri = _tmp5_;
-#line 2841 "ui.c"
+#line 2842 "ui.c"
 	}
 #line 622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = uri;
@@ -2849,7 +2850,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 		_g_free0 (uri);
 #line 623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 2853 "ui.c"
+#line 2854 "ui.c"
 	}
 #line 625 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = uri;
@@ -2877,7 +2878,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 	_tmp14_ = g_str_has_suffix (_tmp13_, ".pdf");
 #line 631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp14_) {
-#line 2881 "ui.c"
+#line 2882 "ui.c"
 		gchar* _tmp15_ = NULL;
 #line 632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = g_strdup ("pdf");
@@ -2885,7 +2886,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 		_g_free0 (format);
 #line 632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		format = _tmp15_;
-#line 2889 "ui.c"
+#line 2890 "ui.c"
 	} else {
 		const gchar* _tmp16_ = NULL;
 		gboolean _tmp17_ = FALSE;
@@ -2895,7 +2896,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 		_tmp17_ = g_str_has_suffix (_tmp16_, ".ps");
 #line 633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp17_) {
-#line 2899 "ui.c"
+#line 2900 "ui.c"
 			gchar* _tmp18_ = NULL;
 #line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp18_ = g_strdup ("ps");
@@ -2903,7 +2904,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 			_g_free0 (format);
 #line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			format = _tmp18_;
-#line 2907 "ui.c"
+#line 2908 "ui.c"
 		} else {
 			const gchar* _tmp19_ = NULL;
 			gboolean _tmp20_ = FALSE;
@@ -2913,7 +2914,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 			_tmp20_ = g_str_has_suffix (_tmp19_, ".png");
 #line 635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (_tmp20_) {
-#line 2917 "ui.c"
+#line 2918 "ui.c"
 				gchar* _tmp21_ = NULL;
 #line 636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp21_ = g_strdup ("png");
@@ -2921,7 +2922,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 				_g_free0 (format);
 #line 636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				format = _tmp21_;
-#line 2925 "ui.c"
+#line 2926 "ui.c"
 			} else {
 				gboolean _tmp22_ = FALSE;
 				const gchar* _tmp23_ = NULL;
@@ -2934,7 +2935,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 				if (_tmp24_) {
 #line 637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp22_ = TRUE;
-#line 2938 "ui.c"
+#line 2939 "ui.c"
 				} else {
 					const gchar* _tmp25_ = NULL;
 					gboolean _tmp26_ = FALSE;
@@ -2944,11 +2945,11 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 					_tmp26_ = g_str_has_suffix (_tmp25_, ".tiff");
 #line 637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp22_ = _tmp26_;
-#line 2948 "ui.c"
+#line 2949 "ui.c"
 				}
 #line 637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp22_) {
-#line 2952 "ui.c"
+#line 2953 "ui.c"
 					gchar* _tmp27_ = NULL;
 #line 638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp27_ = g_strdup ("tiff");
@@ -2956,14 +2957,14 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 					_g_free0 (format);
 #line 638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					format = _tmp27_;
-#line 2960 "ui.c"
+#line 2961 "ui.c"
 				}
 			}
 		}
 	}
 #line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_show_progress_dialog (self);
-#line 2967 "ui.c"
+#line 2968 "ui.c"
 	{
 		Book* _tmp28_ = NULL;
 		const gchar* _tmp29_ = NULL;
@@ -2984,7 +2985,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 		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 2988 "ui.c"
+#line 2989 "ui.c"
 			goto __catch17_g_error;
 		}
 	}
@@ -3031,7 +3032,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 		_g_free0 (uri);
 #line 653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 3035 "ui.c"
+#line 3036 "ui.c"
 	}
 	__finally17:
 #line 641 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -3050,7 +3051,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 		g_clear_error (&_inner_error_);
 #line 641 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return FALSE;
-#line 3054 "ui.c"
+#line 3055 "ui.c"
 	}
 #line 656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp38_ = uri;
@@ -3076,7 +3077,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 	_g_free0 (uri);
 #line 658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 3080 "ui.c"
+#line 3081 "ui.c"
 }
 
 
@@ -3119,7 +3120,7 @@ static gboolean user_interface_prompt_to_save (UserInterface* self, const gchar*
 		result = TRUE;
 #line 664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 3123 "ui.c"
+#line 3124 "ui.c"
 	}
 #line 666 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = title;
@@ -3169,7 +3170,7 @@ static gboolean user_interface_prompt_to_save (UserInterface* self, const gchar*
 	switch (_tmp16_) {
 #line 681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case GTK_RESPONSE_YES:
-#line 3173 "ui.c"
+#line 3174 "ui.c"
 		{
 			gboolean _tmp17_ = FALSE;
 #line 684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -3182,7 +3183,7 @@ static gboolean user_interface_prompt_to_save (UserInterface* self, const gchar*
 				_g_object_unref0 (dialog);
 #line 685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				return result;
-#line 3186 "ui.c"
+#line 3187 "ui.c"
 			} else {
 #line 687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				result = FALSE;
@@ -3190,12 +3191,12 @@ static gboolean user_interface_prompt_to_save (UserInterface* self, const gchar*
 				_g_object_unref0 (dialog);
 #line 687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				return result;
-#line 3194 "ui.c"
+#line 3195 "ui.c"
 			}
 		}
 #line 681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case GTK_RESPONSE_NO:
-#line 3199 "ui.c"
+#line 3200 "ui.c"
 		{
 #line 689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			result = TRUE;
@@ -3203,7 +3204,7 @@ static gboolean user_interface_prompt_to_save (UserInterface* self, const gchar*
 			_g_object_unref0 (dialog);
 #line 689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			return result;
-#line 3207 "ui.c"
+#line 3208 "ui.c"
 		}
 		default:
 		{
@@ -3213,12 +3214,12 @@ static gboolean user_interface_prompt_to_save (UserInterface* self, const gchar*
 			_g_object_unref0 (dialog);
 #line 691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			return result;
-#line 3217 "ui.c"
+#line 3218 "ui.c"
 		}
 	}
 #line 661 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (dialog);
-#line 3222 "ui.c"
+#line 3223 "ui.c"
 }
 
 
@@ -3251,7 +3252,7 @@ static void user_interface_clear_document (UserInterface* self) {
 	_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 3255 "ui.c"
+#line 3256 "ui.c"
 }
 
 
@@ -3273,7 +3274,7 @@ static void user_interface_new_document (UserInterface* self) {
 	if (!_tmp2_) {
 #line 711 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 3277 "ui.c"
+#line 3278 "ui.c"
 	}
 #line 713 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = user_interface_get_scanning (self);
@@ -3283,11 +3284,11 @@ static void user_interface_new_document (UserInterface* self) {
 	if (_tmp4_) {
 #line 714 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_signal_emit_by_name (self, "stop-scan");
-#line 3287 "ui.c"
+#line 3288 "ui.c"
 	}
 #line 715 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_clear_document (self);
-#line 3291 "ui.c"
+#line 3292 "ui.c"
 }
 
 
@@ -3298,14 +3299,14 @@ static void user_interface_new_button_clicked_cb (UserInterface* self, GtkWidget
 	g_return_if_fail (widget != NULL);
 #line 721 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_new_document (self);
-#line 3302 "ui.c"
+#line 3303 "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 3309 "ui.c"
+#line 3310 "ui.c"
 }
 
 
@@ -3314,7 +3315,7 @@ void user_interface_new_document_activate_cb (UserInterface* self) {
 	g_return_if_fail (self != NULL);
 #line 726 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_new_document (self);
-#line 3318 "ui.c"
+#line 3319 "ui.c"
 }
 
 
@@ -3339,7 +3340,7 @@ static void user_interface_set_document_hint (UserInterface* self, const gchar*
 	_tmp2_ = document_hint;
 #line 733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (g_strcmp0 (_tmp2_, "text") == 0) {
-#line 3343 "ui.c"
+#line 3344 "ui.c"
 		GtkRadioMenuItem* _tmp3_ = NULL;
 		GtkRadioMenuItem* _tmp4_ = NULL;
 		GtkRadioMenuItem* _tmp5_ = NULL;
@@ -3355,14 +3356,14 @@ static void user_interface_set_document_hint (UserInterface* self, const gchar*
 		_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 3359 "ui.c"
+#line 3360 "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 3366 "ui.c"
+#line 3367 "ui.c"
 			GtkRadioMenuItem* _tmp7_ = NULL;
 			GtkRadioMenuItem* _tmp8_ = NULL;
 			GtkRadioMenuItem* _tmp9_ = NULL;
@@ -3378,14 +3379,14 @@ static void user_interface_set_document_hint (UserInterface* self, const gchar*
 			_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 3382 "ui.c"
+#line 3383 "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 3389 "ui.c"
+#line 3390 "ui.c"
 		GSettings* _tmp11_ = NULL;
 		const gchar* _tmp12_ = NULL;
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -3394,7 +3395,7 @@ static void user_interface_set_document_hint (UserInterface* self, const gchar*
 		_tmp12_ = document_hint;
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_settings_set_string (_tmp11_, "document-type", _tmp12_);
-#line 3398 "ui.c"
+#line 3399 "ui.c"
 	}
 }
 
@@ -3417,7 +3418,7 @@ static void user_interface_text_menuitem_toggled_cb (UserInterface* self, GtkChe
 	if (_tmp2_) {
 #line 754 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_document_hint (self, "text", TRUE);
-#line 3421 "ui.c"
+#line 3422 "ui.c"
 	}
 }
 
@@ -3425,7 +3426,7 @@ static void user_interface_text_menuitem_toggled_cb (UserInterface* self, GtkChe
 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 3429 "ui.c"
+#line 3430 "ui.c"
 }
 
 
@@ -3447,7 +3448,7 @@ static void user_interface_photo_menuitem_toggled_cb (UserInterface* self, GtkCh
 	if (_tmp2_) {
 #line 761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_document_hint (self, "photo", TRUE);
-#line 3451 "ui.c"
+#line 3452 "ui.c"
 	}
 }
 
@@ -3455,7 +3456,7 @@ static void user_interface_photo_menuitem_toggled_cb (UserInterface* self, GtkCh
 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 3459 "ui.c"
+#line 3460 "ui.c"
 }
 
 
@@ -3474,14 +3475,14 @@ static void user_interface_set_page_side (UserInterface* self, ScanType page_sid
 	iter = _tmp1_;
 #line 768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 3478 "ui.c"
+#line 3479 "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 3485 "ui.c"
+#line 3486 "ui.c"
 				gint s = 0;
 				GtkListStore* _tmp6_ = NULL;
 				GtkTreeIter _tmp7_ = {0};
@@ -3489,7 +3490,7 @@ static void user_interface_set_page_side (UserInterface* self, ScanType page_sid
 				ScanType _tmp9_ = 0;
 #line 770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (!_tmp3_) {
-#line 3493 "ui.c"
+#line 3494 "ui.c"
 					GtkListStore* _tmp4_ = NULL;
 					gboolean _tmp5_ = FALSE;
 #line 779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -3500,7 +3501,7 @@ static void user_interface_set_page_side (UserInterface* self, ScanType page_sid
 					if (!_tmp5_) {
 #line 779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						break;
-#line 3504 "ui.c"
+#line 3505 "ui.c"
 					}
 				}
 #line 770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -3517,7 +3518,7 @@ static void user_interface_set_page_side (UserInterface* self, ScanType page_sid
 				_tmp9_ = page_side;
 #line 774 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp8_ == ((gint) _tmp9_)) {
-#line 3521 "ui.c"
+#line 3522 "ui.c"
 					GtkComboBox* _tmp10_ = NULL;
 					GtkTreeIter _tmp11_ = {0};
 #line 776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -3528,7 +3529,7 @@ static void user_interface_set_page_side (UserInterface* self, ScanType page_sid
 					gtk_combo_box_set_active_iter (_tmp10_, &_tmp11_);
 #line 777 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					return;
-#line 3532 "ui.c"
+#line 3533 "ui.c"
 				}
 			}
 		}
@@ -3543,7 +3544,7 @@ static void user_interface_set_paper_size (UserInterface* self, gint width, gint
 	gboolean _tmp18_ = FALSE;
 #line 783 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 3547 "ui.c"
+#line 3548 "ui.c"
 	{
 		GtkListStore* _tmp0_ = NULL;
 		GtkTreeIter _tmp1_ = {0};
@@ -3561,7 +3562,7 @@ static void user_interface_set_paper_size (UserInterface* self, gint width, gint
 		_tmp3_ = TRUE;
 #line 788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		while (TRUE) {
-#line 3565 "ui.c"
+#line 3566 "ui.c"
 			gboolean _tmp6_ = FALSE;
 			gint w = 0;
 			gint h = 0;
@@ -3572,7 +3573,7 @@ static void user_interface_set_paper_size (UserInterface* self, gint width, gint
 			gint _tmp11_ = 0;
 #line 788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (!_tmp3_) {
-#line 3576 "ui.c"
+#line 3577 "ui.c"
 				GtkListStore* _tmp4_ = NULL;
 				gboolean _tmp5_ = FALSE;
 #line 790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -3581,7 +3582,7 @@ static void user_interface_set_paper_size (UserInterface* self, gint width, gint
 				_tmp5_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp4_, &iter);
 #line 790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				have_iter = _tmp5_;
-#line 3585 "ui.c"
+#line 3586 "ui.c"
 			}
 #line 788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp3_ = FALSE;
@@ -3591,7 +3592,7 @@ static void user_interface_set_paper_size (UserInterface* self, gint width, gint
 			if (!_tmp6_) {
 #line 789 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 3595 "ui.c"
+#line 3596 "ui.c"
 			}
 #line 793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp7_ = self->priv->paper_size_model;
@@ -3605,7 +3606,7 @@ static void user_interface_set_paper_size (UserInterface* self, gint width, gint
 			_tmp11_ = width;
 #line 794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (_tmp10_ == _tmp11_) {
-#line 3609 "ui.c"
+#line 3610 "ui.c"
 				gint _tmp12_ = 0;
 				gint _tmp13_ = 0;
 #line 794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -3614,17 +3615,17 @@ static void user_interface_set_paper_size (UserInterface* self, gint width, gint
 				_tmp13_ = height;
 #line 794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp9_ = _tmp12_ == _tmp13_;
-#line 3618 "ui.c"
+#line 3619 "ui.c"
 			} else {
 #line 794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp9_ = FALSE;
-#line 3622 "ui.c"
+#line 3623 "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 3628 "ui.c"
+#line 3629 "ui.c"
 			}
 		}
 	}
@@ -3632,7 +3633,7 @@ static void user_interface_set_paper_size (UserInterface* self, gint width, gint
 	_tmp14_ = have_iter;
 #line 798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp14_) {
-#line 3636 "ui.c"
+#line 3637 "ui.c"
 		GtkListStore* _tmp15_ = NULL;
 		GtkTreeIter _tmp16_ = {0};
 		gboolean _tmp17_ = FALSE;
@@ -3644,13 +3645,13 @@ static void user_interface_set_paper_size (UserInterface* self, gint width, gint
 		iter = _tmp16_;
 #line 799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		have_iter = _tmp17_;
-#line 3648 "ui.c"
+#line 3649 "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 3654 "ui.c"
+#line 3655 "ui.c"
 		GtkComboBox* _tmp19_ = NULL;
 		GtkTreeIter _tmp20_ = {0};
 #line 801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -3659,7 +3660,7 @@ static void user_interface_set_paper_size (UserInterface* self, gint width, gint
 		_tmp20_ = iter;
 #line 801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_combo_box_set_active_iter (_tmp19_, &_tmp20_);
-#line 3663 "ui.c"
+#line 3664 "ui.c"
 	}
 }
 
@@ -3683,7 +3684,7 @@ static gint user_interface_get_text_dpi (UserInterface* self) {
 	iter = _tmp1_;
 #line 809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 3687 "ui.c"
+#line 3688 "ui.c"
 		GtkListStore* _tmp3_ = NULL;
 		GtkTreeIter _tmp4_ = {0};
 #line 810 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -3692,13 +3693,13 @@ static gint user_interface_get_text_dpi (UserInterface* self) {
 		_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 3696 "ui.c"
+#line 3697 "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 3702 "ui.c"
+#line 3703 "ui.c"
 }
 
 
@@ -3721,7 +3722,7 @@ static gint user_interface_get_photo_dpi (UserInterface* self) {
 	iter = _tmp1_;
 #line 820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 3725 "ui.c"
+#line 3726 "ui.c"
 		GtkListStore* _tmp3_ = NULL;
 		GtkTreeIter _tmp4_ = {0};
 #line 821 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -3730,13 +3731,13 @@ static gint user_interface_get_photo_dpi (UserInterface* self) {
 		_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 3734 "ui.c"
+#line 3735 "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 3740 "ui.c"
+#line 3741 "ui.c"
 }
 
 
@@ -3760,7 +3761,7 @@ static ScanType user_interface_get_page_side (UserInterface* self) {
 	iter = _tmp1_;
 #line 831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 3764 "ui.c"
+#line 3765 "ui.c"
 		GtkListStore* _tmp3_ = NULL;
 		GtkTreeIter _tmp4_ = {0};
 #line 832 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -3769,7 +3770,7 @@ static ScanType user_interface_get_page_side (UserInterface* self) {
 		_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 3773 "ui.c"
+#line 3774 "ui.c"
 	}
 #line 834 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = page_side;
@@ -3777,7 +3778,7 @@ static ScanType user_interface_get_page_side (UserInterface* self) {
 	result = (ScanType) _tmp5_;
 #line 834 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 3781 "ui.c"
+#line 3782 "ui.c"
 }
 
 
@@ -3806,7 +3807,7 @@ static gboolean user_interface_get_paper_size (UserInterface* self, gint* width,
 	iter = _tmp2_;
 #line 842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp3_) {
-#line 3810 "ui.c"
+#line 3811 "ui.c"
 		GtkListStore* _tmp4_ = NULL;
 		GtkTreeIter _tmp5_ = {0};
 #line 844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -3821,17 +3822,17 @@ static gboolean user_interface_get_paper_size (UserInterface* self, gint* width,
 		if (width) {
 #line 845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			*width = _vala_width;
-#line 3825 "ui.c"
+#line 3826 "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 3831 "ui.c"
+#line 3832 "ui.c"
 		}
 #line 845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 3835 "ui.c"
+#line 3836 "ui.c"
 	}
 #line 848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
@@ -3839,17 +3840,17 @@ static gboolean user_interface_get_paper_size (UserInterface* self, gint* width,
 	if (width) {
 #line 848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*width = _vala_width;
-#line 3843 "ui.c"
+#line 3844 "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 3849 "ui.c"
+#line 3850 "ui.c"
 	}
 #line 848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 3853 "ui.c"
+#line 3854 "ui.c"
 }
 
 
@@ -3878,7 +3879,7 @@ static ScanOptions* user_interface_make_scan_options (UserInterface* self) {
 	_tmp1_ = self->priv->document_hint;
 #line 854 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (g_strcmp0 (_tmp1_, "text") == 0) {
-#line 3882 "ui.c"
+#line 3883 "ui.c"
 		ScanOptions* _tmp2_ = NULL;
 		ScanOptions* _tmp3_ = NULL;
 		gint _tmp4_ = 0;
@@ -3897,7 +3898,7 @@ static ScanOptions* user_interface_make_scan_options (UserInterface* self) {
 		_tmp5_ = options;
 #line 858 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_->depth = 2;
-#line 3901 "ui.c"
+#line 3902 "ui.c"
 	} else {
 		ScanOptions* _tmp6_ = NULL;
 		ScanOptions* _tmp7_ = NULL;
@@ -3917,7 +3918,7 @@ static ScanOptions* user_interface_make_scan_options (UserInterface* self) {
 		_tmp9_ = options;
 #line 864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_->depth = 8;
-#line 3921 "ui.c"
+#line 3922 "ui.c"
 	}
 #line 866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = options;
@@ -3949,7 +3950,7 @@ static ScanOptions* user_interface_make_scan_options (UserInterface* self) {
 	result = options;
 #line 870 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 3953 "ui.c"
+#line 3954 "ui.c"
 }
 
 
@@ -3981,14 +3982,14 @@ static void user_interface_scan_button_clicked_cb (UserInterface* self, GtkWidge
 	_g_free0 (_tmp3_);
 #line 874 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_scan_options_unref0 (options);
-#line 3985 "ui.c"
+#line 3986 "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 3992 "ui.c"
+#line 3993 "ui.c"
 }
 
 
@@ -3999,14 +4000,14 @@ static void user_interface_stop_scan_button_clicked_cb (UserInterface* self, Gtk
 	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 4003 "ui.c"
+#line 4004 "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 4010 "ui.c"
+#line 4011 "ui.c"
 }
 
 
@@ -4025,7 +4026,7 @@ static void user_interface_continuous_scan_button_clicked_cb (UserInterface* sel
 	if (_tmp1_) {
 #line 891 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_signal_emit_by_name (self, "stop-scan");
-#line 4029 "ui.c"
+#line 4030 "ui.c"
 	} else {
 		ScanOptions* options = NULL;
 		ScanOptions* _tmp2_ = NULL;
@@ -4059,7 +4060,7 @@ static void user_interface_continuous_scan_button_clicked_cb (UserInterface* sel
 		_g_free0 (_tmp7_);
 #line 890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_scan_options_unref0 (options);
-#line 4063 "ui.c"
+#line 4064 "ui.c"
 	}
 }
 
@@ -4067,7 +4068,7 @@ static void user_interface_continuous_scan_button_clicked_cb (UserInterface* sel
 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 4071 "ui.c"
+#line 4072 "ui.c"
 }
 
 
@@ -4081,14 +4082,14 @@ static void user_interface_preferences_button_clicked_cb (UserInterface* self, G
 	_tmp0_ = self->priv->preferences_dialog;
 #line 903 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_present ((GtkWindow*) _tmp0_);
-#line 4085 "ui.c"
+#line 4086 "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 4092 "ui.c"
+#line 4093 "ui.c"
 }
 
 
@@ -4100,7 +4101,7 @@ void user_interface_preferences_activate_cb (UserInterface* self) {
 	_tmp0_ = self->priv->preferences_dialog;
 #line 908 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_present ((GtkWindow*) _tmp0_);
-#line 4104 "ui.c"
+#line 4105 "ui.c"
 }
 
 
@@ -4116,7 +4117,7 @@ static gboolean user_interface_preferences_dialog_delete_event_cb (UserInterface
 	result = TRUE;
 #line 914 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 4120 "ui.c"
+#line 4121 "ui.c"
 }
 
 
@@ -4125,7 +4126,7 @@ static gboolean _user_interface_preferences_dialog_delete_event_cb_gtk_widget_de
 	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 4129 "ui.c"
+#line 4130 "ui.c"
 }
 
 
@@ -4139,21 +4140,21 @@ static void user_interface_preferences_dialog_response_cb (UserInterface* self,
 	_tmp0_ = self->priv->preferences_dialog;
 #line 920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp0_, FALSE);
-#line 4143 "ui.c"
+#line 4144 "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 4150 "ui.c"
+#line 4151 "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 4157 "ui.c"
+#line 4158 "ui.c"
 }
 
 
@@ -4180,7 +4181,7 @@ static void user_interface_update_page_menu (UserInterface* self) {
 	_tmp4_ = page;
 #line 926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp4_ == NULL) {
-#line 4184 "ui.c"
+#line 4185 "ui.c"
 		GtkMenuItem* _tmp5_ = NULL;
 		GtkMenuItem* _tmp6_ = NULL;
 #line 928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -4191,7 +4192,7 @@ static void user_interface_update_page_menu (UserInterface* self) {
 		_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 4195 "ui.c"
+#line 4196 "ui.c"
 	} else {
 		guint index = 0U;
 		Book* _tmp7_ = NULL;
@@ -4230,11 +4231,11 @@ static void user_interface_update_page_menu (UserInterface* self) {
 		_tmp16_ = _tmp15_;
 #line 935 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_set_sensitive ((GtkWidget*) _tmp12_, _tmp13_ < (_tmp16_ - 1));
-#line 4234 "ui.c"
+#line 4235 "ui.c"
 	}
 #line 923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 4238 "ui.c"
+#line 4239 "ui.c"
 }
 
 
@@ -4265,7 +4266,7 @@ static void user_interface_page_selected_cb (UserInterface* self, BookView* view
 	if (_tmp0_ == NULL) {
 #line 942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4269 "ui.c"
+#line 4270 "ui.c"
 	}
 #line 944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->updating_page_menu = TRUE;
@@ -4285,7 +4286,7 @@ static void user_interface_page_selected_cb (UserInterface* self, BookView* view
 	_tmp5_ = _tmp4_;
 #line 949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp5_) {
-#line 4289 "ui.c"
+#line 4290 "ui.c"
 		gchar* crop_name = NULL;
 		Page* _tmp6_ = NULL;
 		const gchar* _tmp7_ = NULL;
@@ -4306,13 +4307,13 @@ static void user_interface_page_selected_cb (UserInterface* self, BookView* view
 		_tmp10_ = crop_name;
 #line 952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp10_ != NULL) {
-#line 4310 "ui.c"
+#line 4311 "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 4316 "ui.c"
+#line 4317 "ui.c"
 				GtkRadioMenuItem* _tmp12_ = NULL;
 				GtkRadioMenuItem* _tmp13_ = NULL;
 #line 955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -4323,14 +4324,14 @@ static void user_interface_page_selected_cb (UserInterface* self, BookView* view
 				_g_object_unref0 (menuitem);
 #line 955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				menuitem = _tmp13_;
-#line 4327 "ui.c"
+#line 4328 "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 4334 "ui.c"
+#line 4335 "ui.c"
 					GtkRadioMenuItem* _tmp15_ = NULL;
 					GtkRadioMenuItem* _tmp16_ = NULL;
 #line 957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -4341,14 +4342,14 @@ static void user_interface_page_selected_cb (UserInterface* self, BookView* view
 					_g_object_unref0 (menuitem);
 #line 957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					menuitem = _tmp16_;
-#line 4345 "ui.c"
+#line 4346 "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 4352 "ui.c"
+#line 4353 "ui.c"
 						GtkRadioMenuItem* _tmp18_ = NULL;
 						GtkRadioMenuItem* _tmp19_ = NULL;
 #line 959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -4359,14 +4360,14 @@ static void user_interface_page_selected_cb (UserInterface* self, BookView* view
 						_g_object_unref0 (menuitem);
 #line 959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						menuitem = _tmp19_;
-#line 4363 "ui.c"
+#line 4364 "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 4370 "ui.c"
+#line 4371 "ui.c"
 							GtkRadioMenuItem* _tmp21_ = NULL;
 							GtkRadioMenuItem* _tmp22_ = NULL;
 #line 961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -4377,14 +4378,14 @@ static void user_interface_page_selected_cb (UserInterface* self, BookView* view
 							_g_object_unref0 (menuitem);
 #line 961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							menuitem = _tmp22_;
-#line 4381 "ui.c"
+#line 4382 "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 4388 "ui.c"
+#line 4389 "ui.c"
 								GtkRadioMenuItem* _tmp24_ = NULL;
 								GtkRadioMenuItem* _tmp25_ = NULL;
 #line 963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -4395,14 +4396,14 @@ static void user_interface_page_selected_cb (UserInterface* self, BookView* view
 								_g_object_unref0 (menuitem);
 #line 963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								menuitem = _tmp25_;
-#line 4399 "ui.c"
+#line 4400 "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 4406 "ui.c"
+#line 4407 "ui.c"
 									GtkRadioMenuItem* _tmp27_ = NULL;
 									GtkRadioMenuItem* _tmp28_ = NULL;
 #line 965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -4413,7 +4414,7 @@ static void user_interface_page_selected_cb (UserInterface* self, BookView* view
 									_g_object_unref0 (menuitem);
 #line 965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 									menuitem = _tmp28_;
-#line 4417 "ui.c"
+#line 4418 "ui.c"
 								}
 							}
 						}
@@ -4431,11 +4432,11 @@ static void user_interface_page_selected_cb (UserInterface* self, BookView* view
 			_g_object_unref0 (menuitem);
 #line 968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			menuitem = _tmp30_;
-#line 4435 "ui.c"
+#line 4436 "ui.c"
 		}
 #line 949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (crop_name);
-#line 4439 "ui.c"
+#line 4440 "ui.c"
 	}
 #line 971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp31_ = menuitem;
@@ -4465,7 +4466,7 @@ static void user_interface_page_selected_cb (UserInterface* self, BookView* view
 	self->priv->updating_page_menu = FALSE;
 #line 939 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (menuitem);
-#line 4469 "ui.c"
+#line 4470 "ui.c"
 }
 
 
@@ -4495,7 +4496,7 @@ static void user_interface_show_page_cb (UserInterface* self, BookView* view, Pa
 		_g_free0 (path);
 #line 982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4499 "ui.c"
+#line 4500 "ui.c"
 	}
 #line 983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = path;
@@ -4503,7 +4504,7 @@ static void user_interface_show_page_cb (UserInterface* self, BookView* view, Pa
 	_tmp3_ = g_file_new_for_path (_tmp2_);
 #line 983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	file = _tmp3_;
-#line 4507 "ui.c"
+#line 4508 "ui.c"
 	{
 		Page* _tmp4_ = NULL;
 		gint _tmp5_ = 0;
@@ -4521,7 +4522,7 @@ static void user_interface_show_page_cb (UserInterface* self, BookView* view, Pa
 		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 4525 "ui.c"
+#line 4526 "ui.c"
 			goto __catch18_g_error;
 		}
 	}
@@ -4552,7 +4553,7 @@ static void user_interface_show_page_cb (UserInterface* self, BookView* view, Pa
 		_g_free0 (path);
 #line 994 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4556 "ui.c"
+#line 4557 "ui.c"
 	}
 	__finally18:
 #line 985 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -4567,7 +4568,7 @@ static void user_interface_show_page_cb (UserInterface* self, BookView* view, Pa
 		g_clear_error (&_inner_error_);
 #line 985 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4571 "ui.c"
+#line 4572 "ui.c"
 	}
 	{
 		GdkScreen* _tmp11_ = NULL;
@@ -4594,7 +4595,7 @@ static void user_interface_show_page_cb (UserInterface* self, BookView* view, Pa
 		_g_free0 (_tmp15_);
 #line 999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4598 "ui.c"
+#line 4599 "ui.c"
 			goto __catch19_g_error;
 		}
 	}
@@ -4619,7 +4620,7 @@ static void user_interface_show_page_cb (UserInterface* self, BookView* view, Pa
 		user_interface_show_error_dialog (self, _tmp17_, _tmp19_);
 #line 997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 4623 "ui.c"
+#line 4624 "ui.c"
 	}
 	__finally19:
 #line 997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -4634,13 +4635,13 @@ static void user_interface_show_page_cb (UserInterface* self, BookView* view, Pa
 		g_clear_error (&_inner_error_);
 #line 997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4638 "ui.c"
+#line 4639 "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 4644 "ui.c"
+#line 4645 "ui.c"
 }
 
 
@@ -4657,7 +4658,7 @@ static void user_interface_show_page_menu_cb (UserInterface* self, BookView* vie
 	_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 4661 "ui.c"
+#line 4662 "ui.c"
 }
 
 
@@ -4679,7 +4680,7 @@ static void user_interface_rotate_left_button_clicked_cb (UserInterface* self, G
 	if (_tmp0_) {
 #line 1018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4683 "ui.c"
+#line 4684 "ui.c"
 	}
 #line 1019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->book_view;
@@ -4695,24 +4696,24 @@ static void user_interface_rotate_left_button_clicked_cb (UserInterface* self, G
 	_tmp5_ = page;
 #line 1020 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp5_ != NULL) {
-#line 4699 "ui.c"
+#line 4700 "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 4705 "ui.c"
+#line 4706 "ui.c"
 	}
 #line 1015 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 4709 "ui.c"
+#line 4710 "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 4716 "ui.c"
+#line 4717 "ui.c"
 }
 
 
@@ -4734,7 +4735,7 @@ static void user_interface_rotate_right_button_clicked_cb (UserInterface* self,
 	if (_tmp0_) {
 #line 1028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4738 "ui.c"
+#line 4739 "ui.c"
 	}
 #line 1029 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->book_view;
@@ -4750,24 +4751,24 @@ static void user_interface_rotate_right_button_clicked_cb (UserInterface* self,
 	_tmp5_ = page;
 #line 1030 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp5_ != NULL) {
-#line 4754 "ui.c"
+#line 4755 "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 4760 "ui.c"
+#line 4761 "ui.c"
 	}
 #line 1025 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 4764 "ui.c"
+#line 4765 "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 4771 "ui.c"
+#line 4772 "ui.c"
 }
 
 
@@ -4796,7 +4797,7 @@ static void user_interface_set_crop (UserInterface* self, const gchar* crop_name
 	if (_tmp2_) {
 #line 1039 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4800 "ui.c"
+#line 4801 "ui.c"
 	}
 #line 1041 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->book_view;
@@ -4818,26 +4819,26 @@ static void user_interface_set_crop (UserInterface* self, const gchar* crop_name
 		_page_unref0 (page);
 #line 1045 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4822 "ui.c"
+#line 4823 "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 4828 "ui.c"
+#line 4829 "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 4834 "ui.c"
+#line 4835 "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 4841 "ui.c"
+#line 4842 "ui.c"
 			gint width = 0;
 			Page* _tmp11_ = NULL;
 			gint _tmp12_ = 0;
@@ -4902,7 +4903,7 @@ static void user_interface_set_crop (UserInterface* self, const gchar* crop_name
 			_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 4906 "ui.c"
+#line 4907 "ui.c"
 		} else {
 			Page* _tmp27_ = NULL;
 			const gchar* _tmp28_ = NULL;
@@ -4912,12 +4913,12 @@ static void user_interface_set_crop (UserInterface* self, const gchar* crop_name
 			_tmp28_ = crop_name;
 #line 1060 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			page_set_named_crop (_tmp27_, _tmp28_);
-#line 4916 "ui.c"
+#line 4917 "ui.c"
 		}
 	}
 #line 1034 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 4921 "ui.c"
+#line 4922 "ui.c"
 }
 
 
@@ -4939,7 +4940,7 @@ static void user_interface_no_crop_menuitem_toggled_cb (UserInterface* self, Gtk
 	if (_tmp2_) {
 #line 1067 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, NULL);
-#line 4943 "ui.c"
+#line 4944 "ui.c"
 	}
 }
 
@@ -4947,7 +4948,7 @@ static void user_interface_no_crop_menuitem_toggled_cb (UserInterface* self, Gtk
 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 4951 "ui.c"
+#line 4952 "ui.c"
 }
 
 
@@ -4969,7 +4970,7 @@ static void user_interface_custom_crop_menuitem_toggled_cb (UserInterface* self,
 	if (_tmp2_) {
 #line 1074 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "custom");
-#line 4973 "ui.c"
+#line 4974 "ui.c"
 	}
 }
 
@@ -4977,7 +4978,7 @@ static void user_interface_custom_crop_menuitem_toggled_cb (UserInterface* self,
 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 4981 "ui.c"
+#line 4982 "ui.c"
 }
 
 
@@ -4996,7 +4997,7 @@ static void user_interface_crop_button_toggled_cb (UserInterface* self, GtkToggl
 	if (_tmp0_) {
 #line 1081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 5000 "ui.c"
+#line 5001 "ui.c"
 	}
 #line 1083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = widget;
@@ -5006,20 +5007,20 @@ static void user_interface_crop_button_toggled_cb (UserInterface* self, GtkToggl
 	_tmp3_ = _tmp2_;
 #line 1083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp3_) {
-#line 5010 "ui.c"
+#line 5011 "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 5016 "ui.c"
+#line 5017 "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 5023 "ui.c"
+#line 5024 "ui.c"
 	}
 }
 
@@ -5027,7 +5028,7 @@ static void user_interface_crop_button_toggled_cb (UserInterface* self, GtkToggl
 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 5031 "ui.c"
+#line 5032 "ui.c"
 }
 
 
@@ -5046,7 +5047,7 @@ static void user_interface_crop_toolbutton_toggled_cb (UserInterface* self, GtkT
 	if (_tmp0_) {
 #line 1093 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 5050 "ui.c"
+#line 5051 "ui.c"
 	}
 #line 1095 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = widget;
@@ -5056,20 +5057,20 @@ static void user_interface_crop_toolbutton_toggled_cb (UserInterface* self, GtkT
 	_tmp3_ = _tmp2_;
 #line 1095 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp3_) {
-#line 5060 "ui.c"
+#line 5061 "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 5066 "ui.c"
+#line 5067 "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 5073 "ui.c"
+#line 5074 "ui.c"
 	}
 }
 
@@ -5077,7 +5078,7 @@ static void user_interface_crop_toolbutton_toggled_cb (UserInterface* self, GtkT
 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 5081 "ui.c"
+#line 5082 "ui.c"
 }
 
 
@@ -5099,7 +5100,7 @@ static void user_interface_four_by_six_menuitem_toggled_cb (UserInterface* self,
 	if (_tmp2_) {
 #line 1105 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "4x6");
-#line 5103 "ui.c"
+#line 5104 "ui.c"
 	}
 }
 
@@ -5107,7 +5108,7 @@ static void user_interface_four_by_six_menuitem_toggled_cb (UserInterface* self,
 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 5111 "ui.c"
+#line 5112 "ui.c"
 }
 
 
@@ -5129,7 +5130,7 @@ static void user_interface_legal_menuitem_toggled_cb (UserInterface* self, GtkCh
 	if (_tmp2_) {
 #line 1112 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "legal");
-#line 5133 "ui.c"
+#line 5134 "ui.c"
 	}
 }
 
@@ -5137,7 +5138,7 @@ static void user_interface_legal_menuitem_toggled_cb (UserInterface* self, GtkCh
 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 5141 "ui.c"
+#line 5142 "ui.c"
 }
 
 
@@ -5159,7 +5160,7 @@ static void user_interface_letter_menuitem_toggled_cb (UserInterface* self, GtkC
 	if (_tmp2_) {
 #line 1119 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "letter");
-#line 5163 "ui.c"
+#line 5164 "ui.c"
 	}
 }
 
@@ -5167,7 +5168,7 @@ static void user_interface_letter_menuitem_toggled_cb (UserInterface* self, GtkC
 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 5171 "ui.c"
+#line 5172 "ui.c"
 }
 
 
@@ -5189,7 +5190,7 @@ static void user_interface_a6_menuitem_toggled_cb (UserInterface* self, GtkCheck
 	if (_tmp2_) {
 #line 1126 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "A6");
-#line 5193 "ui.c"
+#line 5194 "ui.c"
 	}
 }
 
@@ -5197,7 +5198,7 @@ static void user_interface_a6_menuitem_toggled_cb (UserInterface* self, GtkCheck
 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 5201 "ui.c"
+#line 5202 "ui.c"
 }
 
 
@@ -5219,7 +5220,7 @@ static void user_interface_a5_menuitem_toggled_cb (UserInterface* self, GtkCheck
 	if (_tmp2_) {
 #line 1133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "A5");
-#line 5223 "ui.c"
+#line 5224 "ui.c"
 	}
 }
 
@@ -5227,7 +5228,7 @@ static void user_interface_a5_menuitem_toggled_cb (UserInterface* self, GtkCheck
 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 5231 "ui.c"
+#line 5232 "ui.c"
 }
 
 
@@ -5249,7 +5250,7 @@ static void user_interface_a4_menuitem_toggled_cb (UserInterface* self, GtkCheck
 	if (_tmp2_) {
 #line 1140 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "A4");
-#line 5253 "ui.c"
+#line 5254 "ui.c"
 	}
 }
 
@@ -5257,7 +5258,7 @@ static void user_interface_a4_menuitem_toggled_cb (UserInterface* self, GtkCheck
 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 5261 "ui.c"
+#line 5262 "ui.c"
 }
 
 
@@ -5291,7 +5292,7 @@ static void user_interface_crop_rotate_menuitem_activate_cb (UserInterface* self
 		_page_unref0 (page);
 #line 1148 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 5295 "ui.c"
+#line 5296 "ui.c"
 	}
 #line 1149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = page;
@@ -5299,14 +5300,14 @@ static void user_interface_crop_rotate_menuitem_activate_cb (UserInterface* self
 	page_rotate_crop (_tmp5_);
 #line 1144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 5303 "ui.c"
+#line 5304 "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 5310 "ui.c"
+#line 5311 "ui.c"
 }
 
 
@@ -5347,7 +5348,7 @@ static void user_interface_page_move_left_menuitem_activate_cb (UserInterface* s
 	_tmp7_ = index;
 #line 1157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp7_ > ((guint) 0)) {
-#line 5351 "ui.c"
+#line 5352 "ui.c"
 		Book* _tmp8_ = NULL;
 		Page* _tmp9_ = NULL;
 		guint _tmp10_ = 0U;
@@ -5359,18 +5360,18 @@ static void user_interface_page_move_left_menuitem_activate_cb (UserInterface* s
 		_tmp10_ = index;
 #line 1158 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		book_move_page (_tmp8_, _tmp9_, _tmp10_ - 1);
-#line 5363 "ui.c"
+#line 5364 "ui.c"
 	}
 #line 1153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 5367 "ui.c"
+#line 5368 "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 5374 "ui.c"
+#line 5375 "ui.c"
 }
 
 
@@ -5420,7 +5421,7 @@ static void user_interface_page_move_right_menuitem_activate_cb (UserInterface*
 	_tmp10_ = _tmp9_;
 #line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp7_ < (_tmp10_ - 1)) {
-#line 5424 "ui.c"
+#line 5425 "ui.c"
 		Book* _tmp11_ = NULL;
 		Page* _tmp12_ = NULL;
 		Book* _tmp13_ = NULL;
@@ -5438,18 +5439,18 @@ static void user_interface_page_move_right_menuitem_activate_cb (UserInterface*
 		_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 5442 "ui.c"
+#line 5443 "ui.c"
 	}
 #line 1162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 5446 "ui.c"
+#line 5447 "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 5453 "ui.c"
+#line 5454 "ui.c"
 }
 
 
@@ -5478,14 +5479,14 @@ static void user_interface_page_delete_menuitem_activate_cb (UserInterface* self
 	_tmp5_ = _tmp4_;
 #line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_delete_page (_tmp2_, _tmp5_);
-#line 5482 "ui.c"
+#line 5483 "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 5489 "ui.c"
+#line 5490 "ui.c"
 }
 
 
@@ -5494,7 +5495,7 @@ static Block2Data* block2_data_ref (Block2Data* _data2_) {
 	g_atomic_int_inc (&_data2_->_ref_count_);
 #line 1176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return _data2_;
-#line 5498 "ui.c"
+#line 5499 "ui.c"
 }
 
 
@@ -5503,7 +5504,7 @@ static void block2_data_unref (void * _userdata_) {
 	_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 5507 "ui.c"
+#line 5508 "ui.c"
 		UserInterface* self;
 #line 1176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self = _data2_->self;
@@ -5513,7 +5514,7 @@ static void block2_data_unref (void * _userdata_) {
 		_g_object_unref0 (self);
 #line 1176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_slice_free (Block2Data, _data2_);
-#line 5517 "ui.c"
+#line 5518 "ui.c"
 	}
 }
 
@@ -5534,7 +5535,7 @@ static gboolean __lambda6_ (Block2Data* _data2_, GdkEventKey* e) {
 	_tmp2_ = _tmp1_->state;
 #line 1187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_ == 0) {
-#line 5538 "ui.c"
+#line 5539 "ui.c"
 		GdkEventKey* _tmp3_ = NULL;
 		guint _tmp4_ = 0U;
 #line 1187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -5543,11 +5544,11 @@ static gboolean __lambda6_ (Block2Data* _data2_, GdkEventKey* e) {
 		_tmp4_ = _tmp3_->keyval;
 #line 1187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = _tmp4_ == ((guint) GDK_KEY_Escape);
-#line 5547 "ui.c"
+#line 5548 "ui.c"
 	} else {
 #line 1187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = FALSE;
-#line 5551 "ui.c"
+#line 5552 "ui.c"
 	}
 #line 1187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
@@ -5557,13 +5558,13 @@ static gboolean __lambda6_ (Block2Data* _data2_, GdkEventKey* e) {
 		result = TRUE;
 #line 1190 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 5561 "ui.c"
+#line 5562 "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 5567 "ui.c"
+#line 5568 "ui.c"
 }
 
 
@@ -5572,7 +5573,7 @@ static gboolean ___lambda6__gtk_widget_key_press_event (GtkWidget* _sender, GdkE
 	result = __lambda6_ (self, event);
 #line 1185 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 5576 "ui.c"
+#line 5577 "ui.c"
 }
 
 
@@ -5587,14 +5588,14 @@ static void __lambda7_ (Block2Data* _data2_) {
 	book_combine_sides (_tmp0_);
 #line 1210 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_destroy ((GtkWidget*) _data2_->dialog);
-#line 5591 "ui.c"
+#line 5592 "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 5598 "ui.c"
+#line 5599 "ui.c"
 }
 
 
@@ -5609,14 +5610,14 @@ static void __lambda8_ (Block2Data* _data2_) {
 	book_combine_sides_reverse (_tmp0_);
 #line 1220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_destroy ((GtkWidget*) _data2_->dialog);
-#line 5613 "ui.c"
+#line 5614 "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 5620 "ui.c"
+#line 5621 "ui.c"
 }
 
 
@@ -5631,14 +5632,14 @@ static void __lambda9_ (Block2Data* _data2_) {
 	book_reverse (_tmp0_);
 #line 1230 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_destroy ((GtkWidget*) _data2_->dialog);
-#line 5635 "ui.c"
+#line 5636 "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 5642 "ui.c"
+#line 5643 "ui.c"
 }
 
 
@@ -5648,14 +5649,14 @@ static void __lambda10_ (Block2Data* _data2_) {
 	self = _data2_->self;
 #line 1239 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_destroy ((GtkWidget*) _data2_->dialog);
-#line 5652 "ui.c"
+#line 5653 "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 5659 "ui.c"
+#line 5660 "ui.c"
 }
 
 
@@ -5822,7 +5823,7 @@ static void user_interface_reorder_document (UserInterface* self) {
 	block2_data_unref (_data2_);
 #line 1176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data2_ = NULL;
-#line 5826 "ui.c"
+#line 5827 "ui.c"
 }
 
 
@@ -5831,7 +5832,7 @@ void user_interface_reorder_document_activate_cb (UserInterface* self) {
 	g_return_if_fail (self != NULL);
 #line 1249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_reorder_document (self);
-#line 5835 "ui.c"
+#line 5836 "ui.c"
 }
 
 
@@ -5842,14 +5843,14 @@ static void user_interface_reorder_menuitem_activate_cb (UserInterface* self, Gt
 	g_return_if_fail (widget != NULL);
 #line 1255 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_reorder_document (self);
-#line 5846 "ui.c"
+#line 5847 "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 5853 "ui.c"
+#line 5854 "ui.c"
 }
 
 
@@ -5919,7 +5920,7 @@ static GtkButton* user_interface_make_reorder_button (UserInterface* self, const
 	_g_object_unref0 (vbox);
 #line 1274 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 5923 "ui.c"
+#line 5924 "ui.c"
 }
 
 
@@ -5927,17 +5928,17 @@ static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
 	glong _tmp0_ = 0L;
 	gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 5941 "ui.c"
+#line 5942 "ui.c"
 }
 
 
@@ -5963,19 +5964,19 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar
 	gtk_widget_set_visible ((GtkWidget*) _tmp1_, TRUE);
 #line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page_box = NULL;
-#line 5967 "ui.c"
+#line 5968 "ui.c"
 	{
 		gint i = 0;
 #line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		i = 0;
-#line 5972 "ui.c"
+#line 5973 "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 5979 "ui.c"
+#line 5980 "ui.c"
 				const gchar* _tmp4_ = NULL;
 				gint _tmp5_ = 0;
 				gchar _tmp6_ = '\0';
@@ -6017,13 +6018,13 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar
 				PageIcon* _tmp51_ = NULL;
 #line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (!_tmp2_) {
-#line 6021 "ui.c"
+#line 6022 "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 6027 "ui.c"
+#line 6028 "ui.c"
 				}
 #line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp2_ = FALSE;
@@ -6037,7 +6038,7 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar
 				if (!(_tmp6_ != '\0')) {
 #line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					break;
-#line 6041 "ui.c"
+#line 6042 "ui.c"
 				}
 #line 1285 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp7_ = items;
@@ -6047,7 +6048,7 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar
 				_tmp9_ = string_get (_tmp7_, (glong) _tmp8_);
 #line 1285 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp9_ == '-') {
-#line 6051 "ui.c"
+#line 6052 "ui.c"
 					GtkArrow* a = NULL;
 					GtkArrow* _tmp10_ = NULL;
 					GtkArrow* _tmp11_ = NULL;
@@ -6077,7 +6078,7 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar
 					_g_object_unref0 (a);
 #line 1291 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					continue;
-#line 6081 "ui.c"
+#line 6082 "ui.c"
 				}
 #line 1295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp14_ = items;
@@ -6101,13 +6102,13 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar
 				if (_tmp20_ == '\0') {
 #line 1298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					break;
-#line 6105 "ui.c"
+#line 6106 "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 6111 "ui.c"
+#line 6112 "ui.c"
 					GtkBox* _tmp22_ = NULL;
 					GtkBox* _tmp23_ = NULL;
 					GtkBox* _tmp24_ = NULL;
@@ -6130,7 +6131,7 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar
 					_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 6134 "ui.c"
+#line 6135 "ui.c"
 				}
 #line 1308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				r = 1.0;
@@ -6144,7 +6145,7 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar
 				switch (_tmp26_) {
 #line 1311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					case 'F':
-#line 6148 "ui.c"
+#line 6149 "ui.c"
 					{
 #line 1315 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						r = 0x75 / 255.0;
@@ -6154,11 +6155,11 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar
 						b = 0x7B / 255.0;
 #line 1318 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						break;
-#line 6158 "ui.c"
+#line 6159 "ui.c"
 					}
 #line 1311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					case 'B':
-#line 6162 "ui.c"
+#line 6163 "ui.c"
 					{
 #line 1321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						r = 0xF5 / 255.0;
@@ -6168,11 +6169,11 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar
 						b = 0.0;
 #line 1324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						break;
-#line 6172 "ui.c"
+#line 6173 "ui.c"
 					}
 #line 1311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					case 'C':
-#line 6176 "ui.c"
+#line 6177 "ui.c"
 					{
 						gdouble p = 0.0;
 						const gchar* _tmp27_ = NULL;
@@ -6203,12 +6204,12 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar
 						b = (gdouble) 0;
 #line 1331 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						break;
-#line 6207 "ui.c"
+#line 6208 "ui.c"
 					}
 					default:
 #line 1311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					break;
-#line 6212 "ui.c"
+#line 6213 "ui.c"
 				}
 #line 1335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp33_ = r;
@@ -6266,7 +6267,7 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar
 				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 6270 "ui.c"
+#line 6271 "ui.c"
 			}
 		}
 	}
@@ -6276,7 +6277,7 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar
 	_g_object_unref0 (page_box);
 #line 1344 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 6280 "ui.c"
+#line 6281 "ui.c"
 }
 
 
@@ -6287,14 +6288,14 @@ static void user_interface_save_file_button_clicked_cb (UserInterface* self, Gtk
 	g_return_if_fail (widget != NULL);
 #line 1350 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_document (self, FALSE);
-#line 6291 "ui.c"
+#line 6292 "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 6298 "ui.c"
+#line 6299 "ui.c"
 }
 
 
@@ -6303,7 +6304,7 @@ void user_interface_save_document_activate_cb (UserInterface* self) {
 	g_return_if_fail (self != NULL);
 #line 1355 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_document (self, FALSE);
-#line 6307 "ui.c"
+#line 6308 "ui.c"
 }
 
 
@@ -6332,24 +6333,24 @@ static void user_interface_copy_to_clipboard_button_clicked_cb (UserInterface* s
 	_tmp4_ = page;
 #line 1362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp4_ != NULL) {
-#line 6336 "ui.c"
+#line 6337 "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 6342 "ui.c"
+#line 6343 "ui.c"
 	}
 #line 1359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 6346 "ui.c"
+#line 6347 "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 6353 "ui.c"
+#line 6354 "ui.c"
 }
 
 
@@ -6360,14 +6361,14 @@ static void user_interface_save_as_file_button_clicked_cb (UserInterface* self,
 	g_return_if_fail (widget != NULL);
 #line 1369 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_document (self, TRUE);
-#line 6364 "ui.c"
+#line 6365 "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 6371 "ui.c"
+#line 6372 "ui.c"
 }
 
 
@@ -6376,14 +6377,14 @@ void user_interface_save_as_document_activate_cb (UserInterface* self) {
 	g_return_if_fail (self != NULL);
 #line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_document (self, TRUE);
-#line 6380 "ui.c"
+#line 6381 "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 6387 "ui.c"
+#line 6388 "ui.c"
 }
 
 
@@ -6457,7 +6458,7 @@ static void user_interface_draw_page (UserInterface* self, GtkPrintOperation* op
 	if (_tmp7_ > _tmp9_) {
 #line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		is_landscape = TRUE;
-#line 6461 "ui.c"
+#line 6462 "ui.c"
 	}
 #line 1388 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = page;
@@ -6469,7 +6470,7 @@ static void user_interface_draw_page (UserInterface* self, GtkPrintOperation* op
 	_tmp13_ = is_landscape;
 #line 1388 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp12_ != _tmp13_) {
-#line 6473 "ui.c"
+#line 6474 "ui.c"
 		cairo_t* _tmp14_ = NULL;
 		GtkPrintContext* _tmp15_ = NULL;
 		gdouble _tmp16_ = 0.0;
@@ -6486,7 +6487,7 @@ static void user_interface_draw_page (UserInterface* self, GtkPrintOperation* op
 		_tmp17_ = context;
 #line 1391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		cairo_rotate (_tmp17_, G_PI_2);
-#line 6490 "ui.c"
+#line 6491 "ui.c"
 	}
 #line 1394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = context;
@@ -6532,7 +6533,7 @@ static void user_interface_draw_page (UserInterface* self, GtkPrintOperation* op
 	_page_unref0 (page);
 #line 1377 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_cairo_destroy0 (context);
-#line 6536 "ui.c"
+#line 6537 "ui.c"
 }
 
 
@@ -6552,14 +6553,14 @@ static void user_interface_email_button_clicked_cb (UserInterface* self, GtkWidg
 	_tmp2_ = _tmp1_;
 #line 1405 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_emit_by_name (self, "email", _tmp0_, _tmp2_);
-#line 6556 "ui.c"
+#line 6557 "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 6563 "ui.c"
+#line 6564 "ui.c"
 }
 
 
@@ -6577,14 +6578,14 @@ void user_interface_email_document_activate_cb (UserInterface* self) {
 	_tmp2_ = _tmp1_;
 #line 1410 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_emit_by_name (self, "email", _tmp0_, _tmp2_);
-#line 6581 "ui.c"
+#line 6582 "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 6588 "ui.c"
+#line 6589 "ui.c"
 }
 
 
@@ -6612,13 +6613,13 @@ static void user_interface_print_document (UserInterface* self) {
 	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 6616 "ui.c"
+#line 6617 "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 6622 "ui.c"
+#line 6623 "ui.c"
 			goto __catch20_g_error;
 		}
 	}
@@ -6640,7 +6641,7 @@ static void user_interface_print_document (UserInterface* self) {
 		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 6644 "ui.c"
+#line 6645 "ui.c"
 	}
 	__finally20:
 #line 1419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -6653,7 +6654,7 @@ static void user_interface_print_document (UserInterface* self) {
 		g_clear_error (&_inner_error_);
 #line 1419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 6657 "ui.c"
+#line 6658 "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);
@@ -6661,7 +6662,7 @@ static void user_interface_print_document (UserInterface* self) {
 	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 6665 "ui.c"
+#line 6666 "ui.c"
 }
 
 
@@ -6672,14 +6673,14 @@ static void user_interface_print_button_clicked_cb (UserInterface* self, GtkWidg
 	g_return_if_fail (widget != NULL);
 #line 1434 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_print_document (self);
-#line 6676 "ui.c"
+#line 6677 "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 6683 "ui.c"
+#line 6684 "ui.c"
 }
 
 
@@ -6688,7 +6689,7 @@ void user_interface_print_document_activate_cb (UserInterface* self) {
 	g_return_if_fail (self != NULL);
 #line 1439 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_print_document (self);
-#line 6692 "ui.c"
+#line 6693 "ui.c"
 }
 
 
@@ -6696,7 +6697,7 @@ 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 6700 "ui.c"
+#line 6701 "ui.c"
 	{
 		GdkScreen* _tmp0_ = NULL;
 		GdkScreen* _tmp1_ = NULL;
@@ -6711,7 +6712,7 @@ static void user_interface_launch_help (UserInterface* self) {
 		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 6715 "ui.c"
+#line 6716 "ui.c"
 			goto __catch21_g_error;
 		}
 	}
@@ -6736,7 +6737,7 @@ static void user_interface_launch_help (UserInterface* self) {
 		user_interface_show_error_dialog (self, _tmp3_, _tmp5_);
 #line 1444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 6740 "ui.c"
+#line 6741 "ui.c"
 	}
 	__finally21:
 #line 1444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -6747,7 +6748,7 @@ static void user_interface_launch_help (UserInterface* self) {
 		g_clear_error (&_inner_error_);
 #line 1444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 6751 "ui.c"
+#line 6752 "ui.c"
 	}
 }
 
@@ -6759,14 +6760,14 @@ static void user_interface_help_contents_menuitem_activate_cb (UserInterface* se
 	g_return_if_fail (widget != NULL);
 #line 1459 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_launch_help (self);
-#line 6763 "ui.c"
+#line 6764 "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 6770 "ui.c"
+#line 6771 "ui.c"
 }
 
 
@@ -6775,7 +6776,7 @@ void user_interface_help_contents_activate_cb (UserInterface* self) {
 	g_return_if_fail (self != NULL);
 #line 1464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_launch_help (self);
-#line 6779 "ui.c"
+#line 6780 "ui.c"
 }
 
 
@@ -6850,7 +6851,7 @@ static void user_interface_show_about (UserInterface* self) {
 	_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 6843 "ui.c"
+#line 6844 "ui.c"
 }
 
 
@@ -6861,14 +6862,14 @@ static void user_interface_about_menuitem_activate_cb (UserInterface* self, GtkW
 	g_return_if_fail (widget != NULL);
 #line 1498 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_show_about (self);
-#line 6854 "ui.c"
+#line 6855 "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 6861 "ui.c"
+#line 6862 "ui.c"
 }
 
 
@@ -6877,7 +6878,7 @@ void user_interface_about_activate_cb (UserInterface* self) {
 	g_return_if_fail (self != NULL);
 #line 1503 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_show_about (self);
-#line 6870 "ui.c"
+#line 6871 "ui.c"
 }
 
 
@@ -6902,7 +6903,7 @@ static gboolean user_interface_on_quit (UserInterface* self) {
 		result = FALSE;
 #line 1512 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 6895 "ui.c"
+#line 6896 "ui.c"
 	}
 #line 1514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_destroy ((GtkWidget*) self);
@@ -6912,7 +6913,7 @@ static gboolean user_interface_on_quit (UserInterface* self) {
 	if (_tmp3_ != ((guint) 0)) {
 #line 1517 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_save_state (self, TRUE);
-#line 6905 "ui.c"
+#line 6906 "ui.c"
 	}
 #line 1519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = self->priv->autosave_manager;
@@ -6922,7 +6923,7 @@ static gboolean user_interface_on_quit (UserInterface* self) {
 	result = TRUE;
 #line 1521 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 6915 "ui.c"
+#line 6916 "ui.c"
 }
 
 
@@ -6933,14 +6934,14 @@ static void user_interface_quit_menuitem_activate_cb (UserInterface* self, GtkWi
 	g_return_if_fail (widget != NULL);
 #line 1527 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_on_quit (self);
-#line 6926 "ui.c"
+#line 6927 "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 6933 "ui.c"
+#line 6934 "ui.c"
 }
 
 
@@ -6949,7 +6950,7 @@ void user_interface_quit_activate_cb (UserInterface* self) {
 	g_return_if_fail (self != NULL);
 #line 1532 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_on_quit (self);
-#line 6942 "ui.c"
+#line 6943 "ui.c"
 }
 
 
@@ -6970,21 +6971,21 @@ static void user_interface_real_size_allocate (GtkWidget* base, GtkAllocation* a
 	_tmp2_ = self->priv->window_is_maximized;
 #line 1539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp2_) {
-#line 6963 "ui.c"
+#line 6964 "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 6969 "ui.c"
+#line 6970 "ui.c"
 	} else {
 #line 1539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = FALSE;
-#line 6973 "ui.c"
+#line 6974 "ui.c"
 	}
 #line 1539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp1_) {
-#line 6977 "ui.c"
+#line 6978 "ui.c"
 		gint _tmp4_ = 0;
 		gint _tmp5_ = 0;
 #line 1541 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -6995,7 +6996,7 @@ static void user_interface_real_size_allocate (GtkWidget* base, GtkAllocation* a
 		self->priv->window_height = _tmp5_;
 #line 1542 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_save_state (self, FALSE);
-#line 6988 "ui.c"
+#line 6989 "ui.c"
 	}
 }
 
@@ -7012,7 +7013,7 @@ static void user_interface_info_bar_response_cb (UserInterface* self, GtkInfoBar
 	switch (_tmp0_) {
 #line 1548 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case 1:
-#line 7005 "ui.c"
+#line 7006 "ui.c"
 		{
 			GtkComboBox* _tmp1_ = NULL;
 			GtkDialog* _tmp2_ = NULL;
@@ -7026,17 +7027,17 @@ static void user_interface_info_bar_response_cb (UserInterface* self, GtkInfoBar
 			gtk_window_present ((GtkWindow*) _tmp2_);
 #line 1554 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 7019 "ui.c"
+#line 7020 "ui.c"
 		}
 #line 1548 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case 2:
-#line 7023 "ui.c"
+#line 7024 "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 7029 "ui.c"
+#line 7030 "ui.c"
 		}
 		default:
 		{
@@ -7054,7 +7055,7 @@ static void user_interface_info_bar_response_cb (UserInterface* self, GtkInfoBar
 			user_interface_update_info_bar (self);
 #line 1564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 7047 "ui.c"
+#line 7048 "ui.c"
 		}
 	}
 }
@@ -7065,7 +7066,7 @@ static Block3Data* block3_data_ref (Block3Data* _data3_) {
 	g_atomic_int_inc (&_data3_->_ref_count_);
 #line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return _data3_;
-#line 7058 "ui.c"
+#line 7059 "ui.c"
 }
 
 
@@ -7074,7 +7075,7 @@ static void block3_data_unref (void * _userdata_) {
 	_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 7067 "ui.c"
+#line 7068 "ui.c"
 		UserInterface* self;
 #line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self = _data3_->self;
@@ -7090,7 +7091,7 @@ static void block3_data_unref (void * _userdata_) {
 		_g_object_unref0 (self);
 #line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_slice_free (Block3Data, _data3_);
-#line 7083 "ui.c"
+#line 7084 "ui.c"
 	}
 }
 
@@ -7102,7 +7103,7 @@ 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 7095 "ui.c"
+#line 7096 "ui.c"
 }
 
 
@@ -7147,7 +7148,7 @@ static void ___lambda13_ (Block3Data* _data3_, GObject* object, GAsyncResult* _r
 	_tmp6_ = g_strdup (_tmp5_);
 #line 1653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result_text = _tmp6_;
-#line 7140 "ui.c"
+#line 7141 "ui.c"
 	{
 		PkResults* results = NULL;
 		GAsyncResult* _tmp7_ = NULL;
@@ -7163,7 +7164,7 @@ static void ___lambda13_ (Block3Data* _data3_, GObject* object, GAsyncResult* _r
 		results = _tmp8_;
 #line 1656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7156 "ui.c"
+#line 7157 "ui.c"
 			goto __catch22_g_error;
 		}
 #line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -7176,13 +7177,13 @@ static void ___lambda13_ (Block3Data* _data3_, GObject* object, GAsyncResult* _r
 		_g_object_unref0 (_tmp10_);
 #line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp11_) {
-#line 7169 "ui.c"
+#line 7170 "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 7175 "ui.c"
+#line 7176 "ui.c"
 		} else {
 			PkError* e = NULL;
 			PkError* _tmp13_ = NULL;
@@ -7211,11 +7212,11 @@ static void ___lambda13_ (Block3Data* _data3_, GObject* object, GAsyncResult* _r
 			result_text = _tmp18_;
 #line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_object_unref0 (e);
-#line 7204 "ui.c"
+#line 7205 "ui.c"
 		}
 #line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (results);
-#line 7208 "ui.c"
+#line 7209 "ui.c"
 	}
 	goto __finally22;
 	__catch22_g_error:
@@ -7245,7 +7246,7 @@ static void ___lambda13_ (Block3Data* _data3_, GObject* object, GAsyncResult* _r
 		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 7238 "ui.c"
+#line 7239 "ui.c"
 	}
 	__finally22:
 #line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -7258,7 +7259,7 @@ static void ___lambda13_ (Block3Data* _data3_, GObject* object, GAsyncResult* _r
 		g_clear_error (&_inner_error_);
 #line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 7251 "ui.c"
+#line 7252 "ui.c"
 	}
 #line 1672 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp23_ = _data3_->instructions_label;
@@ -7268,7 +7269,7 @@ static void ___lambda13_ (Block3Data* _data3_, GObject* object, GAsyncResult* _r
 	gtk_label_set_text (_tmp23_, _tmp24_);
 #line 1646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (result_text);
-#line 7261 "ui.c"
+#line 7262 "ui.c"
 }
 
 
@@ -7277,7 +7278,7 @@ static void ____lambda13__gasync_ready_callback (GObject* source_object, GAsyncR
 	___lambda13_ (self, source_object, res);
 #line 1646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	block3_data_unref (self);
-#line 7270 "ui.c"
+#line 7271 "ui.c"
 }
 
 
@@ -7308,7 +7309,7 @@ static void user_interface_install_drivers (UserInterface* self) {
 	static GQuark _tmp5_label5 = 0;
 #line 1572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	static GQuark _tmp5_label6 = 0;
-#line 7301 "ui.c"
+#line 7302 "ui.c"
 	GtkDialog* dialog = NULL;
 	const gchar* _tmp23_ = NULL;
 	const gchar* _tmp24_ = NULL;
@@ -7396,7 +7397,7 @@ static void user_interface_install_drivers (UserInterface* self) {
 	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 7389 "ui.c"
+#line 7390 "ui.c"
 			default:
 			{
 				const gchar* _tmp7_ = NULL;
@@ -7422,13 +7423,13 @@ static void user_interface_install_drivers (UserInterface* self) {
 				instructions = _tmp10_;
 #line 1582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 7414 "ui.c"
+#line 7415 "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 7420 "ui.c"
+#line 7421 "ui.c"
 			default:
 			{
 				const gchar* _tmp11_ = NULL;
@@ -7454,13 +7455,13 @@ static void user_interface_install_drivers (UserInterface* self) {
 				instructions = _tmp14_;
 #line 1588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 7445 "ui.c"
+#line 7446 "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 7451 "ui.c"
+#line 7452 "ui.c"
 			default:
 			{
 				const gchar* _tmp15_ = NULL;
@@ -7491,13 +7492,13 @@ static void user_interface_install_drivers (UserInterface* self) {
 				_packages_to_install_size_ = packages_to_install_length1;
 #line 1593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 7482 "ui.c"
+#line 7483 "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 7488 "ui.c"
+#line 7489 "ui.c"
 			default:
 			{
 				const gchar* _tmp19_ = NULL;
@@ -7523,7 +7524,7 @@ static void user_interface_install_drivers (UserInterface* self) {
 				instructions = _tmp22_;
 #line 1599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 7513 "ui.c"
+#line 7514 "ui.c"
 			}
 		}
 	}
@@ -7699,7 +7700,7 @@ static void user_interface_install_drivers (UserInterface* self) {
 	_tmp69__length1 = packages_to_install_length1;
 #line 1639 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp69__length1 > 0) {
-#line 7689 "ui.c"
+#line 7690 "ui.c"
 		GtkStack* _tmp70_ = NULL;
 		GtkSpinner* _tmp71_ = NULL;
 		GtkLabel* _tmp72_ = NULL;
@@ -7726,7 +7727,7 @@ static void user_interface_install_drivers (UserInterface* self) {
 		_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 7716 "ui.c"
+#line 7717 "ui.c"
 	}
 #line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp75_ = dialog;
@@ -7752,7 +7753,7 @@ static void user_interface_install_drivers (UserInterface* self) {
 	block3_data_unref (_data3_);
 #line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data3_ = NULL;
-#line 7742 "ui.c"
+#line 7743 "ui.c"
 }
 
 
@@ -7765,7 +7766,7 @@ static void user_interface_install_packages_data_free (gpointer _data) {
 	_g_object_unref0 (_data_->self);
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_slice_free (UserInterfaceInstallPackagesData, _data_);
-#line 7755 "ui.c"
+#line 7756 "ui.c"
 }
 
 
@@ -7804,7 +7805,7 @@ static void user_interface_install_packages (UserInterface* self, gchar** packag
 	_data_->progress_callback_target = _tmp2__target;
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_install_packages_co (_data_);
-#line 7794 "ui.c"
+#line 7795 "ui.c"
 }
 
 
@@ -7815,7 +7816,7 @@ static PkResults* user_interface_install_packages_finish (UserInterface* self, G
 	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 7805 "ui.c"
+#line 7806 "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_));
@@ -7825,7 +7826,7 @@ static PkResults* user_interface_install_packages_finish (UserInterface* self, G
 	_data_->result = NULL;
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 7815 "ui.c"
+#line 7816 "ui.c"
 }
 
 
@@ -7839,34 +7840,34 @@ static void user_interface_install_packages_ready (GObject* source_object, GAsyn
 	_data_->_res_ = _res_;
 #line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_install_packages_co (_data_);
-#line 7829 "ui.c"
+#line 7830 "ui.c"
 }
 
 
 static gint g_ptr_array_get_length (GPtrArray* self) {
 	gint result;
 	guint _tmp0_ = 0U;
-#line 4807 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 4858 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 4807 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 4858 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = self->len;
-#line 4807 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 4858 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = (gint) _tmp0_;
-#line 4807 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 4858 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 7844 "ui.c"
+#line 7845 "ui.c"
 }
 
 
 static void g_ptr_array_set_length (GPtrArray* self, gint value) {
 	gint _tmp0_ = 0;
-#line 4808 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 4859 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_if_fail (self != NULL);
-#line 4808 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 4859 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = value;
-#line 4808 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 4859 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_ptr_array_set_size (self, _tmp0_);
-#line 7856 "ui.c"
+#line 7857 "ui.c"
 }
 
 
@@ -7875,20 +7876,20 @@ static gboolean user_interface_install_packages_co (UserInterfaceInstallPackages
 	switch (_data_->_state_) {
 #line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case 0:
-#line 7865 "ui.c"
+#line 7866 "ui.c"
 		goto _state_0;
 #line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case 1:
-#line 7869 "ui.c"
+#line 7870 "ui.c"
 		goto _state_1;
 #line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case 2:
-#line 7873 "ui.c"
+#line 7874 "ui.c"
 		goto _state_2;
 		default:
 #line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_assert_not_reached ();
-#line 7878 "ui.c"
+#line 7879 "ui.c"
 	}
 	_state_0:
 #line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -7923,7 +7924,7 @@ static gboolean user_interface_install_packages_co (UserInterfaceInstallPackages
 	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 7913 "ui.c"
+#line 7914 "ui.c"
 	_state_1:
 #line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp5_ = NULL;
@@ -7945,17 +7946,17 @@ static gboolean user_interface_install_packages_co (UserInterfaceInstallPackages
 		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 7935 "ui.c"
+#line 7936 "ui.c"
 		} else {
 #line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			g_simple_async_result_complete (_data_->_async_result);
-#line 7939 "ui.c"
+#line 7940 "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 7945 "ui.c"
+#line 7946 "ui.c"
 	}
 #line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp6_ = NULL;
@@ -7975,7 +7976,7 @@ static gboolean user_interface_install_packages_co (UserInterfaceInstallPackages
 	if (_data_->_tmp8_ == NULL) {
 #line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_data_->_tmp7_ = TRUE;
-#line 7965 "ui.c"
+#line 7966 "ui.c"
 	} else {
 #line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_data_->_tmp9_ = NULL;
@@ -7993,7 +7994,7 @@ static gboolean user_interface_install_packages_co (UserInterfaceInstallPackages
 		_data_->_tmp7_ = _data_->_tmp11_ != NULL;
 #line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (_data_->_tmp11_);
-#line 7983 "ui.c"
+#line 7984 "ui.c"
 	}
 #line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_data_->_tmp7_) {
@@ -8007,17 +8008,17 @@ static gboolean user_interface_install_packages_co (UserInterfaceInstallPackages
 		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 7997 "ui.c"
+#line 7998 "ui.c"
 		} else {
 #line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			g_simple_async_result_complete (_data_->_async_result);
-#line 8001 "ui.c"
+#line 8002 "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 8007 "ui.c"
+#line 8008 "ui.c"
 	}
 #line 1693 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp12_ = NULL;
@@ -8083,11 +8084,11 @@ static gboolean user_interface_install_packages_co (UserInterfaceInstallPackages
 	_data_->_tmp22_ = NULL;
 #line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp22_ = _data_->_tmp18_[_data_->_tmp21_];
-#line 8073 "ui.c"
+#line 8074 "ui.c"
 	{
 #line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_data_->i = 0;
-#line 8077 "ui.c"
+#line 8078 "ui.c"
 		{
 #line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_data_->_tmp23_ = TRUE;
@@ -8101,7 +8102,7 @@ static gboolean user_interface_install_packages_co (UserInterfaceInstallPackages
 					_data_->_tmp24_ = _data_->i;
 #line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_data_->i = _data_->_tmp24_ + 1;
-#line 8091 "ui.c"
+#line 8092 "ui.c"
 				}
 #line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp23_ = FALSE;
@@ -8125,7 +8126,7 @@ static gboolean user_interface_install_packages_co (UserInterfaceInstallPackages
 				if (!(_data_->_tmp25_ < _data_->_tmp28_)) {
 #line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					break;
-#line 8115 "ui.c"
+#line 8116 "ui.c"
 				}
 #line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp29_ = NULL;
@@ -8175,7 +8176,7 @@ static gboolean user_interface_install_packages_co (UserInterfaceInstallPackages
 				_data_->_tmp37_ = NULL;
 #line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp37_ = _data_->_tmp29_[_data_->_tmp30_];
-#line 8165 "ui.c"
+#line 8166 "ui.c"
 			}
 		}
 	}
@@ -8205,7 +8206,7 @@ static gboolean user_interface_install_packages_co (UserInterfaceInstallPackages
 	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 8195 "ui.c"
+#line 8196 "ui.c"
 	_state_2:
 #line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp42_ = NULL;
@@ -8233,17 +8234,17 @@ static gboolean user_interface_install_packages_co (UserInterfaceInstallPackages
 		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 8223 "ui.c"
+#line 8224 "ui.c"
 		} else {
 #line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			g_simple_async_result_complete (_data_->_async_result);
-#line 8227 "ui.c"
+#line 8228 "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 8233 "ui.c"
+#line 8234 "ui.c"
 	}
 #line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp43_ = NULL;
@@ -8269,11 +8270,11 @@ static gboolean user_interface_install_packages_co (UserInterfaceInstallPackages
 	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 8259 "ui.c"
+#line 8260 "ui.c"
 	} else {
 #line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_simple_async_result_complete (_data_->_async_result);
-#line 8263 "ui.c"
+#line 8264 "ui.c"
 	}
 #line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_unref (_data_->_async_result);
@@ -8295,17 +8296,17 @@ static gboolean user_interface_install_packages_co (UserInterfaceInstallPackages
 	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 8285 "ui.c"
+#line 8286 "ui.c"
 	} else {
 #line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_simple_async_result_complete (_data_->_async_result);
-#line 8289 "ui.c"
+#line 8290 "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 8295 "ui.c"
+#line 8296 "ui.c"
 }
 
 
@@ -8325,7 +8326,7 @@ static gboolean user_interface_real_window_state_event (GtkWidget* base, GdkEven
 	_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 8315 "ui.c"
+#line 8316 "ui.c"
 		GdkEventWindowState* _tmp0_ = NULL;
 		gboolean _tmp1_ = FALSE;
 #line 1708 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -8334,7 +8335,7 @@ static gboolean user_interface_real_window_state_event (GtkWidget* base, GdkEven
 		_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 8324 "ui.c"
+#line 8325 "ui.c"
 	}
 #line 1710 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = event;
@@ -8342,7 +8343,7 @@ static gboolean user_interface_real_window_state_event (GtkWidget* base, GdkEven
 	_tmp3_ = _tmp2_->changed_mask;
 #line 1710 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if ((_tmp3_ & GDK_WINDOW_STATE_MAXIMIZED) != 0) {
-#line 8332 "ui.c"
+#line 8333 "ui.c"
 		GdkEventWindowState* _tmp4_ = NULL;
 		GdkWindowState _tmp5_ = 0;
 #line 1712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -8353,7 +8354,7 @@ static gboolean user_interface_real_window_state_event (GtkWidget* base, GdkEven
 		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 8343 "ui.c"
+#line 8344 "ui.c"
 	}
 #line 1715 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = event;
@@ -8361,7 +8362,7 @@ static gboolean user_interface_real_window_state_event (GtkWidget* base, GdkEven
 	_tmp7_ = _tmp6_->changed_mask;
 #line 1715 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if ((_tmp7_ & GDK_WINDOW_STATE_FULLSCREEN) != 0) {
-#line 8351 "ui.c"
+#line 8352 "ui.c"
 		GdkEventWindowState* _tmp8_ = NULL;
 		GdkWindowState _tmp9_ = 0;
 #line 1717 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -8372,13 +8373,13 @@ static gboolean user_interface_real_window_state_event (GtkWidget* base, GdkEven
 		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 8362 "ui.c"
+#line 8363 "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 8368 "ui.c"
+#line 8369 "ui.c"
 }
 
 
@@ -8397,7 +8398,7 @@ static gboolean user_interface_window_delete_event_cb (UserInterface* self, GtkW
 	result = !_tmp0_;
 #line 1727 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 8387 "ui.c"
+#line 8388 "ui.c"
 }
 
 
@@ -8406,7 +8407,7 @@ static gboolean _user_interface_window_delete_event_cb_gtk_widget_delete_event (
 	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 8396 "ui.c"
+#line 8397 "ui.c"
 }
 
 
@@ -8450,7 +8451,7 @@ static void user_interface_page_size_changed_cb (UserInterface* self, Page* page
 	self->priv->default_page_dpi = _tmp8_;
 #line 1735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_state (self, FALSE);
-#line 8440 "ui.c"
+#line 8441 "ui.c"
 }
 
 
@@ -8472,21 +8473,21 @@ static void user_interface_page_scan_direction_changed_cb (UserInterface* self,
 	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 8462 "ui.c"
+#line 8463 "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 8469 "ui.c"
+#line 8470 "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 8476 "ui.c"
+#line 8477 "ui.c"
 }
 
 
@@ -8525,7 +8526,7 @@ static void user_interface_page_added_cb (UserInterface* self, Book* book, Page*
 	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 8515 "ui.c"
+#line 8516 "ui.c"
 }
 
 
@@ -8536,7 +8537,7 @@ static void user_interface_reordered_cb (UserInterface* self, Book* book) {
 	g_return_if_fail (book != NULL);
 #line 1756 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_page_menu (self);
-#line 8526 "ui.c"
+#line 8527 "ui.c"
 }
 
 
@@ -8576,11 +8577,11 @@ static void user_interface_page_removed_cb (UserInterface* self, Book* book, Pag
 	if (_tmp6_ == ((guint) 0)) {
 #line 1766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_add_default_page (self);
-#line 8566 "ui.c"
+#line 8567 "ui.c"
 	}
 #line 1768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_page_menu (self);
-#line 8570 "ui.c"
+#line 8571 "ui.c"
 }
 
 
@@ -8658,7 +8659,7 @@ static void user_interface_set_dpi_combo (UserInterface* self, GtkComboBox* comb
 	_tmp10_ = scan_resolutions;
 #line 1779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10__length1 = scan_resolutions_length1;
-#line 8648 "ui.c"
+#line 8649 "ui.c"
 	{
 		gint* dpi_collection = NULL;
 		gint dpi_collection_length1 = 0;
@@ -8670,11 +8671,11 @@ static void user_interface_set_dpi_combo (UserInterface* self, GtkComboBox* comb
 		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 8660 "ui.c"
+#line 8661 "ui.c"
 			gint dpi = 0;
 #line 1779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			dpi = dpi_collection[dpi_it];
-#line 8664 "ui.c"
+#line 8665 "ui.c"
 			{
 				gchar* label = NULL;
 				gint _tmp11_ = 0;
@@ -8694,7 +8695,7 @@ static void user_interface_set_dpi_combo (UserInterface* self, GtkComboBox* comb
 				_tmp12_ = default_dpi;
 #line 1782 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp11_ == _tmp12_) {
-#line 8684 "ui.c"
+#line 8685 "ui.c"
 					const gchar* _tmp13_ = NULL;
 					gint _tmp14_ = 0;
 					gchar* _tmp15_ = NULL;
@@ -8708,14 +8709,14 @@ static void user_interface_set_dpi_combo (UserInterface* self, GtkComboBox* comb
 					_g_free0 (label);
 #line 1784 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					label = _tmp15_;
-#line 8698 "ui.c"
+#line 8699 "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 8705 "ui.c"
+#line 8706 "ui.c"
 						const gchar* _tmp17_ = NULL;
 						gint _tmp18_ = 0;
 						gchar* _tmp19_ = NULL;
@@ -8729,14 +8730,14 @@ static void user_interface_set_dpi_combo (UserInterface* self, GtkComboBox* comb
 						_g_free0 (label);
 #line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						label = _tmp19_;
-#line 8719 "ui.c"
+#line 8720 "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 8726 "ui.c"
+#line 8727 "ui.c"
 							const gchar* _tmp21_ = NULL;
 							gint _tmp22_ = 0;
 							gchar* _tmp23_ = NULL;
@@ -8750,7 +8751,7 @@ static void user_interface_set_dpi_combo (UserInterface* self, GtkComboBox* comb
 							_g_free0 (label);
 #line 1790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							label = _tmp23_;
-#line 8740 "ui.c"
+#line 8741 "ui.c"
 						} else {
 							const gchar* _tmp24_ = NULL;
 							gint _tmp25_ = 0;
@@ -8765,7 +8766,7 @@ static void user_interface_set_dpi_combo (UserInterface* self, GtkComboBox* comb
 							_g_free0 (label);
 #line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							label = _tmp26_;
-#line 8755 "ui.c"
+#line 8756 "ui.c"
 						}
 					}
 				}
@@ -8791,7 +8792,7 @@ static void user_interface_set_dpi_combo (UserInterface* self, GtkComboBox* comb
 				_tmp34_ = current_dpi;
 #line 1799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp33_ == _tmp34_) {
-#line 8781 "ui.c"
+#line 8782 "ui.c"
 					GtkComboBox* _tmp35_ = NULL;
 					GtkTreeIter _tmp36_ = {0};
 #line 1800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -8800,11 +8801,11 @@ static void user_interface_set_dpi_combo (UserInterface* self, GtkComboBox* comb
 					_tmp36_ = iter;
 #line 1800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_combo_box_set_active_iter (_tmp35_, &_tmp36_);
-#line 8790 "ui.c"
+#line 8791 "ui.c"
 				}
 #line 1779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (label);
-#line 8794 "ui.c"
+#line 8795 "ui.c"
 			}
 		}
 	}
@@ -8814,7 +8815,7 @@ static void user_interface_set_dpi_combo (UserInterface* self, GtkComboBox* comb
 	_g_object_unref0 (model);
 #line 1771 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (renderer);
-#line 8804 "ui.c"
+#line 8805 "ui.c"
 }
 
 
@@ -8877,26 +8878,26 @@ static void user_interface_needs_saving_cb (UserInterface* self, Book* book) {
 	_tmp14_ = _tmp13_;
 #line 1809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp14_) {
-#line 8867 "ui.c"
+#line 8868 "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 8873 "ui.c"
+#line 8874 "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 8879 "ui.c"
+#line 8880 "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 8886 "ui.c"
+#line 8887 "ui.c"
 }
 
 
@@ -8909,14 +8910,14 @@ static void __lambda14_ (UserInterface* self) {
 	_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 8899 "ui.c"
+#line 8900 "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 8906 "ui.c"
+#line 8907 "ui.c"
 }
 
 
@@ -8929,14 +8930,14 @@ static void __lambda15_ (UserInterface* self) {
 	_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 8919 "ui.c"
+#line 8920 "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 8926 "ui.c"
+#line 8927 "ui.c"
 }
 
 
@@ -8949,14 +8950,14 @@ static void __lambda16_ (UserInterface* self) {
 	_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 8939 "ui.c"
+#line 8940 "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 8946 "ui.c"
+#line 8947 "ui.c"
 }
 
 
@@ -8981,14 +8982,14 @@ static void __lambda17_ (UserInterface* self) {
 	_tmp3_ = self->priv->settings;
 #line 1943 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp3_, "paper-height", h);
-#line 8971 "ui.c"
+#line 8972 "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 8978 "ui.c"
+#line 8979 "ui.c"
 }
 
 
@@ -9004,14 +9005,14 @@ static void __lambda18_ (UserInterface* self) {
 	_tmp2_ = _tmp1_;
 #line 1954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp0_, "brightness", _tmp2_);
-#line 8994 "ui.c"
+#line 8995 "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 9001 "ui.c"
+#line 9002 "ui.c"
 }
 
 
@@ -9027,14 +9028,14 @@ static void __lambda19_ (UserInterface* self) {
 	_tmp2_ = _tmp1_;
 #line 1964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp0_, "contrast", _tmp2_);
-#line 9017 "ui.c"
+#line 9018 "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 9024 "ui.c"
+#line 9025 "ui.c"
 }
 
 
@@ -9050,42 +9051,42 @@ static void __lambda20_ (UserInterface* self) {
 	_tmp2_ = _tmp1_;
 #line 1974 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp0_, "jpeg-quality", _tmp2_);
-#line 9040 "ui.c"
+#line 9041 "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 9047 "ui.c"
+#line 9048 "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 9054 "ui.c"
+#line 9055 "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 9061 "ui.c"
+#line 9062 "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 9068 "ui.c"
+#line 9069 "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 9075 "ui.c"
+#line 9076 "ui.c"
 }
 
 
@@ -9095,50 +9096,53 @@ static void user_interface_load (UserInterface* self) {
 	GApplication* _tmp1_ = NULL;
 	GtkApplication* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
-	gboolean _tmp5_ = FALSE;
-	gboolean _tmp6_ = FALSE;
-	GtkApplication* _tmp59_ = NULL;
-	GtkInfoBar* _tmp60_ = NULL;
-	GtkInfoBar* _tmp61_ = NULL;
-	GtkBox* _tmp62_ = NULL;
-	GtkInfoBar* _tmp63_ = NULL;
+	GtkApplication* _tmp53_ = NULL;
+	GtkInfoBar* _tmp54_ = NULL;
+	GtkInfoBar* _tmp55_ = NULL;
+	GtkBox* _tmp56_ = NULL;
+	GtkInfoBar* _tmp57_ = NULL;
 	GtkBox* hbox = NULL;
-	GtkBox* _tmp64_ = NULL;
+	GtkBox* _tmp58_ = NULL;
 	GtkContainer* content_area = NULL;
-	GtkInfoBar* _tmp65_ = NULL;
-	GtkContainer* _tmp66_ = NULL;
-	GtkContainer* _tmp67_ = NULL;
-	GtkContainer* _tmp68_ = NULL;
-	GtkBox* _tmp69_ = NULL;
-	GtkBox* _tmp70_ = NULL;
-	GtkImage* _tmp71_ = NULL;
-	GtkBox* _tmp72_ = NULL;
-	GtkImage* _tmp73_ = NULL;
-	GtkImage* _tmp74_ = NULL;
-	GtkLabel* _tmp75_ = NULL;
-	GtkLabel* _tmp76_ = NULL;
-	GtkBox* _tmp77_ = NULL;
-	GtkLabel* _tmp78_ = NULL;
-	GtkLabel* _tmp79_ = NULL;
-	GtkInfoBar* _tmp80_ = NULL;
-	const gchar* _tmp81_ = NULL;
-	GtkButton* _tmp82_ = NULL;
-	GtkButton* _tmp83_ = NULL;
-	GtkInfoBar* _tmp84_ = NULL;
-	const gchar* _tmp85_ = NULL;
-	GtkButton* _tmp86_ = NULL;
-	GtkButton* _tmp87_ = NULL;
-	GtkInfoBar* _tmp88_ = NULL;
-	const gchar* _tmp89_ = NULL;
-	GtkButton* _tmp90_ = NULL;
-	GtkButton* _tmp91_ = 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* _tmp92_ = NULL;
-	GtkTreeIter _tmp93_ = {0};
-	GtkListStore* _tmp94_ = NULL;
-	GtkTreeIter _tmp95_ = {0};
-	const gchar* _tmp96_ = NULL;
+	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;
@@ -9157,145 +9161,139 @@ static void user_interface_load (UserInterface* self) {
 	GtkTreeIter _tmp112_ = {0};
 	GtkListStore* _tmp113_ = NULL;
 	GtkTreeIter _tmp114_ = {0};
-	GtkListStore* _tmp115_ = NULL;
-	GtkTreeIter _tmp116_ = {0};
-	GtkListStore* _tmp117_ = NULL;
-	GtkTreeIter _tmp118_ = {0};
-	GtkListStore* _tmp119_ = NULL;
-	GtkTreeIter _tmp120_ = {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;
-	GSettings* _tmp127_ = NULL;
-	gint _tmp128_ = 0;
-	gint _tmp129_ = 0;
-	GtkComboBox* _tmp130_ = NULL;
-	gint _tmp131_ = 0;
-	GtkComboBox* _tmp132_ = NULL;
 	GtkCellRendererText* renderer = NULL;
-	GtkCellRendererText* _tmp133_ = NULL;
-	GtkComboBox* _tmp134_ = NULL;
-	GtkCellRendererText* _tmp135_ = NULL;
-	GtkComboBox* _tmp136_ = NULL;
-	GtkCellRendererText* _tmp137_ = NULL;
-	GtkCellRendererText* _tmp138_ = 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;
-	GSettings* _tmp143_ = NULL;
-	gint _tmp144_ = 0;
-	GtkComboBox* _tmp145_ = NULL;
-	GtkCellRendererText* _tmp146_ = NULL;
-	GtkComboBox* _tmp147_ = NULL;
-	GtkCellRendererText* _tmp148_ = NULL;
-	GtkComboBox* _tmp149_ = NULL;
-	GtkCellRendererText* _tmp150_ = NULL;
+	GtkComboBox* _tmp143_ = NULL;
+	GtkCellRendererText* _tmp144_ = NULL;
 	gint paper_width = 0;
-	GSettings* _tmp151_ = NULL;
-	gint _tmp152_ = 0;
+	GSettings* _tmp145_ = NULL;
+	gint _tmp146_ = 0;
 	gint paper_height = 0;
-	GSettings* _tmp153_ = NULL;
-	gint _tmp154_ = 0;
-	gint _tmp155_ = 0;
-	gint _tmp156_ = 0;
-	GtkComboBox* _tmp157_ = NULL;
+	GSettings* _tmp147_ = NULL;
+	gint _tmp148_ = 0;
+	gint _tmp149_ = 0;
+	gint _tmp150_ = 0;
+	GtkComboBox* _tmp151_ = NULL;
 	gdouble lower = 0.0;
-	GtkAdjustment* _tmp158_ = NULL;
-	gdouble _tmp159_ = 0.0;
-	gdouble _tmp160_ = 0.0;
+	GtkAdjustment* _tmp152_ = NULL;
+	gdouble _tmp153_ = 0.0;
+	gdouble _tmp154_ = 0.0;
 	gchar* darker_label = NULL;
-	const gchar* _tmp161_ = NULL;
-	gchar* _tmp162_ = NULL;
+	const gchar* _tmp155_ = NULL;
+	gchar* _tmp156_ = NULL;
 	gdouble upper = 0.0;
-	GtkAdjustment* _tmp163_ = NULL;
-	gdouble _tmp164_ = 0.0;
-	gdouble _tmp165_ = 0.0;
+	GtkAdjustment* _tmp157_ = NULL;
+	gdouble _tmp158_ = 0.0;
+	gdouble _tmp159_ = 0.0;
 	gchar* lighter_label = NULL;
-	const gchar* _tmp166_ = NULL;
-	gchar* _tmp167_ = NULL;
-	GtkScale* _tmp168_ = NULL;
-	gdouble _tmp169_ = 0.0;
-	const gchar* _tmp170_ = NULL;
-	GtkScale* _tmp171_ = NULL;
-	GtkScale* _tmp172_ = 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;
-	const gchar* _tmp174_ = NULL;
-	GSettings* _tmp175_ = NULL;
-	gint _tmp176_ = 0;
+	gdouble _tmp174_ = 0.0;
+	gchar* less_label = NULL;
+	const gchar* _tmp175_ = NULL;
+	gchar* _tmp176_ = NULL;
 	GtkAdjustment* _tmp177_ = NULL;
-	GtkAdjustment* _tmp178_ = NULL;
+	gdouble _tmp178_ = 0.0;
 	gdouble _tmp179_ = 0.0;
-	gdouble _tmp180_ = 0.0;
-	gchar* less_label = NULL;
-	const gchar* _tmp181_ = NULL;
-	gchar* _tmp182_ = NULL;
-	GtkAdjustment* _tmp183_ = NULL;
-	gdouble _tmp184_ = 0.0;
-	gdouble _tmp185_ = 0.0;
 	gchar* more_label = NULL;
-	const gchar* _tmp186_ = NULL;
-	gchar* _tmp187_ = NULL;
-	GtkScale* _tmp188_ = NULL;
-	gdouble _tmp189_ = 0.0;
-	const gchar* _tmp190_ = NULL;
-	GtkScale* _tmp191_ = NULL;
-	GtkScale* _tmp192_ = 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;
-	const gchar* _tmp194_ = NULL;
-	GSettings* _tmp195_ = NULL;
-	gint _tmp196_ = 0;
+	gdouble _tmp194_ = 0.0;
+	gchar* minimum_label = NULL;
+	const gchar* _tmp195_ = NULL;
+	gchar* _tmp196_ = NULL;
 	GtkAdjustment* _tmp197_ = NULL;
-	GtkAdjustment* _tmp198_ = NULL;
+	gdouble _tmp198_ = 0.0;
 	gdouble _tmp199_ = 0.0;
-	gdouble _tmp200_ = 0.0;
-	gchar* minimum_label = NULL;
-	const gchar* _tmp201_ = NULL;
-	gchar* _tmp202_ = NULL;
-	GtkAdjustment* _tmp203_ = NULL;
-	gdouble _tmp204_ = 0.0;
-	gdouble _tmp205_ = 0.0;
 	gchar* maximum_label = NULL;
-	const gchar* _tmp206_ = NULL;
-	gchar* _tmp207_ = NULL;
-	GtkScale* _tmp208_ = NULL;
-	gdouble _tmp209_ = 0.0;
-	const gchar* _tmp210_ = NULL;
-	GtkScale* _tmp211_ = NULL;
-	GtkScale* _tmp212_ = NULL;
-	gdouble _tmp213_ = 0.0;
-	const gchar* _tmp214_ = NULL;
-	GSettings* _tmp215_ = NULL;
-	gint _tmp216_ = 0;
-	GtkAdjustment* _tmp217_ = 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* _tmp218_ = NULL;
-	gchar* _tmp219_ = NULL;
-	const gchar* _tmp220_ = NULL;
-	Book* _tmp222_ = 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;
-	GtkBox* _tmp225_ = NULL;
-	BookView* _tmp226_ = NULL;
-	BookView* _tmp227_ = NULL;
-	BookView* _tmp228_ = NULL;
-	BookView* _tmp229_ = NULL;
-	BookView* _tmp230_ = NULL;
-	GtkDialog* _tmp231_ = NULL;
-	GtkDialog* _tmp232_ = NULL;
-	gint _tmp233_ = 0;
-	gint _tmp234_ = 0;
-	gint _tmp235_ = 0;
-	gint _tmp236_ = 0;
-	gboolean _tmp237_ = FALSE;
-	gboolean _tmp238_ = FALSE;
-	const gchar* _tmp239_ = NULL;
-	ProgressBarDialog* _tmp240_ = NULL;
-	Book* _tmp241_ = 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"
@@ -9311,911 +9309,872 @@ static void user_interface_load (UserInterface* self) {
 #line 1820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	app = _tmp2_;
 #line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp6_ = user_interface_is_desktop (self, "Unity");
-#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp6_) {
-#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp5_ = TRUE;
-#line 9306 "ui.c"
-	} else {
-		gboolean _tmp7_ = FALSE;
-#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp7_ = user_interface_is_desktop (self, "XFCE");
-#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp5_ = _tmp7_;
-#line 9313 "ui.c"
-	}
-#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp5_) {
-#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp4_ = TRUE;
-#line 9319 "ui.c"
-	} else {
-		gboolean _tmp8_ = FALSE;
-#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp8_ = user_interface_is_desktop (self, "MATE");
-#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp4_ = _tmp8_;
-#line 9326 "ui.c"
-	}
-#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp4_) {
-#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp3_ = TRUE;
-#line 9332 "ui.c"
-	} else {
-		gboolean _tmp9_ = FALSE;
-#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp9_ = user_interface_is_desktop (self, "LXDE");
-#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp3_ = _tmp9_;
-#line 9339 "ui.c"
-	}
+	_tmp3_ = user_interface_is_traditional_desktop (self);
 #line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp3_) {
-#line 9343 "ui.c"
-		GtkMenuBar* _tmp10_ = NULL;
-		GtkToolbar* _tmp11_ = NULL;
+#line 9302 "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"
-		_tmp10_ = self->priv->menubar;
+		_tmp4_ = self->priv->menubar;
 #line 1825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_widget_set_visible ((GtkWidget*) _tmp10_, TRUE);
+		gtk_widget_set_visible ((GtkWidget*) _tmp4_, TRUE);
 #line 1826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp11_ = self->priv->toolbar;
+		_tmp5_ = self->priv->toolbar;
 #line 1826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_widget_set_visible ((GtkWidget*) _tmp11_, TRUE);
-#line 9356 "ui.c"
+		gtk_widget_set_visible ((GtkWidget*) _tmp5_, TRUE);
+#line 9315 "ui.c"
 	} else {
-		GtkApplication* _tmp12_ = NULL;
+		GtkApplication* _tmp6_ = NULL;
 		GMenu* appmenu = NULL;
-		GMenu* _tmp13_ = 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;
-		GMenu* _tmp21_ = NULL;
-		GMenu* menu = NULL;
+		const gchar* _tmp21_ = NULL;
 		GMenu* _tmp22_ = NULL;
-		GMenu* _tmp23_ = NULL;
-		const gchar* _tmp24_ = NULL;
-		GMenu* _tmp25_ = 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;
-		const gchar* _tmp31_ = NULL;
+		GMenu* _tmp31_ = NULL;
 		GMenu* _tmp32_ = NULL;
-		const gchar* _tmp33_ = NULL;
-		GMenu* _tmp34_ = NULL;
-		const gchar* _tmp35_ = NULL;
+		GMenu* _tmp33_ = NULL;
+		const gchar* _tmp34_ = NULL;
+		GMenu* _tmp35_ = NULL;
 		GMenu* _tmp36_ = NULL;
 		GMenu* _tmp37_ = NULL;
 		GMenu* _tmp38_ = NULL;
-		GMenu* _tmp39_ = NULL;
-		const gchar* _tmp40_ = NULL;
-		GMenu* _tmp41_ = NULL;
+		const gchar* _tmp39_ = NULL;
+		GMenu* _tmp40_ = NULL;
+		const gchar* _tmp41_ = NULL;
 		GMenu* _tmp42_ = NULL;
-		GMenu* _tmp43_ = NULL;
-		GMenu* _tmp44_ = NULL;
-		const gchar* _tmp45_ = NULL;
-		GMenu* _tmp46_ = NULL;
-		const gchar* _tmp47_ = NULL;
-		GMenu* _tmp48_ = NULL;
-		const gchar* _tmp49_ = 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;
-		GMenu* _tmp51_ = NULL;
+		GtkApplication* _tmp51_ = NULL;
 		GtkApplication* _tmp52_ = NULL;
-		GtkApplication* _tmp53_ = NULL;
-		GtkApplication* _tmp54_ = NULL;
-		GtkApplication* _tmp55_ = NULL;
-		GtkApplication* _tmp56_ = NULL;
-		GtkApplication* _tmp57_ = NULL;
-		GtkApplication* _tmp58_ = NULL;
 #line 1830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp12_ = app;
+		_tmp6_ = app;
 #line 1830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_action_map_add_action_entries ((GActionMap*) _tmp12_, USER_INTERFACE_action_entries, G_N_ELEMENTS (USER_INTERFACE_action_entries), self);
+		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"
-		_tmp13_ = g_menu_new ();
+		_tmp7_ = g_menu_new ();
 #line 1832 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		appmenu = _tmp13_;
+		appmenu = _tmp7_;
 #line 1833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp14_ = g_menu_new ();
+		_tmp8_ = g_menu_new ();
 #line 1833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		section = _tmp14_;
+		section = _tmp8_;
 #line 1834 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp15_ = appmenu;
+		_tmp9_ = appmenu;
 #line 1834 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp16_ = section;
+		_tmp10_ = section;
 #line 1834 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_menu_append_section (_tmp15_, NULL, (GMenuModel*) _tmp16_);
+		g_menu_append_section (_tmp9_, NULL, (GMenuModel*) _tmp10_);
 #line 1835 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp17_ = section;
+		_tmp11_ = section;
 #line 1835 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp18_ = _ ("New Document");
+		_tmp12_ = _ ("New Document");
 #line 1835 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_menu_append (_tmp17_, _tmp18_, "app.new_document");
+		g_menu_append (_tmp11_, _tmp12_, "app.new_document");
 #line 1837 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp19_ = g_menu_new ();
+		_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 = _tmp19_;
+		section = _tmp13_;
 #line 1838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp20_ = appmenu;
+		_tmp14_ = appmenu;
 #line 1838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp21_ = section;
+		_tmp15_ = section;
 #line 1838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_menu_append_section (_tmp20_, NULL, (GMenuModel*) _tmp21_);
+		g_menu_append_section (_tmp14_, NULL, (GMenuModel*) _tmp15_);
 #line 1839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp22_ = g_menu_new ();
+		_tmp16_ = g_menu_new ();
 #line 1839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		menu = _tmp22_;
+		menu = _tmp16_;
 #line 1840 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp23_ = section;
+		_tmp17_ = section;
 #line 1840 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp24_ = _ ("Document");
+		_tmp18_ = _ ("Document");
 #line 1840 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp25_ = menu;
+		_tmp19_ = menu;
 #line 1840 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_menu_append_submenu (_tmp23_, _tmp24_, (GMenuModel*) _tmp25_);
+		g_menu_append_submenu (_tmp17_, _tmp18_, (GMenuModel*) _tmp19_);
 #line 1841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp26_ = menu;
+		_tmp20_ = menu;
 #line 1841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp27_ = _ ("Reorder Pages");
+		_tmp21_ = _ ("Reorder Pages");
 #line 1841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_menu_append (_tmp26_, _tmp27_, "app.reorder");
+		g_menu_append (_tmp20_, _tmp21_, "app.reorder");
 #line 1842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp28_ = menu;
+		_tmp22_ = menu;
 #line 1842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp29_ = _ ("Save");
+		_tmp23_ = _ ("Save");
 #line 1842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_menu_append (_tmp28_, _tmp29_, "app.save");
+		g_menu_append (_tmp22_, _tmp23_, "app.save");
 #line 1843 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp30_ = menu;
+		_tmp24_ = menu;
 #line 1843 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp31_ = _ ("Save As...");
+		_tmp25_ = _ ("Save As...");
 #line 1843 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_menu_append (_tmp30_, _tmp31_, "app.save_as");
+		g_menu_append (_tmp24_, _tmp25_, "app.save_as");
 #line 1844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp32_ = menu;
+		_tmp26_ = menu;
 #line 1844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp33_ = _ ("Email...");
+		_tmp27_ = _ ("Email...");
 #line 1844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_menu_append (_tmp32_, _tmp33_, "app.email");
+		g_menu_append (_tmp26_, _tmp27_, "app.email");
 #line 1845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp34_ = menu;
+		_tmp28_ = menu;
 #line 1845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp35_ = _ ("Print...");
+		_tmp29_ = _ ("Print...");
 #line 1845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_menu_append (_tmp34_, _tmp35_, "app.print");
+		g_menu_append (_tmp28_, _tmp29_, "app.print");
 #line 1847 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp36_ = g_menu_new ();
+		_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 = _tmp36_;
+		section = _tmp30_;
 #line 1848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp37_ = appmenu;
+		_tmp31_ = appmenu;
 #line 1848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp38_ = section;
+		_tmp32_ = section;
 #line 1848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_menu_append_section (_tmp37_, NULL, (GMenuModel*) _tmp38_);
+		g_menu_append_section (_tmp31_, NULL, (GMenuModel*) _tmp32_);
 #line 1849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp39_ = section;
+		_tmp33_ = section;
 #line 1849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp40_ = _ ("Preferences");
+		_tmp34_ = _ ("Preferences");
 #line 1849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_menu_append (_tmp39_, _tmp40_, "app.preferences");
+		g_menu_append (_tmp33_, _tmp34_, "app.preferences");
 #line 1851 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp41_ = g_menu_new ();
+		_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 = _tmp41_;
+		section = _tmp35_;
 #line 1852 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp42_ = appmenu;
+		_tmp36_ = appmenu;
 #line 1852 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp43_ = section;
+		_tmp37_ = section;
 #line 1852 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_menu_append_section (_tmp42_, NULL, (GMenuModel*) _tmp43_);
+		g_menu_append_section (_tmp36_, NULL, (GMenuModel*) _tmp37_);
 #line 1853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp44_ = section;
+		_tmp38_ = section;
 #line 1853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp45_ = _ ("Help");
+		_tmp39_ = _ ("Help");
 #line 1853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_menu_append (_tmp44_, _tmp45_, "app.help");
+		g_menu_append (_tmp38_, _tmp39_, "app.help");
 #line 1854 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp46_ = section;
+		_tmp40_ = section;
 #line 1854 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp47_ = _ ("About");
+		_tmp41_ = _ ("About");
 #line 1854 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_menu_append (_tmp46_, _tmp47_, "app.about");
+		g_menu_append (_tmp40_, _tmp41_, "app.about");
 #line 1855 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp48_ = section;
+		_tmp42_ = section;
 #line 1855 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp49_ = _ ("Quit");
+		_tmp43_ = _ ("Quit");
 #line 1855 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_menu_append (_tmp48_, _tmp49_, "app.quit");
+		g_menu_append (_tmp42_, _tmp43_, "app.quit");
 #line 1857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp50_ = app;
+		_tmp44_ = app;
 #line 1857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp51_ = appmenu;
+		_tmp45_ = appmenu;
 #line 1857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_application_set_app_menu (_tmp50_, (GMenuModel*) _tmp51_);
+		gtk_application_set_app_menu (_tmp44_, (GMenuModel*) _tmp45_);
 #line 1859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp52_ = app;
+		_tmp46_ = app;
 #line 1859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_application_add_accelerator (_tmp52_, "<Ctrl>N", "app.new_document", NULL);
+		gtk_application_add_accelerator (_tmp46_, "<Ctrl>N", "app.new_document", NULL);
 #line 1860 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp53_ = app;
+		_tmp47_ = app;
 #line 1860 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_application_add_accelerator (_tmp53_, "<Ctrl>S", "app.save", NULL);
+		gtk_application_add_accelerator (_tmp47_, "<Ctrl>S", "app.save", NULL);
 #line 1861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp54_ = app;
+		_tmp48_ = app;
 #line 1861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_application_add_accelerator (_tmp54_, "<Shift><Ctrl>S", "app.save_as", NULL);
+		gtk_application_add_accelerator (_tmp48_, "<Shift><Ctrl>S", "app.save_as", NULL);
 #line 1862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp55_ = app;
+		_tmp49_ = app;
 #line 1862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_application_add_accelerator (_tmp55_, "<Ctrl>E", "app.email", NULL);
+		gtk_application_add_accelerator (_tmp49_, "<Ctrl>E", "app.email", NULL);
 #line 1863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp56_ = app;
+		_tmp50_ = app;
 #line 1863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_application_add_accelerator (_tmp56_, "<Ctrl>P", "app.print", NULL);
+		gtk_application_add_accelerator (_tmp50_, "<Ctrl>P", "app.print", NULL);
 #line 1864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp57_ = app;
+		_tmp51_ = app;
 #line 1864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_application_add_accelerator (_tmp57_, "F1", "app.help", NULL);
+		gtk_application_add_accelerator (_tmp51_, "F1", "app.help", NULL);
 #line 1865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp58_ = app;
+		_tmp52_ = app;
 #line 1865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_application_add_accelerator (_tmp58_, "<Ctrl>Q", "app.quit", NULL);
+		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 9574 "ui.c"
+#line 9533 "ui.c"
 	}
 #line 1867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp59_ = app;
+	_tmp53_ = app;
 #line 1867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_application_add_window (_tmp59_, (GtkWindow*) self);
+	gtk_application_add_window (_tmp53_, (GtkWindow*) self);
 #line 1870 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp60_ = (GtkInfoBar*) gtk_info_bar_new ();
+	_tmp54_ = (GtkInfoBar*) gtk_info_bar_new ();
 #line 1870 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp60_);
+	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 = _tmp60_;
+	self->priv->info_bar = _tmp54_;
 #line 1871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp61_ = self->priv->info_bar;
+	_tmp55_ = self->priv->info_bar;
 #line 1871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp61_, "response", (GCallback) _user_interface_info_bar_response_cb_gtk_info_bar_response, self, 0);
+	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"
-	_tmp62_ = self->priv->main_vbox;
+	_tmp56_ = self->priv->main_vbox;
 #line 1872 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp63_ = self->priv->info_bar;
+	_tmp57_ = self->priv->info_bar;
 #line 1872 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_box_pack_start (_tmp62_, (GtkWidget*) _tmp63_, FALSE, TRUE, (guint) 0);
+	gtk_box_pack_start (_tmp56_, (GtkWidget*) _tmp57_, FALSE, TRUE, (guint) 0);
 #line 1873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp64_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
+	_tmp58_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
 #line 1873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp64_);
+	g_object_ref_sink (_tmp58_);
 #line 1873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	hbox = _tmp64_;
+	hbox = _tmp58_;
 #line 1874 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp65_ = self->priv->info_bar;
+	_tmp59_ = self->priv->info_bar;
 #line 1874 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp66_ = gtk_info_bar_get_content_area (_tmp65_);
+	_tmp60_ = gtk_info_bar_get_content_area (_tmp59_);
 #line 1874 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp67_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp66_, gtk_container_get_type ()) ? ((GtkContainer*) _tmp66_) : NULL);
+	_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 = _tmp67_;
+	content_area = _tmp61_;
 #line 1875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp68_ = content_area;
+	_tmp62_ = content_area;
 #line 1875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp69_ = hbox;
+	_tmp63_ = hbox;
 #line 1875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_container_add (_tmp68_, (GtkWidget*) _tmp69_);
+	gtk_container_add (_tmp62_, (GtkWidget*) _tmp63_);
 #line 1876 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp70_ = hbox;
+	_tmp64_ = hbox;
 #line 1876 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp70_, TRUE);
+	gtk_widget_set_visible ((GtkWidget*) _tmp64_, TRUE);
 #line 1878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp71_ = (GtkImage*) gtk_image_new_from_icon_name ("dialog-warning", GTK_ICON_SIZE_DIALOG);
+	_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 (_tmp71_);
+	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 = _tmp71_;
+	self->priv->info_bar_image = _tmp65_;
 #line 1879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp72_ = hbox;
+	_tmp66_ = hbox;
 #line 1879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp73_ = self->priv->info_bar_image;
+	_tmp67_ = self->priv->info_bar_image;
 #line 1879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_box_pack_start (_tmp72_, (GtkWidget*) _tmp73_, FALSE, TRUE, (guint) 0);
+	gtk_box_pack_start (_tmp66_, (GtkWidget*) _tmp67_, FALSE, TRUE, (guint) 0);
 #line 1880 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp74_ = self->priv->info_bar_image;
+	_tmp68_ = self->priv->info_bar_image;
 #line 1880 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp74_, TRUE);
+	gtk_widget_set_visible ((GtkWidget*) _tmp68_, TRUE);
 #line 1882 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp75_ = (GtkLabel*) gtk_label_new (NULL);
+	_tmp69_ = (GtkLabel*) gtk_label_new (NULL);
 #line 1882 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp75_);
+	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 = _tmp75_;
+	self->priv->info_bar_label = _tmp69_;
 #line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp76_ = self->priv->info_bar_label;
+	_tmp70_ = self->priv->info_bar_label;
 #line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_misc_set_alignment ((GtkMisc*) _tmp76_, 0.0f, 0.5f);
+	gtk_misc_set_alignment ((GtkMisc*) _tmp70_, 0.0f, 0.5f);
 #line 1884 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp77_ = hbox;
+	_tmp71_ = hbox;
 #line 1884 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp78_ = self->priv->info_bar_label;
+	_tmp72_ = self->priv->info_bar_label;
 #line 1884 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_box_pack_start (_tmp77_, (GtkWidget*) _tmp78_, TRUE, TRUE, (guint) 0);
+	gtk_box_pack_start (_tmp71_, (GtkWidget*) _tmp72_, TRUE, TRUE, (guint) 0);
 #line 1885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp79_ = self->priv->info_bar_label;
+	_tmp73_ = self->priv->info_bar_label;
 #line 1885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp79_, TRUE);
+	gtk_widget_set_visible ((GtkWidget*) _tmp73_, TRUE);
 #line 1887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp80_ = self->priv->info_bar;
+	_tmp74_ = self->priv->info_bar;
 #line 1887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp81_ = _ ("_Close");
+	_tmp75_ = _ ("_Close");
 #line 1887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp82_ = gtk_info_bar_add_button (_tmp80_, _tmp81_, (gint) GTK_RESPONSE_CLOSE);
+	_tmp76_ = gtk_info_bar_add_button (_tmp74_, _tmp75_, (gint) GTK_RESPONSE_CLOSE);
 #line 1887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp83_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp82_, gtk_button_get_type ()) ? ((GtkButton*) _tmp82_) : NULL);
+	_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 = _tmp83_;
+	self->priv->info_bar_close_button = _tmp77_;
 #line 1888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp84_ = self->priv->info_bar;
+	_tmp78_ = self->priv->info_bar;
 #line 1888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp85_ = _ ("Change _Scanner");
+	_tmp79_ = _ ("Change _Scanner");
 #line 1888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp86_ = gtk_info_bar_add_button (_tmp84_, _tmp85_, 1);
+	_tmp80_ = gtk_info_bar_add_button (_tmp78_, _tmp79_, 1);
 #line 1888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp87_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp86_, gtk_button_get_type ()) ? ((GtkButton*) _tmp86_) : NULL);
+	_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 = _tmp87_;
+	self->priv->info_bar_change_scanner_button = _tmp81_;
 #line 1890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp88_ = self->priv->info_bar;
+	_tmp82_ = self->priv->info_bar;
 #line 1890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp89_ = _ ("_Install Drivers");
+	_tmp83_ = _ ("_Install Drivers");
 #line 1890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp90_ = gtk_info_bar_add_button (_tmp88_, _tmp89_, 2);
+	_tmp84_ = gtk_info_bar_add_button (_tmp82_, _tmp83_, 2);
 #line 1890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp91_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp90_, gtk_button_get_type ()) ? ((GtkButton*) _tmp90_) : NULL);
+	_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 = _tmp91_;
+	self->priv->info_bar_install_button = _tmp85_;
 #line 1894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp92_ = self->priv->paper_size_model;
+	_tmp86_ = self->priv->paper_size_model;
 #line 1894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_append (_tmp92_, &_tmp93_);
+	gtk_list_store_append (_tmp86_, &_tmp87_);
 #line 1894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp93_;
+	iter = _tmp87_;
 #line 1895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp94_ = self->priv->paper_size_model;
+	_tmp88_ = self->priv->paper_size_model;
 #line 1895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp95_ = iter;
+	_tmp89_ = iter;
 #line 1895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp96_ = _ ("Automatic");
+	_tmp90_ = _ ("Automatic");
 #line 1895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp94_, &_tmp95_, 0, 0, 1, 0, 2, _tmp96_, -1, -1);
+	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"
-	_tmp97_ = self->priv->paper_size_model;
+	_tmp91_ = self->priv->paper_size_model;
 #line 1898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_append (_tmp97_, &_tmp98_);
+	gtk_list_store_append (_tmp91_, &_tmp92_);
 #line 1898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp98_;
+	iter = _tmp92_;
 #line 1899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp99_ = self->priv->paper_size_model;
+	_tmp93_ = self->priv->paper_size_model;
 #line 1899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp100_ = iter;
+	_tmp94_ = iter;
 #line 1899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp99_, &_tmp100_, 0, 1050, 1, 1480, 2, "A6", -1, -1);
+	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"
-	_tmp101_ = self->priv->paper_size_model;
+	_tmp95_ = self->priv->paper_size_model;
 #line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_append (_tmp101_, &_tmp102_);
+	gtk_list_store_append (_tmp95_, &_tmp96_);
 #line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp102_;
+	iter = _tmp96_;
 #line 1901 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp103_ = self->priv->paper_size_model;
+	_tmp97_ = self->priv->paper_size_model;
 #line 1901 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp104_ = iter;
+	_tmp98_ = iter;
 #line 1901 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp103_, &_tmp104_, 0, 1480, 1, 2100, 2, "A5", -1, -1);
+	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"
-	_tmp105_ = self->priv->paper_size_model;
+	_tmp99_ = self->priv->paper_size_model;
 #line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_append (_tmp105_, &_tmp106_);
+	gtk_list_store_append (_tmp99_, &_tmp100_);
 #line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp106_;
+	iter = _tmp100_;
 #line 1903 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp107_ = self->priv->paper_size_model;
+	_tmp101_ = self->priv->paper_size_model;
 #line 1903 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp108_ = iter;
+	_tmp102_ = iter;
 #line 1903 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp107_, &_tmp108_, 0, 2100, 1, 2970, 2, "A4", -1, -1);
+	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"
-	_tmp109_ = self->priv->paper_size_model;
+	_tmp103_ = self->priv->paper_size_model;
 #line 1904 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_append (_tmp109_, &_tmp110_);
+	gtk_list_store_append (_tmp103_, &_tmp104_);
 #line 1904 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp110_;
+	iter = _tmp104_;
 #line 1905 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp111_ = self->priv->paper_size_model;
+	_tmp105_ = self->priv->paper_size_model;
 #line 1905 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp112_ = iter;
+	_tmp106_ = iter;
 #line 1905 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp111_, &_tmp112_, 0, 2159, 1, 2794, 2, "Letter", -1, -1);
+	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"
-	_tmp113_ = self->priv->paper_size_model;
+	_tmp107_ = self->priv->paper_size_model;
 #line 1906 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_append (_tmp113_, &_tmp114_);
+	gtk_list_store_append (_tmp107_, &_tmp108_);
 #line 1906 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp114_;
+	iter = _tmp108_;
 #line 1907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp115_ = self->priv->paper_size_model;
+	_tmp109_ = self->priv->paper_size_model;
 #line 1907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp116_ = iter;
+	_tmp110_ = iter;
 #line 1907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp115_, &_tmp116_, 0, 2159, 1, 3556, 2, "Legal", -1, -1);
+	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"
-	_tmp117_ = self->priv->paper_size_model;
+	_tmp111_ = self->priv->paper_size_model;
 #line 1908 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_append (_tmp117_, &_tmp118_);
+	gtk_list_store_append (_tmp111_, &_tmp112_);
 #line 1908 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp118_;
+	iter = _tmp112_;
 #line 1909 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp119_ = self->priv->paper_size_model;
+	_tmp113_ = self->priv->paper_size_model;
 #line 1909 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp120_ = iter;
+	_tmp114_ = iter;
 #line 1909 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp119_, &_tmp120_, 0, 1016, 1, 1524, 2, "4×6", -1, -1);
+	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"
-	_tmp121_ = self->priv->settings;
+	_tmp115_ = self->priv->settings;
 #line 1911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp122_ = g_settings_get_int (_tmp121_, "text-dpi");
+	_tmp116_ = g_settings_get_int (_tmp115_, "text-dpi");
 #line 1911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	dpi = _tmp122_;
+	dpi = _tmp116_;
 #line 1912 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp123_ = dpi;
+	_tmp117_ = dpi;
 #line 1912 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp123_ <= 0) {
+	if (_tmp117_ <= 0) {
 #line 1913 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		dpi = USER_INTERFACE_DEFAULT_TEXT_DPI;
-#line 9796 "ui.c"
+#line 9755 "ui.c"
 	}
 #line 1914 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp124_ = self->priv->text_dpi_combo;
+	_tmp118_ = self->priv->text_dpi_combo;
 #line 1914 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp125_ = dpi;
+	_tmp119_ = dpi;
 #line 1914 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_set_dpi_combo (self, _tmp124_, USER_INTERFACE_DEFAULT_TEXT_DPI, _tmp125_);
+	user_interface_set_dpi_combo (self, _tmp118_, USER_INTERFACE_DEFAULT_TEXT_DPI, _tmp119_);
 #line 1915 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp126_ = self->priv->text_dpi_combo;
+	_tmp120_ = self->priv->text_dpi_combo;
 #line 1915 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp126_, "changed", (GCallback) ___lambda14__gtk_combo_box_changed, self, 0);
+	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"
-	_tmp127_ = self->priv->settings;
+	_tmp121_ = self->priv->settings;
 #line 1916 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp128_ = g_settings_get_int (_tmp127_, "photo-dpi");
+	_tmp122_ = g_settings_get_int (_tmp121_, "photo-dpi");
 #line 1916 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	dpi = _tmp128_;
+	dpi = _tmp122_;
 #line 1917 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp129_ = dpi;
+	_tmp123_ = dpi;
 #line 1917 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp129_ <= 0) {
+	if (_tmp123_ <= 0) {
 #line 1918 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		dpi = USER_INTERFACE_DEFAULT_PHOTO_DPI;
-#line 9820 "ui.c"
+#line 9779 "ui.c"
 	}
 #line 1919 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp130_ = self->priv->photo_dpi_combo;
+	_tmp124_ = self->priv->photo_dpi_combo;
 #line 1919 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp131_ = dpi;
+	_tmp125_ = dpi;
 #line 1919 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_set_dpi_combo (self, _tmp130_, USER_INTERFACE_DEFAULT_PHOTO_DPI, _tmp131_);
+	user_interface_set_dpi_combo (self, _tmp124_, USER_INTERFACE_DEFAULT_PHOTO_DPI, _tmp125_);
 #line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp132_ = self->priv->photo_dpi_combo;
+	_tmp126_ = self->priv->photo_dpi_combo;
 #line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp132_, "changed", (GCallback) ___lambda15__gtk_combo_box_changed, self, 0);
+	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"
-	_tmp133_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
+	_tmp127_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
 #line 1922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp133_);
+	g_object_ref_sink (_tmp127_);
 #line 1922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	renderer = _tmp133_;
+	renderer = _tmp127_;
 #line 1923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp134_ = self->priv->device_combo;
+	_tmp128_ = self->priv->device_combo;
 #line 1923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp135_ = renderer;
+	_tmp129_ = renderer;
 #line 1923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp134_, (GtkCellRenderer*) _tmp135_, TRUE);
+	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp128_, (GtkCellRenderer*) _tmp129_, TRUE);
 #line 1924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp136_ = self->priv->device_combo;
+	_tmp130_ = self->priv->device_combo;
 #line 1924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp137_ = renderer;
+	_tmp131_ = renderer;
 #line 1924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp136_, (GtkCellRenderer*) _tmp137_, "text", 1);
+	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp130_, (GtkCellRenderer*) _tmp131_, "text", 1);
 #line 1926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp138_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
+	_tmp132_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
 #line 1926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp138_);
+	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 = _tmp138_;
+	renderer = _tmp132_;
 #line 1927 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp139_ = self->priv->page_side_combo;
+	_tmp133_ = self->priv->page_side_combo;
 #line 1927 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp140_ = renderer;
+	_tmp134_ = renderer;
 #line 1927 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp139_, (GtkCellRenderer*) _tmp140_, TRUE);
+	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp133_, (GtkCellRenderer*) _tmp134_, TRUE);
 #line 1928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp141_ = self->priv->page_side_combo;
+	_tmp135_ = self->priv->page_side_combo;
 #line 1928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp142_ = renderer;
+	_tmp136_ = renderer;
 #line 1928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp141_, (GtkCellRenderer*) _tmp142_, "text", 1);
+	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp135_, (GtkCellRenderer*) _tmp136_, "text", 1);
 #line 1929 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp143_ = self->priv->settings;
+	_tmp137_ = self->priv->settings;
 #line 1929 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp144_ = g_settings_get_enum (_tmp143_, "page-side");
+	_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) _tmp144_);
+	user_interface_set_page_side (self, (ScanType) _tmp138_);
 #line 1930 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp145_ = self->priv->page_side_combo;
+	_tmp139_ = self->priv->page_side_combo;
 #line 1930 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp145_, "changed", (GCallback) ___lambda16__gtk_combo_box_changed, self, 0);
+	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"
-	_tmp146_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
+	_tmp140_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
 #line 1932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp146_);
+	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 = _tmp146_;
+	renderer = _tmp140_;
 #line 1933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp147_ = self->priv->paper_size_combo;
+	_tmp141_ = self->priv->paper_size_combo;
 #line 1933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp148_ = renderer;
+	_tmp142_ = renderer;
 #line 1933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp147_, (GtkCellRenderer*) _tmp148_, TRUE);
+	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp141_, (GtkCellRenderer*) _tmp142_, TRUE);
 #line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp149_ = self->priv->paper_size_combo;
+	_tmp143_ = self->priv->paper_size_combo;
 #line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp150_ = renderer;
+	_tmp144_ = renderer;
 #line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp149_, (GtkCellRenderer*) _tmp150_, "text", 2);
+	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp143_, (GtkCellRenderer*) _tmp144_, "text", 2);
 #line 1935 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp151_ = self->priv->settings;
+	_tmp145_ = self->priv->settings;
 #line 1935 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp152_ = g_settings_get_int (_tmp151_, "paper-width");
+	_tmp146_ = g_settings_get_int (_tmp145_, "paper-width");
 #line 1935 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	paper_width = _tmp152_;
+	paper_width = _tmp146_;
 #line 1936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp153_ = self->priv->settings;
+	_tmp147_ = self->priv->settings;
 #line 1936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp154_ = g_settings_get_int (_tmp153_, "paper-height");
+	_tmp148_ = g_settings_get_int (_tmp147_, "paper-height");
 #line 1936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	paper_height = _tmp154_;
+	paper_height = _tmp148_;
 #line 1937 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp155_ = paper_width;
+	_tmp149_ = paper_width;
 #line 1937 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp156_ = paper_height;
+	_tmp150_ = paper_height;
 #line 1937 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_set_paper_size (self, _tmp155_, _tmp156_);
+	user_interface_set_paper_size (self, _tmp149_, _tmp150_);
 #line 1938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp157_ = self->priv->paper_size_combo;
+	_tmp151_ = self->priv->paper_size_combo;
 #line 1938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp157_, "changed", (GCallback) ___lambda17__gtk_combo_box_changed, self, 0);
+	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"
-	_tmp158_ = self->priv->brightness_adjustment;
+	_tmp152_ = self->priv->brightness_adjustment;
 #line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp159_ = gtk_adjustment_get_lower (_tmp158_);
+	_tmp153_ = gtk_adjustment_get_lower (_tmp152_);
 #line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp160_ = _tmp159_;
+	_tmp154_ = _tmp153_;
 #line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	lower = _tmp160_;
+	lower = _tmp154_;
 #line 1947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp161_ = _ ("Darker");
+	_tmp155_ = _ ("Darker");
 #line 1947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp162_ = g_strdup_printf ("<small>%s</small>", _tmp161_);
+	_tmp156_ = g_strdup_printf ("<small>%s</small>", _tmp155_);
 #line 1947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	darker_label = _tmp162_;
+	darker_label = _tmp156_;
 #line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp163_ = self->priv->brightness_adjustment;
+	_tmp157_ = self->priv->brightness_adjustment;
 #line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp164_ = gtk_adjustment_get_upper (_tmp163_);
+	_tmp158_ = gtk_adjustment_get_upper (_tmp157_);
 #line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp165_ = _tmp164_;
+	_tmp159_ = _tmp158_;
 #line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	upper = _tmp165_;
+	upper = _tmp159_;
 #line 1949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp166_ = _ ("Lighter");
+	_tmp160_ = _ ("Lighter");
 #line 1949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp167_ = g_strdup_printf ("<small>%s</small>", _tmp166_);
+	_tmp161_ = g_strdup_printf ("<small>%s</small>", _tmp160_);
 #line 1949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	lighter_label = _tmp167_;
+	lighter_label = _tmp161_;
 #line 1950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp168_ = self->priv->brightness_scale;
+	_tmp162_ = self->priv->brightness_scale;
 #line 1950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp169_ = lower;
+	_tmp163_ = lower;
 #line 1950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp170_ = darker_label;
+	_tmp164_ = darker_label;
 #line 1950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_scale_add_mark (_tmp168_, _tmp169_, GTK_POS_BOTTOM, _tmp170_);
+	gtk_scale_add_mark (_tmp162_, _tmp163_, GTK_POS_BOTTOM, _tmp164_);
 #line 1951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp171_ = self->priv->brightness_scale;
+	_tmp165_ = self->priv->brightness_scale;
 #line 1951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_scale_add_mark (_tmp171_, (gdouble) 0, GTK_POS_BOTTOM, NULL);
+	gtk_scale_add_mark (_tmp165_, (gdouble) 0, GTK_POS_BOTTOM, NULL);
 #line 1952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp172_ = self->priv->brightness_scale;
+	_tmp166_ = self->priv->brightness_scale;
 #line 1952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp173_ = upper;
+	_tmp167_ = upper;
 #line 1952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp174_ = lighter_label;
+	_tmp168_ = lighter_label;
 #line 1952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_scale_add_mark (_tmp172_, _tmp173_, GTK_POS_BOTTOM, _tmp174_);
+	gtk_scale_add_mark (_tmp166_, _tmp167_, GTK_POS_BOTTOM, _tmp168_);
 #line 1953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp175_ = self->priv->settings;
+	_tmp169_ = self->priv->settings;
 #line 1953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp176_ = g_settings_get_int (_tmp175_, "brightness");
+	_tmp170_ = g_settings_get_int (_tmp169_, "brightness");
 #line 1953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_set_brightness (self, _tmp176_);
+	user_interface_set_brightness (self, _tmp170_);
 #line 1954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp177_ = self->priv->brightness_adjustment;
+	_tmp171_ = self->priv->brightness_adjustment;
 #line 1954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp177_, "value-changed", (GCallback) ___lambda18__gtk_adjustment_value_changed, self, 0);
+	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"
-	_tmp178_ = self->priv->contrast_adjustment;
+	_tmp172_ = self->priv->contrast_adjustment;
 #line 1956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp179_ = gtk_adjustment_get_lower (_tmp178_);
+	_tmp173_ = gtk_adjustment_get_lower (_tmp172_);
 #line 1956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp180_ = _tmp179_;
+	_tmp174_ = _tmp173_;
 #line 1956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	lower = _tmp180_;
+	lower = _tmp174_;
 #line 1957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp181_ = _ ("Less");
+	_tmp175_ = _ ("Less");
 #line 1957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp182_ = g_strdup_printf ("<small>%s</small>", _tmp181_);
+	_tmp176_ = g_strdup_printf ("<small>%s</small>", _tmp175_);
 #line 1957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	less_label = _tmp182_;
+	less_label = _tmp176_;
 #line 1958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp183_ = self->priv->contrast_adjustment;
+	_tmp177_ = self->priv->contrast_adjustment;
 #line 1958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp184_ = gtk_adjustment_get_upper (_tmp183_);
+	_tmp178_ = gtk_adjustment_get_upper (_tmp177_);
 #line 1958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp185_ = _tmp184_;
+	_tmp179_ = _tmp178_;
 #line 1958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	upper = _tmp185_;
+	upper = _tmp179_;
 #line 1959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp186_ = _ ("More");
+	_tmp180_ = _ ("More");
 #line 1959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp187_ = g_strdup_printf ("<small>%s</small>", _tmp186_);
+	_tmp181_ = g_strdup_printf ("<small>%s</small>", _tmp180_);
 #line 1959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	more_label = _tmp187_;
+	more_label = _tmp181_;
 #line 1960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp188_ = self->priv->contrast_scale;
+	_tmp182_ = self->priv->contrast_scale;
 #line 1960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp189_ = lower;
+	_tmp183_ = lower;
 #line 1960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp190_ = less_label;
+	_tmp184_ = less_label;
 #line 1960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_scale_add_mark (_tmp188_, _tmp189_, GTK_POS_BOTTOM, _tmp190_);
+	gtk_scale_add_mark (_tmp182_, _tmp183_, GTK_POS_BOTTOM, _tmp184_);
 #line 1961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp191_ = self->priv->contrast_scale;
+	_tmp185_ = self->priv->contrast_scale;
 #line 1961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_scale_add_mark (_tmp191_, (gdouble) 0, GTK_POS_BOTTOM, NULL);
+	gtk_scale_add_mark (_tmp185_, (gdouble) 0, GTK_POS_BOTTOM, NULL);
 #line 1962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp192_ = self->priv->contrast_scale;
+	_tmp186_ = self->priv->contrast_scale;
 #line 1962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp193_ = upper;
+	_tmp187_ = upper;
 #line 1962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp194_ = more_label;
+	_tmp188_ = more_label;
 #line 1962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_scale_add_mark (_tmp192_, _tmp193_, GTK_POS_BOTTOM, _tmp194_);
+	gtk_scale_add_mark (_tmp186_, _tmp187_, GTK_POS_BOTTOM, _tmp188_);
 #line 1963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp195_ = self->priv->settings;
+	_tmp189_ = self->priv->settings;
 #line 1963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp196_ = g_settings_get_int (_tmp195_, "contrast");
+	_tmp190_ = g_settings_get_int (_tmp189_, "contrast");
 #line 1963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_set_contrast (self, _tmp196_);
+	user_interface_set_contrast (self, _tmp190_);
 #line 1964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp197_ = self->priv->contrast_adjustment;
+	_tmp191_ = self->priv->contrast_adjustment;
 #line 1964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp197_, "value-changed", (GCallback) ___lambda19__gtk_adjustment_value_changed, self, 0);
+	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"
-	_tmp198_ = self->priv->quality_adjustment;
+	_tmp192_ = self->priv->quality_adjustment;
 #line 1966 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp199_ = gtk_adjustment_get_lower (_tmp198_);
+	_tmp193_ = gtk_adjustment_get_lower (_tmp192_);
 #line 1966 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp200_ = _tmp199_;
+	_tmp194_ = _tmp193_;
 #line 1966 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	lower = _tmp200_;
+	lower = _tmp194_;
 #line 1967 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp201_ = _ ("Minimum");
+	_tmp195_ = _ ("Minimum");
 #line 1967 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp202_ = g_strdup_printf ("<small>%s</small>", _tmp201_);
+	_tmp196_ = g_strdup_printf ("<small>%s</small>", _tmp195_);
 #line 1967 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	minimum_label = _tmp202_;
+	minimum_label = _tmp196_;
 #line 1968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp203_ = self->priv->quality_adjustment;
+	_tmp197_ = self->priv->quality_adjustment;
 #line 1968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp204_ = gtk_adjustment_get_upper (_tmp203_);
+	_tmp198_ = gtk_adjustment_get_upper (_tmp197_);
 #line 1968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp205_ = _tmp204_;
+	_tmp199_ = _tmp198_;
 #line 1968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	upper = _tmp205_;
+	upper = _tmp199_;
 #line 1969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp206_ = _ ("Maximum");
+	_tmp200_ = _ ("Maximum");
 #line 1969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp207_ = g_strdup_printf ("<small>%s</small>", _tmp206_);
+	_tmp201_ = g_strdup_printf ("<small>%s</small>", _tmp200_);
 #line 1969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	maximum_label = _tmp207_;
+	maximum_label = _tmp201_;
 #line 1970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp208_ = self->priv->quality_scale;
+	_tmp202_ = self->priv->quality_scale;
 #line 1970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp209_ = lower;
+	_tmp203_ = lower;
 #line 1970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp210_ = minimum_label;
+	_tmp204_ = minimum_label;
 #line 1970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_scale_add_mark (_tmp208_, _tmp209_, GTK_POS_BOTTOM, _tmp210_);
+	gtk_scale_add_mark (_tmp202_, _tmp203_, GTK_POS_BOTTOM, _tmp204_);
 #line 1971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp211_ = self->priv->quality_scale;
+	_tmp205_ = self->priv->quality_scale;
 #line 1971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_scale_add_mark (_tmp211_, (gdouble) 75, GTK_POS_BOTTOM, NULL);
+	gtk_scale_add_mark (_tmp205_, (gdouble) 75, GTK_POS_BOTTOM, NULL);
 #line 1972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp212_ = self->priv->quality_scale;
+	_tmp206_ = self->priv->quality_scale;
 #line 1972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp213_ = upper;
+	_tmp207_ = upper;
 #line 1972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp214_ = maximum_label;
+	_tmp208_ = maximum_label;
 #line 1972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_scale_add_mark (_tmp212_, _tmp213_, GTK_POS_BOTTOM, _tmp214_);
+	gtk_scale_add_mark (_tmp206_, _tmp207_, GTK_POS_BOTTOM, _tmp208_);
 #line 1973 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp215_ = self->priv->settings;
+	_tmp209_ = self->priv->settings;
 #line 1973 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp216_ = g_settings_get_int (_tmp215_, "jpeg-quality");
+	_tmp210_ = g_settings_get_int (_tmp209_, "jpeg-quality");
 #line 1973 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_set_quality (self, _tmp216_);
+	user_interface_set_quality (self, _tmp210_);
 #line 1974 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp217_ = self->priv->quality_adjustment;
+	_tmp211_ = self->priv->quality_adjustment;
 #line 1974 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp217_, "value-changed", (GCallback) ___lambda20__gtk_adjustment_value_changed, self, 0);
+	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"
-	_tmp218_ = self->priv->settings;
+	_tmp212_ = self->priv->settings;
 #line 1976 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp219_ = g_settings_get_string (_tmp218_, "document-type");
+	_tmp213_ = g_settings_get_string (_tmp212_, "document-type");
 #line 1976 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	document_type = _tmp219_;
+	document_type = _tmp213_;
 #line 1977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp220_ = document_type;
+	_tmp214_ = document_type;
 #line 1977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp220_ != NULL) {
-#line 10106 "ui.c"
-		const gchar* _tmp221_ = NULL;
+	if (_tmp214_ != NULL) {
+#line 10065 "ui.c"
+		const gchar* _tmp215_ = NULL;
 #line 1978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp221_ = document_type;
+		_tmp215_ = document_type;
 #line 1978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_set_document_hint (self, _tmp221_, FALSE);
-#line 10112 "ui.c"
+		user_interface_set_document_hint (self, _tmp215_, FALSE);
+#line 10071 "ui.c"
 	}
 #line 1980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp222_ = self->priv->_book;
+	_tmp216_ = self->priv->_book;
 #line 1980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp223_ = book_view_new (_tmp222_);
+	_tmp217_ = book_view_new (_tmp216_);
 #line 1980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp223_);
+	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 = _tmp223_;
+	self->priv->book_view = _tmp217_;
 #line 1981 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp224_ = self->priv->book_view;
+	_tmp218_ = self->priv->book_view;
 #line 1981 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_container_set_border_width ((GtkContainer*) _tmp224_, (guint) 18);
+	gtk_container_set_border_width ((GtkContainer*) _tmp218_, (guint) 18);
 #line 1982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp225_ = self->priv->main_vbox;
+	_tmp219_ = self->priv->main_vbox;
 #line 1982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp226_ = self->priv->book_view;
+	_tmp220_ = self->priv->book_view;
 #line 1982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_box_pack_end (_tmp225_, (GtkWidget*) _tmp226_, TRUE, TRUE, (guint) 0);
+	gtk_box_pack_end (_tmp219_, (GtkWidget*) _tmp220_, TRUE, TRUE, (guint) 0);
 #line 1983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp227_ = self->priv->book_view;
+	_tmp221_ = self->priv->book_view;
 #line 1983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp227_, "page-selected", (GCallback) _user_interface_page_selected_cb_book_view_page_selected, self, 0);
+	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"
-	_tmp228_ = self->priv->book_view;
+	_tmp222_ = self->priv->book_view;
 #line 1984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp228_, "show-page", (GCallback) _user_interface_show_page_cb_book_view_show_page, self, 0);
+	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"
-	_tmp229_ = self->priv->book_view;
+	_tmp223_ = self->priv->book_view;
 #line 1985 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp229_, "show-menu", (GCallback) _user_interface_show_page_menu_cb_book_view_show_menu, self, 0);
+	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"
-	_tmp230_ = self->priv->book_view;
+	_tmp224_ = self->priv->book_view;
 #line 1986 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp230_, TRUE);
+	gtk_widget_set_visible ((GtkWidget*) _tmp224_, TRUE);
 #line 1988 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp231_ = self->priv->authorize_dialog;
+	_tmp225_ = self->priv->authorize_dialog;
 #line 1988 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_window_set_transient_for ((GtkWindow*) _tmp231_, (GtkWindow*) self);
+	gtk_window_set_transient_for ((GtkWindow*) _tmp225_, (GtkWindow*) self);
 #line 1989 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp232_ = self->priv->preferences_dialog;
+	_tmp226_ = self->priv->preferences_dialog;
 #line 1989 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_window_set_transient_for ((GtkWindow*) _tmp232_, (GtkWindow*) self);
+	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"
-	_tmp233_ = self->priv->window_width;
+	_tmp227_ = self->priv->window_width;
 #line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp234_ = self->priv->window_height;
+	_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", _tmp233_, _tmp234_);
+	g_debug ("ui.vala:1995: Restoring window to %dx%d pixels", _tmp227_, _tmp228_);
 #line 1996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp235_ = self->priv->window_width;
+	_tmp229_ = self->priv->window_width;
 #line 1996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp236_ = self->priv->window_height;
+	_tmp230_ = self->priv->window_height;
 #line 1996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_window_set_default_size ((GtkWindow*) self, _tmp235_, _tmp236_);
+	gtk_window_set_default_size ((GtkWindow*) self, _tmp229_, _tmp230_);
 #line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp237_ = self->priv->window_is_maximized;
+	_tmp231_ = self->priv->window_is_maximized;
 #line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp237_) {
+	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 10180 "ui.c"
+#line 10139 "ui.c"
 	}
 #line 2002 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp238_ = self->priv->window_is_fullscreen;
+	_tmp232_ = self->priv->window_is_fullscreen;
 #line 2002 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp238_) {
+	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 10190 "ui.c"
+#line 10149 "ui.c"
 	}
 #line 2008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp239_ = _ ("Saving document...");
+	_tmp233_ = _ ("Saving document...");
 #line 2008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp240_ = progress_bar_dialog_new ((GtkApplicationWindow*) self, _tmp239_);
+	_tmp234_ = progress_bar_dialog_new ((GtkApplicationWindow*) self, _tmp233_);
 #line 2008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp240_);
+	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 = _tmp240_;
+	self->priv->progress_dialog = _tmp234_;
 #line 2009 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp241_ = self->priv->_book;
+	_tmp235_ = self->priv->_book;
 #line 2009 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp241_, "saving", (GCallback) _user_interface_book_saving_cb_book_saving, self, 0);
+	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"
@@ -10238,7 +10197,7 @@ static void user_interface_load (UserInterface* self) {
 	_g_object_unref0 (hbox);
 #line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (app);
-#line 10228 "ui.c"
+#line 10187 "ui.c"
 }
 
 
@@ -10271,13 +10230,13 @@ static gboolean user_interface_is_desktop (UserInterface* self, const gchar* nam
 		_g_free0 (desktop_name_list);
 #line 2016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 10261 "ui.c"
+#line 10220 "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 10267 "ui.c"
+#line 10226 "ui.c"
 	{
 		gchar** n_collection = NULL;
 		gint n_collection_length1 = 0;
@@ -10289,14 +10248,14 @@ static gboolean user_interface_is_desktop (UserInterface* self, const gchar* nam
 		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 10279 "ui.c"
+#line 10238 "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 10286 "ui.c"
+#line 10245 "ui.c"
 			{
 				const gchar* _tmp7_ = NULL;
 				const gchar* _tmp8_ = NULL;
@@ -10316,16 +10275,16 @@ static gboolean user_interface_is_desktop (UserInterface* self, const gchar* nam
 					_g_free0 (desktop_name_list);
 #line 2020 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					return result;
-#line 10306 "ui.c"
+#line 10265 "ui.c"
 				}
 #line 2018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (n);
-#line 10310 "ui.c"
+#line 10269 "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 10315 "ui.c"
+#line 10274 "ui.c"
 	}
 #line 2022 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
@@ -10333,7 +10292,56 @@ static gboolean user_interface_is_desktop (UserInterface* self, const gchar* nam
 	_g_free0 (desktop_name_list);
 #line 2022 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 10323 "ui.c"
+#line 10282 "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 10292 "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 10304 "ui.c"
+			const gchar* name = NULL;
+#line 2028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			name = name_collection[name_it];
+#line 10308 "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 10322 "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 10331 "ui.c"
 }
 
 
@@ -10363,51 +10371,51 @@ static void user_interface_load_state (UserInterface* self) {
 	gchar* _tmp28_ = NULL;
 	gchar* _tmp29_ = NULL;
 	GQuark _tmp31_ = 0U;
-#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	static GQuark _tmp30_label0 = 0;
-#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	static GQuark _tmp30_label1 = 0;
-#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	static GQuark _tmp30_label2 = 0;
-#line 10359 "ui.c"
+#line 10367 "ui.c"
 	GError * _inner_error_ = NULL;
-#line 2030 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2039 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2032 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2041 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = user_interface_get_state_filename (self);
-#line 2032 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2041 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _tmp0_;
-#line 2032 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2041 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 2032 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_debug ("ui.vala:2032: Loading state from %s", _tmp2_);
-#line 2032 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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 2034 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2043 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = g_key_file_new ();
-#line 2034 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2043 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	f = _tmp3_;
-#line 10377 "ui.c"
+#line 10385 "ui.c"
 	{
 		GKeyFile* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 2037 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2046 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = f;
-#line 2037 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2046 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = user_interface_get_state_filename (self);
-#line 2037 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2046 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = _tmp5_;
-#line 2037 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2046 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = _tmp6_;
-#line 2037 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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 2037 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2046 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_tmp7_);
-#line 2037 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2046 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10397 "ui.c"
+#line 10405 "ui.c"
 			goto __catch23_g_error;
 		}
 	}
@@ -10416,316 +10424,316 @@ static void user_interface_load_state (UserInterface* self) {
 	{
 		GError* e = NULL;
 		GError* _tmp8_ = NULL;
-#line 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2044 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2044 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 2041 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = e;
-#line 2041 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (!g_error_matches (_tmp8_, G_FILE_ERROR, G_FILE_ERROR_NOENT)) {
-#line 10414 "ui.c"
+#line 10422 "ui.c"
 			GError* _tmp9_ = NULL;
 			const gchar* _tmp10_ = NULL;
-#line 2042 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2051 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp9_ = e;
-#line 2042 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2051 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp10_ = _tmp9_->message;
-#line 2042 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			g_warning ("ui.vala:2042: Failed to load state: %s", _tmp10_);
-#line 10423 "ui.c"
+#line 2051 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			g_warning ("ui.vala:2051: Failed to load state: %s", _tmp10_);
+#line 10431 "ui.c"
 		}
-#line 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2044 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 10427 "ui.c"
+#line 10435 "ui.c"
 	}
 	__finally23:
-#line 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2044 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2044 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_key_file_unref0 (f);
-#line 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2044 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2044 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 10440 "ui.c"
+#line 10448 "ui.c"
 	}
-#line 2044 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = f;
-#line 2044 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = user_interface_state_get_integer (self, _tmp11_, "window", "width", 600);
-#line 2044 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->window_width = _tmp12_;
-#line 2045 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = self->priv->window_width;
-#line 2045 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp13_ <= 0) {
-#line 2046 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->window_width = 600;
-#line 10454 "ui.c"
+#line 10462 "ui.c"
 	}
-#line 2047 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = f;
-#line 2047 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = user_interface_state_get_integer (self, _tmp14_, "window", "height", 400);
-#line 2047 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->window_height = _tmp15_;
-#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = self->priv->window_height;
-#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp16_ <= 0) {
-#line 2049 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2058 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->window_height = 400;
-#line 10468 "ui.c"
+#line 10476 "ui.c"
 	}
-#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2059 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp17_ = f;
-#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2059 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = user_interface_state_get_boolean (self, _tmp17_, "window", "is-maximized", FALSE);
-#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2059 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->window_is_maximized = _tmp18_;
-#line 2051 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2060 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp19_ = f;
-#line 2051 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2060 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp20_ = user_interface_state_get_boolean (self, _tmp19_, "window", "is-fullscreen", FALSE);
-#line 2051 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2060 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->window_is_fullscreen = _tmp20_;
-#line 2052 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2061 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp21_ = f;
-#line 2052 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2061 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp22_ = user_interface_state_get_integer (self, _tmp21_, "last-page", "width", 595);
-#line 2052 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2061 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_width = _tmp22_;
-#line 2053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2062 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp23_ = f;
-#line 2053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2062 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp24_ = user_interface_state_get_integer (self, _tmp23_, "last-page", "height", 842);
-#line 2053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2062 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_height = _tmp24_;
-#line 2054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp25_ = f;
-#line 2054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp26_ = user_interface_state_get_integer (self, _tmp25_, "last-page", "dpi", 72);
-#line 2054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_dpi = _tmp26_;
-#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp27_ = f;
-#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp29_ = _tmp28_;
-#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp31_ = (NULL == _tmp29_) ? 0 : g_quark_from_string (_tmp29_);
-#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_free (_tmp29_);
-#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		switch (0) {
-#line 10514 "ui.c"
+#line 10522 "ui.c"
 			default:
 			{
-#line 2062 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2071 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				self->priv->default_page_scan_direction = SCAN_DIRECTION_BOTTOM_TO_TOP;
-#line 2063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2072 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 10521 "ui.c"
+#line 10529 "ui.c"
 			}
 		}
 	} else if (_tmp31_ == ((0 != _tmp30_label1) ? _tmp30_label1 : (_tmp30_label1 = g_quark_from_static_string ("left-to-right")))) {
-#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		switch (0) {
-#line 10527 "ui.c"
+#line 10535 "ui.c"
 			default:
 			{
-#line 2065 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2074 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				self->priv->default_page_scan_direction = SCAN_DIRECTION_LEFT_TO_RIGHT;
-#line 2066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2075 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 10534 "ui.c"
+#line 10542 "ui.c"
 			}
 		}
 	} else if (_tmp31_ == ((0 != _tmp30_label2) ? _tmp30_label2 : (_tmp30_label2 = g_quark_from_static_string ("right-to-left")))) {
-#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		switch (0) {
-#line 10540 "ui.c"
+#line 10548 "ui.c"
 			default:
 			{
-#line 2068 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				self->priv->default_page_scan_direction = SCAN_DIRECTION_RIGHT_TO_LEFT;
-#line 2069 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2078 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 10547 "ui.c"
+#line 10555 "ui.c"
 			}
 		}
 	} else {
-#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		switch (0) {
-#line 10553 "ui.c"
+#line 10561 "ui.c"
 			default:
 			{
-#line 2059 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2068 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				self->priv->default_page_scan_direction = SCAN_DIRECTION_TOP_TO_BOTTOM;
-#line 2060 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2069 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 10560 "ui.c"
+#line 10568 "ui.c"
 			}
 		}
 	}
-#line 2030 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2039 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_key_file_unref0 (f);
-#line 10566 "ui.c"
+#line 10574 "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;
 	GError * _inner_error_ = NULL;
-#line 2073 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2082 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 2073 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2082 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (f != NULL, 0);
-#line 2073 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2082 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (group_name != NULL, 0);
-#line 2073 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2082 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (key != NULL, 0);
-#line 10581 "ui.c"
+#line 10589 "ui.c"
 	{
 		gint _tmp0_ = 0;
 		GKeyFile* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
 		gint _tmp4_ = 0;
-#line 2077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = f;
-#line 2077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = group_name;
-#line 2077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = key;
-#line 2077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = g_key_file_get_integer (_tmp1_, _tmp2_, _tmp3_, &_inner_error_);
-#line 2077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = _tmp4_;
-#line 2077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10600 "ui.c"
+#line 10608 "ui.c"
 			goto __catch24_g_error;
 		}
-#line 2077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = _tmp0_;
-#line 2077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 10607 "ui.c"
+#line 10615 "ui.c"
 	}
 	goto __finally24;
 	__catch24_g_error:
 	{
 		gint _tmp5_ = 0;
-#line 2075 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2084 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 2075 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2084 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 2081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2090 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = _default_;
-#line 2081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2090 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = _tmp5_;
-#line 2081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2090 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 10623 "ui.c"
+#line 10631 "ui.c"
 	}
 	__finally24:
-#line 2075 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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 2075 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2084 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_clear_error (&_inner_error_);
-#line 2075 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2084 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return 0;
-#line 10632 "ui.c"
+#line 10640 "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;
 	GError * _inner_error_ = NULL;
-#line 2085 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 2085 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (f != NULL, FALSE);
-#line 2085 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (group_name != NULL, FALSE);
-#line 2085 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (key != NULL, FALSE);
-#line 10647 "ui.c"
+#line 10655 "ui.c"
 	{
 		gboolean _tmp0_ = FALSE;
 		GKeyFile* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
-#line 2089 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2098 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = f;
-#line 2089 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2098 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = group_name;
-#line 2089 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2098 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = key;
-#line 2089 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2098 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = g_key_file_get_boolean (_tmp1_, _tmp2_, _tmp3_, &_inner_error_);
-#line 2089 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2098 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = _tmp4_;
-#line 2089 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2098 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10666 "ui.c"
+#line 10674 "ui.c"
 			goto __catch25_g_error;
 		}
-#line 2089 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2098 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = _tmp0_;
-#line 2089 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2098 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 10673 "ui.c"
+#line 10681 "ui.c"
 	}
 	goto __finally25;
 	__catch25_g_error:
 	{
 		gboolean _tmp5_ = FALSE;
-#line 2087 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2096 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 2087 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2096 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 2093 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = _default_;
-#line 2093 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = _tmp5_;
-#line 2093 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 10689 "ui.c"
+#line 10697 "ui.c"
 	}
 	__finally25:
-#line 2087 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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 2087 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2096 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_clear_error (&_inner_error_);
-#line 2087 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2096 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return FALSE;
-#line 10698 "ui.c"
+#line 10706 "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 2097 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2106 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 2097 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2106 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (f != NULL, NULL);
-#line 2097 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2106 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (group_name != NULL, NULL);
-#line 2097 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2106 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (key != NULL, NULL);
-#line 2097 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2106 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (_default_ != NULL, NULL);
-#line 10715 "ui.c"
+#line 10723 "ui.c"
 	{
 		gchar* _tmp0_ = NULL;
 		GKeyFile* _tmp1_ = NULL;
@@ -10733,83 +10741,83 @@ static gchar* user_interface_state_get_string (UserInterface* self, GKeyFile* f,
 		const gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 2101 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = f;
-#line 2101 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = group_name;
-#line 2101 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = key;
-#line 2101 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = g_key_file_get_string (_tmp1_, _tmp2_, _tmp3_, &_inner_error_);
-#line 2101 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = _tmp4_;
-#line 2101 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10735 "ui.c"
+#line 10743 "ui.c"
 			goto __catch26_g_error;
 		}
-#line 2101 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = _tmp0_;
-#line 2101 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = NULL;
-#line 2101 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = _tmp5_;
-#line 2101 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_tmp0_);
-#line 2101 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 10748 "ui.c"
+#line 10756 "ui.c"
 	}
 	goto __finally26;
 	__catch26_g_error:
 	{
 		const gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 2099 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2108 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 2099 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2108 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 2105 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = _default_;
-#line 2105 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = g_strdup (_tmp6_);
-#line 2105 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = _tmp7_;
-#line 2105 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 10767 "ui.c"
+#line 10775 "ui.c"
 	}
 	__finally26:
-#line 2099 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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 2099 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2108 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_clear_error (&_inner_error_);
-#line 2099 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2108 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return NULL;
-#line 10776 "ui.c"
+#line 10784 "ui.c"
 }
 
 
 static gboolean ___lambda11_ (UserInterface* self) {
 	gboolean result = FALSE;
-#line 2117 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2126 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_state (self, TRUE);
-#line 2118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->save_state_timeout = (guint) 0;
-#line 2119 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
-#line 2119 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 10790 "ui.c"
+#line 10798 "ui.c"
 }
 
 
 static gboolean ____lambda11__gsource_func (gpointer self) {
 	gboolean result;
 	result = ___lambda11_ ((UserInterface*) self);
-#line 2115 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 10799 "ui.c"
+#line 10807 "ui.c"
 }
 
 
@@ -10836,151 +10844,151 @@ static void user_interface_save_state (UserInterface* self, gboolean force) {
 	gint _tmp21_ = 0;
 	ScanDirection _tmp22_ = 0;
 	GError * _inner_error_ = NULL;
-#line 2109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2120 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = force;
-#line 2111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2120 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp0_) {
-#line 10832 "ui.c"
+#line 10840 "ui.c"
 		guint _tmp1_ = 0U;
 		guint _tmp3_ = 0U;
-#line 2113 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2122 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = self->priv->save_state_timeout;
-#line 2113 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2122 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp1_ != ((guint) 0)) {
-#line 10839 "ui.c"
+#line 10847 "ui.c"
 			guint _tmp2_ = 0U;
-#line 2114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2123 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp2_ = self->priv->save_state_timeout;
-#line 2114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2123 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			g_source_remove (_tmp2_);
-#line 10845 "ui.c"
+#line 10853 "ui.c"
 		}
-#line 2115 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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 2115 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->save_state_timeout = _tmp3_;
-#line 2121 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 10853 "ui.c"
+#line 10861 "ui.c"
 	}
-#line 2124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = user_interface_get_state_filename (self);
-#line 2124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = _tmp4_;
-#line 2124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = _tmp5_;
-#line 2124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_debug ("ui.vala:2124: Saving state to %s", _tmp6_);
-#line 2124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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 2126 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2135 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = g_key_file_new ();
-#line 2126 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2135 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	f = _tmp7_;
-#line 2127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2136 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = f;
-#line 2127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2136 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = self->priv->window_width;
-#line 2127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2136 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_key_file_set_integer (_tmp8_, "window", "width", _tmp9_);
-#line 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = f;
-#line 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = self->priv->window_height;
-#line 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_key_file_set_integer (_tmp10_, "window", "height", _tmp11_);
-#line 2129 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2138 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = f;
-#line 2129 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2138 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = self->priv->window_is_maximized;
-#line 2129 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2138 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_key_file_set_boolean (_tmp12_, "window", "is-maximized", _tmp13_);
-#line 2130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = f;
-#line 2130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = self->priv->window_is_fullscreen;
-#line 2130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_key_file_set_boolean (_tmp14_, "window", "is-fullscreen", _tmp15_);
-#line 2131 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2140 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = f;
-#line 2131 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2140 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp17_ = self->priv->default_page_width;
-#line 2131 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2140 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_key_file_set_integer (_tmp16_, "last-page", "width", _tmp17_);
-#line 2132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2141 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = f;
-#line 2132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2141 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp19_ = self->priv->default_page_height;
-#line 2132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2141 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_key_file_set_integer (_tmp18_, "last-page", "height", _tmp19_);
-#line 2133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2142 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp20_ = f;
-#line 2133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2142 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp21_ = self->priv->default_page_dpi;
-#line 2133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2142 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_key_file_set_integer (_tmp20_, "last-page", "dpi", _tmp21_);
-#line 2134 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp22_ = self->priv->default_page_scan_direction;
-#line 2134 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	switch (_tmp22_) {
-#line 2134 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case SCAN_DIRECTION_TOP_TO_BOTTOM:
-#line 10917 "ui.c"
+#line 10925 "ui.c"
 		{
 			GKeyFile* _tmp23_ = NULL;
-#line 2137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp23_ = f;
-#line 2137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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 2138 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 10926 "ui.c"
+#line 10934 "ui.c"
 		}
-#line 2134 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case SCAN_DIRECTION_BOTTOM_TO_TOP:
-#line 10930 "ui.c"
+#line 10938 "ui.c"
 		{
 			GKeyFile* _tmp24_ = NULL;
-#line 2140 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp24_ = f;
-#line 2140 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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 2141 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2150 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 10939 "ui.c"
+#line 10947 "ui.c"
 		}
-#line 2134 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case SCAN_DIRECTION_LEFT_TO_RIGHT:
-#line 10943 "ui.c"
+#line 10951 "ui.c"
 		{
 			GKeyFile* _tmp25_ = NULL;
-#line 2143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp25_ = f;
-#line 2143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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 2144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 10952 "ui.c"
+#line 10960 "ui.c"
 		}
-#line 2134 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case SCAN_DIRECTION_RIGHT_TO_LEFT:
-#line 10956 "ui.c"
+#line 10964 "ui.c"
 		{
 			GKeyFile* _tmp26_ = NULL;
-#line 2146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp26_ = f;
-#line 2146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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 2147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 10965 "ui.c"
+#line 10973 "ui.c"
 		}
 		default:
-#line 2134 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 10970 "ui.c"
+#line 10978 "ui.c"
 	}
 	{
 		gchar* _tmp27_ = NULL;
@@ -10989,27 +10997,27 @@ static void user_interface_save_state (UserInterface* self, gboolean force) {
 		GKeyFile* _tmp30_ = NULL;
 		gchar* _tmp31_ = NULL;
 		gchar* _tmp32_ = NULL;
-#line 2151 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp27_ = user_interface_get_state_filename (self);
-#line 2151 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp28_ = _tmp27_;
-#line 2151 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp29_ = _tmp28_;
-#line 2151 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp30_ = f;
-#line 2151 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp31_ = g_key_file_to_data (_tmp30_, NULL, NULL);
-#line 2151 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp32_ = _tmp31_;
-#line 2151 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_file_set_contents (_tmp29_, _tmp32_, (gssize) -1, &_inner_error_);
-#line 2151 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_tmp32_);
-#line 2151 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_tmp29_);
-#line 2151 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10999 "ui.c"
+#line 11007 "ui.c"
 			goto __catch27_g_error;
 		}
 	}
@@ -11019,60 +11027,60 @@ static void user_interface_save_state (UserInterface* self, gboolean force) {
 		GError* e = NULL;
 		GError* _tmp33_ = NULL;
 		const gchar* _tmp34_ = NULL;
-#line 2149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2158 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 2149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2158 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 2155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp33_ = e;
-#line 2155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp34_ = _tmp33_->message;
-#line 2155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_warning ("ui.vala:2155: Failed to write state: %s", _tmp34_);
-#line 2149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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 11021 "ui.c"
+#line 11029 "ui.c"
 	}
 	__finally27:
-#line 2149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2158 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2158 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_key_file_unref0 (f);
-#line 2149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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 2149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2158 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 2149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2158 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 11034 "ui.c"
+#line 11042 "ui.c"
 	}
-#line 2109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_key_file_unref0 (f);
-#line 11038 "ui.c"
+#line 11046 "ui.c"
 }
 
 
 static gboolean ___lambda21_ (UserInterface* self) {
 	gboolean result = FALSE;
 	ProgressBarDialog* _tmp0_ = NULL;
-#line 2170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2179 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->progress_dialog;
-#line 2170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2179 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp0_, FALSE);
-#line 2171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2180 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
-#line 2171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2180 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 11053 "ui.c"
+#line 11061 "ui.c"
 }
 
 
 static gboolean ____lambda21__gsource_func (gpointer self) {
 	gboolean result;
 	result = ___lambda21_ ((UserInterface*) self);
-#line 2169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2178 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 11062 "ui.c"
+#line 11070 "ui.c"
 }
 
 
@@ -11095,97 +11103,97 @@ static void user_interface_book_saving_cb (UserInterface* self, gint page_number
 	ProgressBarDialog* _tmp12_ = NULL;
 	gdouble _tmp13_ = 0.0;
 	ProgressBarDialog* _tmp14_ = NULL;
-#line 2159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2168 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	while (TRUE) {
-#line 11089 "ui.c"
+#line 11097 "ui.c"
 		gboolean _tmp0_ = FALSE;
-#line 2162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = gtk_events_pending ();
-#line 2162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (!_tmp0_) {
-#line 2162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 11097 "ui.c"
+#line 11105 "ui.c"
 		}
-#line 2163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_main_iteration ();
-#line 11101 "ui.c"
+#line 11109 "ui.c"
 	}
-#line 2165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->_book;
-#line 2165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = book_get_n_pages (_tmp1_);
-#line 2165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 2165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	total = (gint) _tmp3_;
-#line 2166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page_number;
-#line 2166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = total;
-#line 2166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	fraction = (_tmp4_ + 1.0) / _tmp5_;
-#line 2167 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = fraction;
-#line 2167 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	complete = _tmp6_ == 1.0;
-#line 2168 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2177 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = complete;
-#line 2168 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2177 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp7_) {
-#line 2169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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 11127 "ui.c"
+#line 11135 "ui.c"
 	}
-#line 2173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2182 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = _ ("Saving page %d out of %d");
-#line 2173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2182 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = page_number;
-#line 2173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2182 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = total;
-#line 2173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2182 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = g_strdup_printf (_tmp8_, _tmp9_ + 1, _tmp10_);
-#line 2173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2182 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	message = _tmp11_;
-#line 2175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2184 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = self->priv->progress_dialog;
-#line 2175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2184 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = fraction;
-#line 2175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2184 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	progress_bar_dialog_set_fraction (_tmp12_, _tmp13_);
-#line 2176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2185 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = self->priv->progress_dialog;
-#line 2176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2185 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	progress_bar_dialog_set_message (_tmp14_, message);
-#line 2159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2168 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (message);
-#line 11151 "ui.c"
+#line 11159 "ui.c"
 }
 
 
 void user_interface_show_progress_dialog (UserInterface* self) {
 	ProgressBarDialog* _tmp0_ = NULL;
-#line 2179 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2190 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->progress_dialog;
-#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2190 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp0_, TRUE);
-#line 11163 "ui.c"
+#line 11171 "ui.c"
 }
 
 
 void user_interface_hide_progress_dialog (UserInterface* self) {
 	ProgressBarDialog* _tmp0_ = NULL;
-#line 2184 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2186 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->progress_dialog;
-#line 2186 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp0_, FALSE);
-#line 11175 "ui.c"
+#line 11183 "ui.c"
 }
 
 
@@ -11195,46 +11203,46 @@ void user_interface_show_error (UserInterface* self, const gchar* error_title, c
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 2189 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2198 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2189 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2198 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (error_title != NULL);
-#line 2189 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2198 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (error_text != NULL);
-#line 2191 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->have_error = TRUE;
-#line 2192 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = error_title;
-#line 2192 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 2192 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->error_title);
-#line 2192 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->error_title = _tmp1_;
-#line 2193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2202 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = error_text;
-#line 2193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2202 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 2193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2202 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->error_text);
-#line 2193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2202 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->error_text = _tmp3_;
-#line 2194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2203 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = change_scanner_hint;
-#line 2194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2203 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->error_change_scanner_hint = _tmp4_;
-#line 2195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_info_bar (self);
-#line 11215 "ui.c"
+#line 11223 "ui.c"
 }
 
 
 void user_interface_start (UserInterface* self) {
-#line 2198 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2207 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2209 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) self, TRUE);
-#line 11224 "ui.c"
+#line 11232 "ui.c"
 }
 
 
@@ -11249,14 +11257,14 @@ Book* user_interface_get_book (UserInterface* self) {
 	result = _tmp0_;
 #line 164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 11239 "ui.c"
+#line 11247 "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 11246 "ui.c"
+#line 11254 "ui.c"
 }
 
 
@@ -11275,7 +11283,7 @@ static void user_interface_set_book (UserInterface* self, Book* value) {
 	self->priv->_book = _tmp1_;
 #line 164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_notify ((GObject *) self, "book");
-#line 11265 "ui.c"
+#line 11273 "ui.c"
 }
 
 
@@ -11296,7 +11304,7 @@ Page* user_interface_get_selected_page (UserInterface* self) {
 	result = _tmp2_;
 #line 171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 11286 "ui.c"
+#line 11294 "ui.c"
 }
 
 
@@ -11313,7 +11321,7 @@ void user_interface_set_selected_page (UserInterface* self, Page* value) {
 	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 11303 "ui.c"
+#line 11311 "ui.c"
 }
 
 
@@ -11328,7 +11336,7 @@ gboolean user_interface_get_scanning (UserInterface* self) {
 	result = _tmp0_;
 #line 193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 11318 "ui.c"
+#line 11326 "ui.c"
 }
 
 
@@ -11382,7 +11390,7 @@ void user_interface_set_scanning (UserInterface* self, gboolean value) {
 	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 11372 "ui.c"
+#line 11380 "ui.c"
 }
 
 
@@ -11403,7 +11411,7 @@ gint user_interface_get_brightness (UserInterface* self) {
 	result = (gint) _tmp2_;
 #line 214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 11393 "ui.c"
+#line 11401 "ui.c"
 }
 
 
@@ -11420,7 +11428,7 @@ void user_interface_set_brightness (UserInterface* self, gint value) {
 	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 11410 "ui.c"
+#line 11418 "ui.c"
 }
 
 
@@ -11441,7 +11449,7 @@ gint user_interface_get_contrast (UserInterface* self) {
 	result = (gint) _tmp2_;
 #line 220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 11431 "ui.c"
+#line 11439 "ui.c"
 }
 
 
@@ -11458,7 +11466,7 @@ void user_interface_set_contrast (UserInterface* self, gint value) {
 	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 11448 "ui.c"
+#line 11456 "ui.c"
 }
 
 
@@ -11479,7 +11487,7 @@ gint user_interface_get_quality (UserInterface* self) {
 	result = (gint) _tmp2_;
 #line 226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 11469 "ui.c"
+#line 11477 "ui.c"
 }
 
 
@@ -11496,7 +11504,7 @@ void user_interface_set_quality (UserInterface* self, gint value) {
 	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 11486 "ui.c"
+#line 11494 "ui.c"
 }
 
 
@@ -11516,7 +11524,7 @@ gchar* user_interface_get_selected_device (UserInterface* self) {
 	iter = _tmp1_;
 #line 236 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 11506 "ui.c"
+#line 11514 "ui.c"
 		gchar* device = NULL;
 		GtkListStore* _tmp3_ = NULL;
 		GtkTreeIter _tmp4_ = {0};
@@ -11530,13 +11538,13 @@ gchar* user_interface_get_selected_device (UserInterface* self) {
 		result = device;
 #line 240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 11520 "ui.c"
+#line 11528 "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 11526 "ui.c"
+#line 11534 "ui.c"
 }
 
 
@@ -11559,7 +11567,7 @@ void user_interface_set_selected_device (UserInterface* self, const gchar* value
 	if (!_tmp2_) {
 #line 250 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 11549 "ui.c"
+#line 11557 "ui.c"
 	}
 #line 252 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->device_combo;
@@ -11571,7 +11579,7 @@ void user_interface_set_selected_device (UserInterface* self, const gchar* value
 	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 11561 "ui.c"
+#line 11569 "ui.c"
 }
 
 
@@ -11579,17 +11587,17 @@ static gchar* user_interface_get_state_filename (UserInterface* self) {
 	gchar* result;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 2027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 2027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = g_get_user_cache_dir ();
-#line 2027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_build_filename (_tmp0_, "simple-scan", "state", NULL);
-#line 2027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = _tmp1_;
-#line 2027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 11579 "ui.c"
+#line 11587 "ui.c"
 }
 
 
@@ -11608,19 +11616,19 @@ static void g_cclosure_user_marshal_VOID__STRING_SCAN_OPTIONS (GClosure * closur
 		data1 = closure->data;
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 11598 "ui.c"
+#line 11606 "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 11604 "ui.c"
+#line 11612 "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 11610 "ui.c"
+#line 11618 "ui.c"
 }
 
 
@@ -11639,19 +11647,19 @@ static void g_cclosure_user_marshal_VOID__STRING_INT (GClosure * closure, GValue
 		data1 = closure->data;
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 11629 "ui.c"
+#line 11637 "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 11635 "ui.c"
+#line 11643 "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 11641 "ui.c"
+#line 11649 "ui.c"
 }
 
 
@@ -11875,7 +11883,7 @@ static void user_interface_class_init (UserInterfaceClass * klass) {
 	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 11865 "ui.c"
+#line 11873 "ui.c"
 }
 
 
@@ -11895,7 +11903,7 @@ static void user_interface_instance_init (UserInterface * self) {
 	self->priv->scanning_ = FALSE;
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_init_template (GTK_WIDGET (self));
-#line 11885 "ui.c"
+#line 11893 "ui.c"
 }
 
 
@@ -12071,7 +12079,7 @@ static void user_interface_finalize (GObject* obj) {
 	_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 12061 "ui.c"
+#line 12069 "ui.c"
 }
 
 
@@ -12134,13 +12142,13 @@ static void _vala_user_interface_get_property (GObject * object, guint property_
 		g_value_take_string (value, user_interface_get_selected_device (self));
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 12124 "ui.c"
+#line 12132 "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 12130 "ui.c"
+#line 12138 "ui.c"
 	}
 }
 
@@ -12192,13 +12200,13 @@ static void _vala_user_interface_set_property (GObject * object, guint property_
 		user_interface_set_selected_device (self, g_value_get_string (value));
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 12182 "ui.c"
+#line 12190 "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 12188 "ui.c"
+#line 12196 "ui.c"
 	}
 }
 
@@ -12217,92 +12225,92 @@ ProgressBarDialog* progress_bar_dialog_construct (GType object_type, GtkApplicat
 	const gchar* _tmp7_ = NULL;
 	GtkApplicationWindow* _tmp8_ = NULL;
 	GtkProgressBar* _tmp9_ = NULL;
-#line 2220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (parent != NULL, NULL);
-#line 2220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (title != NULL, NULL);
-#line 2220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = (ProgressBarDialog*) g_object_new (object_type, NULL);
-#line 2222 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2231 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = (GtkProgressBar*) gtk_progress_bar_new ();
-#line 2222 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2231 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp0_);
-#line 2222 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2231 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->bar);
-#line 2222 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2231 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->bar = _tmp0_;
-#line 2223 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2232 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
-#line 2223 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2232 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp1_);
-#line 2223 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2232 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	hbox = _tmp1_;
-#line 2224 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2233 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-#line 2224 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2233 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp2_);
-#line 2224 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2233 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	vbox = _tmp2_;
-#line 2225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2234 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_hexpand ((GtkWidget*) hbox, TRUE);
-#line 2227 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2236 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->bar;
-#line 2227 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2236 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_progress_bar_set_text (_tmp3_, "");
-#line 2228 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = self->priv->bar;
-#line 2228 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_progress_bar_set_show_text (_tmp4_, TRUE);
-#line 2229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2238 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = self->priv->bar;
-#line 2229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2238 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_size_request ((GtkWidget*) _tmp5_, 225, 25);
-#line 2230 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2239 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_size_request ((GtkWidget*) self, 250, 50);
-#line 2232 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2241 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = self->priv->bar;
-#line 2232 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2241 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (vbox, (GtkWidget*) _tmp6_, TRUE, FALSE, (guint) 0);
-#line 2233 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2242 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (hbox, (GtkWidget*) vbox, TRUE, FALSE, (guint) 0);
-#line 2234 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2243 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_container_add ((GtkContainer*) self, (GtkWidget*) hbox);
-#line 2235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2244 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = title;
-#line 2235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2244 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_title ((GtkWindow*) self, _tmp7_);
-#line 2237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2246 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = parent;
-#line 2237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2246 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_transient_for ((GtkWindow*) self, (GtkWindow*) _tmp8_);
-#line 2238 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_position ((GtkWindow*) self, GTK_WIN_POS_CENTER_ON_PARENT);
-#line 2239 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2248 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_modal ((GtkWindow*) self, TRUE);
-#line 2240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_resizable ((GtkWindow*) self, FALSE);
-#line 2242 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2251 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) hbox, TRUE);
-#line 2243 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2252 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) vbox, TRUE);
-#line 2244 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2253 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = self->priv->bar;
-#line 2244 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2253 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp9_, TRUE);
-#line 2220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (vbox);
-#line 2220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (hbox);
-#line 2220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self;
-#line 12285 "ui.c"
+#line 12293 "ui.c"
 }
 
 
 ProgressBarDialog* progress_bar_dialog_new (GtkApplicationWindow* parent, const gchar* title) {
-#line 2220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return progress_bar_dialog_construct (TYPE_PROGRESS_BAR_DIALOG, parent, title);
-#line 12292 "ui.c"
+#line 12300 "ui.c"
 }
 
 
@@ -12311,36 +12319,36 @@ gdouble progress_bar_dialog_get_fraction (ProgressBarDialog* self) {
 	GtkProgressBar* _tmp0_ = NULL;
 	gdouble _tmp1_ = 0.0;
 	gdouble _tmp2_ = 0.0;
-#line 2210 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, 0.0);
-#line 2210 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->bar;
-#line 2210 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_progress_bar_get_fraction (_tmp0_);
-#line 2210 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 2210 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = _tmp2_;
-#line 2210 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 12313 "ui.c"
+#line 12321 "ui.c"
 }
 
 
 void progress_bar_dialog_set_fraction (ProgressBarDialog* self, gdouble value) {
 	GtkProgressBar* _tmp0_ = NULL;
 	gdouble _tmp1_ = 0.0;
-#line 2211 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2211 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->bar;
-#line 2211 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = value;
-#line 2211 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_progress_bar_set_fraction (_tmp0_, _tmp1_);
-#line 2211 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_notify ((GObject *) self, "fraction");
-#line 12330 "ui.c"
+#line 12338 "ui.c"
 }
 
 
@@ -12349,74 +12357,74 @@ const gchar* progress_bar_dialog_get_message (ProgressBarDialog* self) {
 	GtkProgressBar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
-#line 2216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 2216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->bar;
-#line 2216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_progress_bar_get_text (_tmp0_);
-#line 2216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 2216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = _tmp2_;
-#line 2216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 12351 "ui.c"
+#line 12359 "ui.c"
 }
 
 
 void progress_bar_dialog_set_message (ProgressBarDialog* self, const gchar* value) {
 	GtkProgressBar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 2217 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2217 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->bar;
-#line 2217 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = value;
-#line 2217 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_progress_bar_set_text (_tmp0_, _tmp1_);
-#line 2217 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_notify ((GObject *) self, "message");
-#line 12368 "ui.c"
+#line 12376 "ui.c"
 }
 
 
 static void progress_bar_dialog_class_init (ProgressBarDialogClass * klass) {
-#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	progress_bar_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_type_class_add_private (klass, sizeof (ProgressBarDialogPrivate));
-#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (klass)->get_property = _vala_progress_bar_dialog_get_property;
-#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (klass)->set_property = _vala_progress_bar_dialog_set_property;
-#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (klass)->finalize = progress_bar_dialog_finalize;
-#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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 12387 "ui.c"
+#line 12395 "ui.c"
 }
 
 
 static void progress_bar_dialog_instance_init (ProgressBarDialog * self) {
-#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv = PROGRESS_BAR_DIALOG_GET_PRIVATE (self);
-#line 12394 "ui.c"
+#line 12402 "ui.c"
 }
 
 
 static void progress_bar_dialog_finalize (GObject* obj) {
 	ProgressBarDialog * self;
-#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PROGRESS_BAR_DIALOG, ProgressBarDialog);
-#line 2206 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2215 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->bar);
-#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (progress_bar_dialog_parent_class)->finalize (obj);
-#line 12406 "ui.c"
+#line 12414 "ui.c"
 }
 
 
@@ -12435,27 +12443,27 @@ GType progress_bar_dialog_get_type (void) {
 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 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	switch (property_id) {
-#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case PROGRESS_BAR_DIALOG_FRACTION:
-#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_value_set_double (value, progress_bar_dialog_get_fraction (self));
-#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case PROGRESS_BAR_DIALOG_MESSAGE:
-#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_value_set_string (value, progress_bar_dialog_get_message (self));
-#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 12439 "ui.c"
+#line 12447 "ui.c"
 		default:
-#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 12445 "ui.c"
+#line 12453 "ui.c"
 	}
 }
 
@@ -12463,27 +12471,27 @@ static void _vala_progress_bar_dialog_get_property (GObject * object, guint prop
 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 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	switch (property_id) {
-#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case PROGRESS_BAR_DIALOG_FRACTION:
-#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		progress_bar_dialog_set_fraction (self, g_value_get_double (value));
-#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case PROGRESS_BAR_DIALOG_MESSAGE:
-#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		progress_bar_dialog_set_message (self, g_value_get_string (value));
-#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 12467 "ui.c"
+#line 12475 "ui.c"
 		default:
-#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 12473 "ui.c"
+#line 12481 "ui.c"
 	}
 }
 
@@ -12496,45 +12504,45 @@ gchar* get_temporary_filename (const gchar* prefix, const gchar* extension) {
 	gchar* _tmp2_ = NULL;
 	gchar* path = NULL;
 	GError * _inner_error_ = NULL;
-#line 2249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2258 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (prefix != NULL, NULL);
-#line 2249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2258 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (extension != NULL, NULL);
-#line 2254 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = prefix;
-#line 2254 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = extension;
-#line 2254 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = g_strdup_printf ("%sXXXXXX.%s", _tmp0_, _tmp1_);
-#line 2254 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	filename = _tmp2_;
-#line 12498 "ui.c"
+#line 12506 "ui.c"
 	{
 		gint fd = 0;
 		const gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
-#line 2258 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = filename;
-#line 2258 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = g_file_open_tmp (_tmp3_, &_tmp4_, &_inner_error_);
-#line 2258 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 2258 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		path = _tmp4_;
-#line 2258 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		fd = _tmp5_;
-#line 2258 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12517 "ui.c"
+#line 12525 "ui.c"
 			goto __catch28_g_error;
 		}
-#line 2259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = fd;
-#line 2259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		close (_tmp6_);
-#line 12524 "ui.c"
+#line 12532 "ui.c"
 	}
 	goto __finally28;
 	__catch28_g_error:
@@ -12542,50 +12550,50 @@ gchar* get_temporary_filename (const gchar* prefix, const gchar* extension) {
 		GError* e = NULL;
 		GError* _tmp7_ = NULL;
 		const gchar* _tmp8_ = NULL;
-#line 2256 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 2256 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 2263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2272 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = e;
-#line 2263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2272 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = _tmp7_->message;
-#line 2263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_warning ("ui.vala:2263: Error saving email attachment: %s", _tmp8_);
-#line 2264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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 2264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2273 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 2264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2273 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 2264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2273 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (filename);
-#line 2264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2273 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 12552 "ui.c"
+#line 12560 "ui.c"
 	}
 	__finally28:
-#line 2256 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2256 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 2256 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (filename);
-#line 2256 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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 2256 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 2256 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return NULL;
-#line 12567 "ui.c"
+#line 12575 "ui.c"
 	}
-#line 2267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = path;
-#line 2267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (filename);
-#line 2267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 12575 "ui.c"
+#line 12583 "ui.c"
 }
 
 
@@ -12596,40 +12604,40 @@ PageIcon* page_icon_construct (GType object_type, const gchar* text, gdouble r,
 	gdouble _tmp2_ = 0.0;
 	gdouble _tmp3_ = 0.0;
 	gdouble _tmp4_ = 0.0;
-#line 2278 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (text != NULL, NULL);
-#line 2278 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = (PageIcon*) g_object_new (object_type, NULL);
-#line 2280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = text;
-#line 2280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 2280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->text);
-#line 2280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->text = _tmp1_;
-#line 2281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = r;
-#line 2281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->r = _tmp2_;
-#line 2282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2291 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = g;
-#line 2282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2291 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->g = _tmp3_;
-#line 2283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = b;
-#line 2283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->b = _tmp4_;
-#line 2278 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self;
-#line 12612 "ui.c"
+#line 12620 "ui.c"
 }
 
 
 PageIcon* page_icon_new (const gchar* text, gdouble r, gdouble g, gdouble b) {
-#line 2278 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return page_icon_construct (TYPE_PAGE_ICON, text, r, g, b);
-#line 12619 "ui.c"
+#line 12627 "ui.c"
 }
 
 
@@ -12637,23 +12645,23 @@ static void page_icon_real_get_preferred_width (GtkWidget* base, gint* minimum_w
 	PageIcon * self;
 	gint _vala_minimum_width = 0;
 	gint _vala_natural_width = 0;
-#line 2286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = (PageIcon*) base;
-#line 2288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_natural_width = PAGE_ICON_MINIMUM_WIDTH;
-#line 2288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_minimum_width = _vala_natural_width;
-#line 2286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (minimum_width) {
-#line 2286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*minimum_width = _vala_minimum_width;
-#line 12637 "ui.c"
+#line 12645 "ui.c"
 	}
-#line 2286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (natural_width) {
-#line 2286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*natural_width = _vala_natural_width;
-#line 12643 "ui.c"
+#line 12651 "ui.c"
 	}
 }
 
@@ -12663,25 +12671,25 @@ static void page_icon_real_get_preferred_height (GtkWidget* base, gint* minimum_
 	gint _vala_minimum_height = 0;
 	gint _vala_natural_height = 0;
 	gdouble _tmp0_ = 0.0;
-#line 2291 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2300 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = (PageIcon*) base;
-#line 2293 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = round (PAGE_ICON_MINIMUM_WIDTH * G_SQRT2);
-#line 2293 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_natural_height = (gint) _tmp0_;
-#line 2293 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_minimum_height = _vala_natural_height;
-#line 2291 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2300 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (minimum_height) {
-#line 2291 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2300 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*minimum_height = _vala_minimum_height;
-#line 12665 "ui.c"
+#line 12673 "ui.c"
 	}
-#line 2291 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2300 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (natural_height) {
-#line 2291 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2300 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*natural_height = _vala_natural_height;
-#line 12671 "ui.c"
+#line 12679 "ui.c"
 	}
 }
 
@@ -12691,25 +12699,25 @@ static void page_icon_real_get_preferred_height_for_width (GtkWidget* base, gint
 	gint _vala_minimum_height = 0;
 	gint _vala_natural_height = 0;
 	gint _tmp0_ = 0;
-#line 2296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = (PageIcon*) base;
-#line 2298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = width;
-#line 2298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_natural_height = (gint) (_tmp0_ * G_SQRT2);
-#line 2298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_minimum_height = _vala_natural_height;
-#line 2296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (minimum_height) {
-#line 2296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*minimum_height = _vala_minimum_height;
-#line 12693 "ui.c"
+#line 12701 "ui.c"
 	}
-#line 2296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (natural_height) {
-#line 2296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*natural_height = _vala_natural_height;
-#line 12699 "ui.c"
+#line 12707 "ui.c"
 	}
 }
 
@@ -12719,25 +12727,25 @@ static void page_icon_real_get_preferred_width_for_height (GtkWidget* base, gint
 	gint _vala_minimum_width = 0;
 	gint _vala_natural_width = 0;
 	gint _tmp0_ = 0;
-#line 2301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = (PageIcon*) base;
-#line 2303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2312 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = height;
-#line 2303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2312 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_natural_width = (gint) (_tmp0_ / G_SQRT2);
-#line 2303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2312 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_minimum_width = _vala_natural_width;
-#line 2301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (minimum_width) {
-#line 2301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*minimum_width = _vala_minimum_width;
-#line 12721 "ui.c"
+#line 12729 "ui.c"
 	}
-#line 2301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (natural_width) {
-#line 2301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*natural_width = _vala_natural_width;
-#line 12727 "ui.c"
+#line 12735 "ui.c"
 	}
 }
 
@@ -12780,166 +12788,166 @@ static gboolean page_icon_real_draw (GtkWidget* base, cairo_t* c) {
 	gdouble _tmp33_ = 0.0;
 	cairo_t* _tmp34_ = NULL;
 	const gchar* _tmp35_ = NULL;
-#line 2306 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2315 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = (PageIcon*) base;
-#line 2306 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2315 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (c != NULL, FALSE);
-#line 2308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2317 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = gtk_widget_get_allocated_width ((GtkWidget*) self);
-#line 2308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2317 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	w = _tmp0_;
-#line 2309 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2318 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_widget_get_allocated_height ((GtkWidget*) self);
-#line 2309 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2318 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	h = _tmp1_;
-#line 2310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2319 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = w;
-#line 2310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2319 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = h;
-#line 2310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2319 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if ((_tmp2_ * G_SQRT2) > ((gdouble) _tmp3_)) {
-#line 12788 "ui.c"
+#line 12796 "ui.c"
 		gint _tmp4_ = 0;
 		gdouble _tmp5_ = 0.0;
-#line 2311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2320 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = h;
-#line 2311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2320 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = round (_tmp4_ / G_SQRT2);
-#line 2311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2320 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		w = (gint) _tmp5_;
-#line 12797 "ui.c"
+#line 12805 "ui.c"
 	} else {
 		gint _tmp6_ = 0;
 		gdouble _tmp7_ = 0.0;
-#line 2313 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2322 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = w;
-#line 2313 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2322 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = round (_tmp6_ * G_SQRT2);
-#line 2313 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2322 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		h = (gint) _tmp7_;
-#line 12807 "ui.c"
+#line 12815 "ui.c"
 	}
-#line 2315 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = c;
-#line 2315 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = gtk_widget_get_allocated_width ((GtkWidget*) self);
-#line 2315 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = w;
-#line 2315 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = gtk_widget_get_allocated_height ((GtkWidget*) self);
-#line 2315 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = h;
-#line 2315 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_translate (_tmp8_, (gdouble) ((_tmp9_ - _tmp10_) / 2), (gdouble) ((_tmp11_ - _tmp12_) / 2));
-#line 2317 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2326 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = c;
-#line 2317 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2326 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = w;
-#line 2317 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2326 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = h;
-#line 2317 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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 2319 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = c;
-#line 2319 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp17_ = self->priv->r;
-#line 2319 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = self->priv->g;
-#line 2319 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp19_ = self->priv->b;
-#line 2319 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_set_source_rgb (_tmp16_, _tmp17_, _tmp18_, _tmp19_);
-#line 2320 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2329 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp20_ = c;
-#line 2320 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2329 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_fill_preserve (_tmp20_);
-#line 2322 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2331 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp21_ = c;
-#line 2322 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2331 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_set_line_width (_tmp21_, 1.0);
-#line 2323 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp22_ = c;
-#line 2323 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_set_source_rgb (_tmp22_, 0.0, 0.0, 0.0);
-#line 2324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2333 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp23_ = c;
-#line 2324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2333 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_stroke (_tmp23_);
-#line 2327 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp24_ = c;
-#line 2327 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp25_ = self->priv->text;
-#line 2327 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_text_extents (_tmp24_, _tmp25_, &_tmp26_);
-#line 2327 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	extents = _tmp26_;
-#line 2328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp27_ = c;
-#line 2328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp28_ = w;
-#line 2328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp29_ = extents;
-#line 2328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp30_ = _tmp29_.width;
-#line 2328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp31_ = h;
-#line 2328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp32_ = extents;
-#line 2328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp33_ = _tmp32_.height;
-#line 2328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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 2329 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp34_ = c;
-#line 2329 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp35_ = self->priv->text;
-#line 2329 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_show_text (_tmp34_, _tmp35_);
-#line 2331 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2340 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = TRUE;
-#line 2331 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2340 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 12889 "ui.c"
+#line 12897 "ui.c"
 }
 
 
 static void page_icon_class_init (PageIconClass * klass) {
-#line 2270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page_icon_parent_class = g_type_class_peek_parent (klass);
-#line 2270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_type_class_add_private (klass, sizeof (PageIconPrivate));
-#line 2270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	((GtkWidgetClass *) klass)->get_preferred_width = page_icon_real_get_preferred_width;
-#line 2270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	((GtkWidgetClass *) klass)->get_preferred_height = page_icon_real_get_preferred_height;
-#line 2270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	((GtkWidgetClass *) klass)->get_preferred_height_for_width = page_icon_real_get_preferred_height_for_width;
-#line 2270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	((GtkWidgetClass *) klass)->get_preferred_width_for_height = page_icon_real_get_preferred_width_for_height;
-#line 2270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	((GtkWidgetClass *) klass)->draw = page_icon_real_draw;
-#line 2270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (klass)->finalize = page_icon_finalize;
-#line 12910 "ui.c"
+#line 12918 "ui.c"
 }
 
 
 static void page_icon_instance_init (PageIcon * self) {
-#line 2270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv = PAGE_ICON_GET_PRIVATE (self);
-#line 12917 "ui.c"
+#line 12925 "ui.c"
 }
 
 
 static void page_icon_finalize (GObject* obj) {
 	PageIcon * self;
-#line 2270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PAGE_ICON, PageIcon);
-#line 2272 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->text);
-#line 2270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (page_icon_parent_class)->finalize (obj);
-#line 12929 "ui.c"
+#line 12937 "ui.c"
 }
 
 
diff --git a/src/ui.vala b/src/ui.vala
index 2dd1d57..5e375c4 100644
--- a/src/ui.vala
+++ b/src/ui.vala
@@ -1819,7 +1819,7 @@ public class UserInterface : Gtk.ApplicationWindow
 
         var app = Application.get_default () as Gtk.Application;
 
-        if (is_desktop ("Unity") || is_desktop ("XFCE") || is_desktop ("MATE") || is_desktop ("LXDE"))
+        if (is_traditional_desktop ())
         {
             set_titlebar (null);
             menubar.visible = true;
@@ -2022,6 +2022,15 @@ public class UserInterface : Gtk.ApplicationWindow
         return false;
     }
 
+    private bool is_traditional_desktop ()
+    {
+        const string[] traditional_desktops = { "Unity", "XFCE", "MATE", "LXDE", "Cinnamon", "X-Cinnamon" };
+        foreach (var name in traditional_desktops)
+            if (is_desktop (name))
+                return true;
+        return false;
+    }   
+
     private string state_filename
     {
         owned get { return Path.build_filename (Environment.get_user_cache_dir (), "simple-scan", "state"); }