Imported Upstream version 3.19.1upstream/3.19.1

author: Jörg Frings-Fürst <debian@jff-webhosting.net> 2015-11-03 12:10:06 +0100
committer: Jörg Frings-Fürst <debian@jff-webhosting.net> 2015-11-03 12:10:06 +0100
commit: 02cc3d8088c307a26f9b52e294fb932d1e40ee4d (patch)
tree: c7e987a1421f4c7db08c1aa4bf17107185dca4d0
parent: f64f5d0c9e37828bc1a42f8e69bbc4d3d8c549f5 (diff)
91 files changed, 15878 insertions, 8999 deletions
diff --git a/Makefile.in b/Makefile.in
index 654dd68..568fb37 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -256,6 +256,8 @@ MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
+PACKAGEKIT_CFLAGS = @PACKAGEKIT_CFLAGS@
+PACKAGEKIT_LIBS = @PACKAGEKIT_LIBS@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
diff --git a/NEWS b/NEWS
index 8c753c5..e3ada95 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+Overview of changes in simple-scan 3.19.1
+
+  * Make PackageKit support optional
+  * Add help about quality, brightness, contrast settings
+  * Fix help references to Wikipedia (currently just say Wiki)
+  * Fix SANE capability logging commas
+
 Overview of changes in simple-scan 3.18.0
 
   * Show error message when fail to install drivers
diff --git a/configure b/configure
index 4df72b8..76ea976 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.18.0.
+# Generated by GNU Autoconf 2.69 for simple-scan 3.19.1.
 #
 #
 # 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.18.0'
-PACKAGE_STRING='simple-scan 3.18.0'
+PACKAGE_VERSION='3.19.1'
+PACKAGE_STRING='simple-scan 3.19.1'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -728,6 +728,10 @@ LN_S
 EGREP
 GREP
 CPP
+HAVE_PACKAGEKIT_FALSE
+HAVE_PACKAGEKIT_TRUE
+PACKAGEKIT_LIBS
+PACKAGEKIT_CFLAGS
 HAVE_COLORD_FALSE
 HAVE_COLORD_TRUE
 COLORD_LIBS
@@ -853,6 +857,8 @@ SIMPLE_SCAN_CFLAGS
 SIMPLE_SCAN_LIBS
 COLORD_CFLAGS
 COLORD_LIBS
+PACKAGEKIT_CFLAGS
+PACKAGEKIT_LIBS
 CPP
 ITSTOOL
 XMLLINT'
@@ -1396,7 +1402,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.18.0 to adapt to many kinds of systems.
+\`configure' configures simple-scan 3.19.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1462,7 +1468,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of simple-scan 3.18.0:";;
+     short | recursive ) echo "Configuration of simple-scan 3.19.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1508,6 +1514,10 @@ Some influential environment variables:
   COLORD_CFLAGS
               C compiler flags for COLORD, overriding pkg-config
   COLORD_LIBS linker flags for COLORD, overriding pkg-config
+  PACKAGEKIT_CFLAGS
+              C compiler flags for PACKAGEKIT, overriding pkg-config
+  PACKAGEKIT_LIBS
+              linker flags for PACKAGEKIT, overriding pkg-config
   CPP         C preprocessor
   ITSTOOL     Path to the `itstool` command
   XMLLINT     Path to the `xmllint` command
@@ -1578,7 +1588,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-simple-scan configure 3.18.0
+simple-scan configure 3.19.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1830,7 +1840,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.18.0, which was
+It was created by simple-scan $as_me 3.19.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2693,7 +2703,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='simple-scan'
- VERSION='3.18.0'
+ VERSION='3.19.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4252,7 +4262,6 @@ if test -n "$SIMPLE_SCAN_CFLAGS"; then
     cairo
     gdk-pixbuf-2.0
     gusb
-    packagekit-glib2
 \""; } >&5
   ($PKG_CONFIG --exists --print-errors "
     glib-2.0 >= 2.32
@@ -4263,7 +4272,6 @@ if test -n "$SIMPLE_SCAN_CFLAGS"; then
     cairo
     gdk-pixbuf-2.0
     gusb
-    packagekit-glib2
 ") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
@@ -4277,7 +4285,6 @@ if test -n "$SIMPLE_SCAN_CFLAGS"; then
     cairo
     gdk-pixbuf-2.0
     gusb
-    packagekit-glib2
 " 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
@@ -4299,7 +4306,6 @@ if test -n "$SIMPLE_SCAN_LIBS"; then
     cairo
     gdk-pixbuf-2.0
     gusb
-    packagekit-glib2
 \""; } >&5
   ($PKG_CONFIG --exists --print-errors "
     glib-2.0 >= 2.32
@@ -4310,7 +4316,6 @@ if test -n "$SIMPLE_SCAN_LIBS"; then
     cairo
     gdk-pixbuf-2.0
     gusb
-    packagekit-glib2
 ") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
@@ -4324,7 +4329,6 @@ if test -n "$SIMPLE_SCAN_LIBS"; then
     cairo
     gdk-pixbuf-2.0
     gusb
-    packagekit-glib2
 " 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
@@ -4355,7 +4359,6 @@ fi
     cairo
     gdk-pixbuf-2.0
     gusb
-    packagekit-glib2
 " 2>&1`
         else
 	        SIMPLE_SCAN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "
@@ -4367,7 +4370,6 @@ fi
     cairo
     gdk-pixbuf-2.0
     gusb
-    packagekit-glib2
 " 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
@@ -4382,7 +4384,6 @@ fi
     cairo
     gdk-pixbuf-2.0
     gusb
-    packagekit-glib2
 ) were not met:
 
 $SIMPLE_SCAN_PKG_ERRORS
@@ -4513,6 +4514,102 @@ fi
 
 
 
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PACKAGEKIT" >&5
+$as_echo_n "checking for PACKAGEKIT... " >&6; }
+
+if test -n "$PACKAGEKIT_CFLAGS"; then
+    pkg_cv_PACKAGEKIT_CFLAGS="$PACKAGEKIT_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
+    packagekit-glib2
+\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "
+    packagekit-glib2
+") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_PACKAGEKIT_CFLAGS=`$PKG_CONFIG --cflags "
+    packagekit-glib2
+" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$PACKAGEKIT_LIBS"; then
+    pkg_cv_PACKAGEKIT_LIBS="$PACKAGEKIT_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
+    packagekit-glib2
+\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "
+    packagekit-glib2
+") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_PACKAGEKIT_LIBS=`$PKG_CONFIG --libs "
+    packagekit-glib2
+" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        PACKAGEKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "
+    packagekit-glib2
+" 2>&1`
+        else
+	        PACKAGEKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "
+    packagekit-glib2
+" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$PACKAGEKIT_PKG_ERRORS" >&5
+
+	have_packagekit=no
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	have_packagekit=no
+else
+	PACKAGEKIT_CFLAGS=$pkg_cv_PACKAGEKIT_CFLAGS
+	PACKAGEKIT_LIBS=$pkg_cv_PACKAGEKIT_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	have_packagekit=yes
+fi
+ if test $have_packagekit = yes; then
+  HAVE_PACKAGEKIT_TRUE=
+  HAVE_PACKAGEKIT_FALSE='#'
+else
+  HAVE_PACKAGEKIT_TRUE='#'
+  HAVE_PACKAGEKIT_FALSE=
+fi
+
+
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5965,6 +6062,10 @@ if test -z "${HAVE_COLORD_TRUE}" && test -z "${HAVE_COLORD_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_COLORD\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${HAVE_PACKAGEKIT_TRUE}" && test -z "${HAVE_PACKAGEKIT_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_PACKAGEKIT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
   ac_config_commands="$ac_config_commands po/stamp-it"
 
@@ -6366,7 +6467,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.18.0, which was
+This file was extended by simple-scan $as_me 3.19.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6423,7 +6524,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.18.0
+simple-scan config.status 3.19.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -7130,3 +7231,13 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
+
+
+echo "
+                    Simple Scan $VERSION
+                    ====================
+
+        prefix:                   $prefix
+        PackageKit support:       $have_packagekit
+        Color management:         $have_colord
+"
diff --git a/configure.ac b/configure.ac
index d53c561..80dd44a 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.18.0)
+AC_INIT(simple-scan, 3.19.1)
 AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign])
 AM_SILENT_RULES([yes])
 AM_MAINTAINER_MODE
@@ -29,7 +29,6 @@ PKG_CHECK_MODULES(SIMPLE_SCAN, [
     cairo
     gdk-pixbuf-2.0
     gusb
-    packagekit-glib2
 ])
 
 PKG_CHECK_MODULES(COLORD, [
@@ -37,6 +36,11 @@ PKG_CHECK_MODULES(COLORD, [
 ], have_colord=yes, have_colord=no)
 AM_CONDITIONAL(HAVE_COLORD, test $have_colord = yes)
 
+PKG_CHECK_MODULES(PACKAGEKIT, [
+    packagekit-glib2
+], have_packagekit=yes, have_packagekit=no)
+AM_CONDITIONAL(HAVE_PACKAGEKIT, test $have_packagekit = yes)
+
 AC_CHECK_HEADERS([sane/sane.h],[],[AC_MSG_ERROR([SANE not found])])
 AC_CHECK_HEADERS([sane/saneopts.h],[],[AC_MSG_ERROR([SANE not found])])
 
@@ -66,3 +70,16 @@ help/Makefile
 po/Makefile.in
 src/Makefile
 ])
+
+dnl ###########################################################################
+dnl Summary
+dnl ###########################################################################
+
+echo "
+                    Simple Scan $VERSION
+                    ====================
+
+        prefix:                   $prefix
+        PackageKit support:       $have_packagekit
+        Color management:         $have_colord
+"
diff --git a/data/Makefile.in b/data/Makefile.in
index 471f609..a2aa206 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -268,6 +268,8 @@ MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
+PACKAGEKIT_CFLAGS = @PACKAGEKIT_CFLAGS@
+PACKAGEKIT_LIBS = @PACKAGEKIT_LIBS@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
diff --git a/data/appdata/Makefile.in b/data/appdata/Makefile.in
index ea56f50..8f862fb 100644
--- a/data/appdata/Makefile.in
+++ b/data/appdata/Makefile.in
@@ -205,6 +205,8 @@ MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
+PACKAGEKIT_CFLAGS = @PACKAGEKIT_CFLAGS@
+PACKAGEKIT_LIBS = @PACKAGEKIT_LIBS@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
diff --git a/data/icons/Makefile.in b/data/icons/Makefile.in
index 1cfa0ea..953ee81 100644
--- a/data/icons/Makefile.in
+++ b/data/icons/Makefile.in
@@ -175,6 +175,8 @@ MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
+PACKAGEKIT_CFLAGS = @PACKAGEKIT_CFLAGS@
+PACKAGEKIT_LIBS = @PACKAGEKIT_LIBS@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
diff --git a/help/C/brightness-contrast.page b/help/C/brightness-contrast.page
new file mode 100644
index 0000000..7f0c743
--- /dev/null
+++ b/help/C/brightness-contrast.page
@@ -0,0 +1,15 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="guide"
+      id="brightness-contrast">
+
+    <info>
+        <link type="guide" xref="index#acquire"/>
+    </info>
+
+	<title>Setting brightness and Contrast</title>
+
+    <p>
+    Some scanners allow the user to adjust the brightness and contrast when scanning.
+    If your scans come out too dark or too light you can adjust these settings from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
+    </p>
+</page>
diff --git a/help/C/quality.page b/help/C/quality.page
new file mode 100644
index 0000000..1075783
--- /dev/null
+++ b/help/C/quality.page
@@ -0,0 +1,17 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="guide"
+      id="quality">
+
+    <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/C/save.page b/help/C/save.page
index 575c36a..8b0b9d0 100644
--- a/help/C/save.page
+++ b/help/C/save.page
@@ -35,7 +35,8 @@
 		<td><p>PDF</p></td>
 		<td><p>A PDF can contain multiple pages, like a book, and is easy to distribute. Only a small number
 		of linux programs can modify PDF documents, so this format is recommended primarily for archiving.
-		See the <link href="http://en.wikipedia.org/wiki/pdf">PDF Wiki page</link> for more information.
+        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>
@@ -44,14 +45,15 @@
 		small, very easy to distribute, and suitable for uploading to social networking sites. Most operating
 		systems come with a JPEG editor by default. If you have scanned multiple pages, a JPEG file will be
 		created for each page. Use this file type if you want to modify or upload the scanned images.
-		See the <link href="http://en.wikipedia.org/wiki/jpeg">JPEG Wiki page</link> for more information.
+        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 Wiki page</link>
+		See the <link href="http://en.wikipedia.org/wiki/Portable_Network_Graphics">PNG Wikipedia page</link>
 		for more information.
 		    </p></td>
 	</tr>
@@ -59,7 +61,7 @@
 		<td><p>TIFF</p></td>
 		<td><p>TIFF files contain the raw data from the scanner. This makes them very large and not suitable
 		for distributing. If you have scanned multipe pages, a TIFF file will be created for each page.
-		See the <link href="http://en.wikipedia.org/wiki/Tagged_Image_File_Format">TIFF Wiki page</link>
+		See the <link href="http://en.wikipedia.org/wiki/Tagged_Image_File_Format">TIFF Wikipedia page</link>
 		for more information.
 		    </p></td>
 	</tr>
diff --git a/help/Makefile.am b/help/Makefile.am
index 63f36be..334c7d1 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -10,11 +10,13 @@ HELP_MEDIA = \
 
 HELP_FILES = index.page \
              adf.page \
+             brightness-contrast.page \
              crop.page \
              dpi.page \
              email.page \
              legal.xml \
              print.page \
+             quality.page \
              reorder.page \
              rotate.page \
              save.page \
diff --git a/help/Makefile.in b/help/Makefile.in
index 3f251d5..88af88b 100644
--- a/help/Makefile.in
+++ b/help/Makefile.in
@@ -175,6 +175,8 @@ MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
+PACKAGEKIT_CFLAGS = @PACKAGEKIT_CFLAGS@
+PACKAGEKIT_LIBS = @PACKAGEKIT_LIBS@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
@@ -251,11 +253,13 @@ HELP_MEDIA = \
 
 HELP_FILES = index.page \
              adf.page \
+             brightness-contrast.page \
              crop.page \
              dpi.page \
              email.page \
              legal.xml \
              print.page \
+             quality.page \
              reorder.page \
              rotate.page \
              save.page \
diff --git a/help/de/brightness-contrast.page b/help/de/brightness-contrast.page
new file mode 100644
index 0000000..170e7ee
--- /dev/null
+++ b/help/de/brightness-contrast.page
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="brightness-contrast" xml:lang="de">
+
+    <info>
+        <link type="guide" xref="index#acquire"/>
+    </info>
+
+	<title>Setting brightness and Contrast</title>
+
+    <p>
+    Some scanners allow the user to adjust the brightness and contrast when scanning.
+    If your scans come out too dark or too light you can adjust these settings from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
+    </p>
+</page>
diff --git a/help/de/quality.page b/help/de/quality.page
new file mode 100644
index 0000000..8c916e3
--- /dev/null
+++ b/help/de/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="de">
+
+    <info>
+        <link type="guide" xref="index#use"/>
+    </info>
+
+	<title>Setting the Image Quality</title>
+
+    <p>
+    You can adjust the image quality that is used when the scan is converted to a file by changing this setting in the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
+    Using a low quality will result in a small file size but may show some blurring or blockiness in the image.
+    A high quality will keep all the scanned information but require a larger file size.
+    See the <link href="https://en.wikipedia.org/wiki/Lossy_compression">Lossy compression Wikipedia page</link> for more information.
+    </p>    
+</page>
diff --git a/help/de/save.page b/help/de/save.page
index c59a243..6ce7c83 100644
--- a/help/de/save.page
+++ b/help/de/save.page
@@ -34,7 +34,8 @@
 		<td><p>PDF</p></td>
 		<td><p>A PDF can contain multiple pages, like a book, and is easy to distribute. Only a small number
 		of linux programs can modify PDF documents, so this format is recommended primarily for archiving.
-		See the <link href="http://en.wikipedia.org/wiki/pdf">PDF Wiki page</link> for more information.
+        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>
@@ -43,14 +44,15 @@
 		small, very easy to distribute, and suitable for uploading to social networking sites. Most operating
 		systems come with a JPEG editor by default. If you have scanned multiple pages, a JPEG file will be
 		created for each page. Use this file type if you want to modify or upload the scanned images.
-		See the <link href="http://en.wikipedia.org/wiki/jpeg">JPEG Wiki page</link> for more information.
+        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 Wiki page</link>
+		See the <link href="http://en.wikipedia.org/wiki/Portable_Network_Graphics">PNG Wikipedia page</link>
 		for more information.
 		    </p></td>
 	</tr>
@@ -58,7 +60,7 @@
 		<td><p>TIFF</p></td>
 		<td><p>TIFF files contain the raw data from the scanner. This makes them very large and not suitable
 		for distributing. If you have scanned multipe pages, a TIFF file will be created for each page.
-		See the <link href="http://en.wikipedia.org/wiki/Tagged_Image_File_Format">TIFF Wiki page</link>
+		See the <link href="http://en.wikipedia.org/wiki/Tagged_Image_File_Format">TIFF Wikipedia page</link>
 		for more information.
 		    </p></td>
 	</tr>
diff --git a/po/LINGUAS b/po/LINGUAS
index cfe274b..fd7e6b8 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -63,4 +63,5 @@ ur
 uz
 vi
 zh_CN
+zh_HK
 zh_TW
diff --git a/po/af.po b/po/af.po
index be24ea9..6cb00f3 100644
--- a/po/af.po
+++ b/po/af.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2012-09-03 08:13+0000\n"
 "Last-Translator: Dawid de Jager <dawid.dejager@gmail.com>\n"
 "Language-Team: Afrikaans <af@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:13+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:14+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "Foto"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr ""
 
@@ -206,7 +206,7 @@ msgstr "Skandeer"
 msgid "Save document to a file"
 msgstr "Stoor dokument na 'n lêer"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "Stoor"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "Insny"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "Voorkeure"
 
@@ -304,19 +304,6 @@ msgstr "Skandeer dokumente"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Skanderingstoestel"
@@ -418,6 +405,19 @@ msgstr ""
 msgid "Quality value to use for JPEG compression."
 msgstr ""
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -457,11 +457,6 @@ msgstr ""
 msgid "Failed to scan"
 msgstr "Skandering het misluk"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "Geskandeerde dokument"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -473,12 +468,7 @@ msgstr ""
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "Geskandeerde dokument.pdf"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr ""
 
@@ -498,8 +488,18 @@ msgstr ""
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr ""
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr ""
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "Stoor as..."
 
@@ -511,6 +511,11 @@ msgstr ""
 msgid "_Save"
 msgstr ""
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "Geskandeerde dokument.pdf"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -521,11 +526,6 @@ msgstr "Beeldlêers"
 msgid "All Files"
 msgstr "Alle lêers"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr ""
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -541,6 +541,11 @@ msgstr ""
 msgid "PNG (lossless)"
 msgstr ""
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr ""
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -645,97 +650,180 @@ msgstr ""
 msgid "Quit without Saving"
 msgstr ""
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr ""
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr ""
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr ""
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (verstek resolusie)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (hoë resolusie)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "Verander _skandeerder"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
@@ -760,6 +848,9 @@ msgstr ""
 #~ msgid "Window height in pixels"
 #~ msgstr "Venster hoogte in pixels"
 
+#~ msgid "Scanned Document"
+#~ msgstr "Geskandeerde dokument"
+
 #~ msgid "Please check your installation"
 #~ msgstr "Kontrolleer asseblief u installasie"
 
diff --git a/po/am.po b/po/am.po
index f1d6656..c896aed 100644
--- a/po/am.po
+++ b/po/am.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2015-03-15 04:56+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Amharic <am@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:13+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:14+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "ፎቶ"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr "ገጾች መመዝገቢያ"
 
@@ -206,7 +206,7 @@ msgstr "ማሰሻ"
 msgid "Save document to a file"
 msgstr "ሰነድ ወደ ፋይል ማስቀመጫ"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "ማስቀመጫ"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "መከርከሚያ"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "ምርጫዎች"
 
@@ -304,19 +304,6 @@ msgstr "ሰነድ ማሰሻ"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr ""
@@ -412,6 +399,19 @@ msgstr ""
 msgid "Quality value to use for JPEG compression."
 msgstr ""
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -451,11 +451,6 @@ msgstr ""
 msgid "Failed to scan"
 msgstr "ማሰስ አልተቻለም"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "የታሰሰው ሰነድ"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -467,12 +462,7 @@ msgstr ""
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "ያስኪዱ '%s --እርዳታ'  ዝግጁ የሆኑ የትእዛዝ መስመሮችን ለማየት"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr ""
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr "_መዝጊያ"
 
@@ -492,8 +482,18 @@ msgstr "ምንም ማሰሻ አልተገኘም"
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr ""
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr ""
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "ማስቀመጫ እንደ..."
 
@@ -505,6 +505,11 @@ msgstr "_መሰረዣ"
 msgid "_Save"
 msgstr "_ማሰቀመጫ"
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr ""
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -515,11 +520,6 @@ msgstr "የምስል ፋይሎች"
 msgid "All Files"
 msgstr "ሁሉንም ፋይሎች"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr "የ ፋይል _አይነት ይምረጡ"
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -535,6 +535,11 @@ msgstr "JPEG (የታመቀ)"
 msgid "PNG (lossless)"
 msgstr "PNG (ያልታመቀ)"
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr ""
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -633,97 +638,186 @@ msgstr ""
 msgid "Quit without Saving"
 msgstr ""
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr ""
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr ""
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr ""
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (ነባር)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr "አዲስ ሰነድ"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr "ሰነድ"
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr "ኢሜይል..."
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr "ማተሚያ..."
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr "እርዳታ"
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr "ስለ"
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr "ማጥፊያ"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "_ማሰሻ መቀየሪያ"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "ራሱ በራሱ"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr "ትንሽ"
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr "ተጨማሪ"
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr "አነስተኛ"
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
+
+#~ msgid "Scanned Document"
+#~ msgstr "የታሰሰው ሰነድ"
+
+#~ msgid "Select File _Type"
+#~ msgstr "የ ፋይል _አይነት ይምረጡ"
diff --git a/po/ar.po b/po/ar.po
index 68b3508..ea54814 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2012-07-23 08:56+0000\n"
 "Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:13+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:14+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "صورة"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr ""
 
@@ -206,7 +206,7 @@ msgstr "امسح"
 msgid "Save document to a file"
 msgstr "احفظ المستند في ملف"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "احفظ"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "اقتصاص"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "التفضيلات"
 
@@ -304,19 +304,6 @@ msgstr "امسح المستندات"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "الجهاز الذي سيمسح منه"
@@ -414,6 +401,19 @@ msgstr ""
 msgid "Quality value to use for JPEG compression."
 msgstr ""
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -453,11 +453,6 @@ msgstr "أصلح ملفات PDF المولدة باستخدام إصدارات �
 msgid "Failed to scan"
 msgstr "فشل المسح"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "مستند ممسوح"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -469,12 +464,7 @@ msgstr "[جهاز...] - أداة مسح ضوئي"
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "نفّذ '%s --help' لعرض القائمة الكاملة لخيارات سطر الأوامر المُتاحة."
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "مستند ممسوح.pdf"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr ""
 
@@ -494,8 +484,18 @@ msgstr "لم يُعثر على أي ماسحة"
 msgid "Please check your scanner is connected and powered on"
 msgstr "يرجى التحقق من أنّ الماسحة متصلة وتعمل"
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr ""
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr ""
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "احفظ كـ..."
 
@@ -507,6 +507,11 @@ msgstr ""
 msgid "_Save"
 msgstr ""
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "مستند ممسوح.pdf"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -517,11 +522,6 @@ msgstr "ملفات الصور"
 msgid "All Files"
 msgstr "كل الملفات"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr "اختر _نوع الملف"
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -537,6 +537,11 @@ msgstr "‏JPEG (مضغوط)"
 msgid "PNG (lossless)"
 msgstr "‏PNG (غير فقود)"
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr ""
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -655,97 +660,180 @@ msgstr "هل ترغب بحفظ المستند قبل الخروج؟"
 msgid "Quit without Saving"
 msgstr "أُخرج دون حفظ"
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr ""
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr ""
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr ""
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d نقطة\\بوصة (مبدئي)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d نقطة\\بوصة (مسودة)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d نقطة\\بوصة (دقة عالية)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr "%d نقطة\\بوصة"
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "غيّر _الماسحة"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "آلي"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr "يحفظ المستند..."
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "يحفظ الصفحة %d من أصل %d"
@@ -808,6 +896,12 @@ msgstr "يحفظ الصفحة %d من أصل %d"
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "الميز بالنقطة في البوصة للصورة الممسوحة سابقا."
 
+#~ msgid "Scanned Document"
+#~ msgstr "مستند ممسوح"
+
+#~ msgid "Select File _Type"
+#~ msgstr "اختر _نوع الملف"
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "اتجاه الماسحة خلال الصفحة الممسوحة."
 
diff --git a/po/ast.po b/po/ast.po
index fd719c7..2b89314 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2012-07-23 08:57+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Asturian <ast@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "Semeya"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr "Reordenar les páxines"
 
@@ -206,7 +206,7 @@ msgstr ""
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr ""
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "Preferencies"
 
@@ -304,19 +304,6 @@ msgstr ""
 msgid "scan;scanner;flatbed;adf;"
 msgstr "escanear;escáner;planu;adf;"
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr ""
@@ -414,6 +401,19 @@ msgstr "Calidá de la compresión de JPEG"
 msgid "Quality value to use for JPEG compression."
 msgstr "Calidá de la compresión de JPEG."
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -453,11 +453,6 @@ msgstr "Iguar ficheros PDF con versiones anteriores de Simple Scan"
 msgid "Failed to scan"
 msgstr "Falló al escanerr"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr ""
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -471,12 +466,7 @@ msgstr ""
 "Executa '%s --help' pa ver una llista completa de les opciones disponibles "
 "na llinia de comandos."
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "Documentu Escaneáu.pdf"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr "_Zarrar"
 
@@ -496,8 +486,18 @@ msgstr "Nun se deteutó dengún escáner"
 msgid "Please check your scanner is connected and powered on"
 msgstr "Por favor comprueba que l'escáner ta coneutáu y activáu"
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr ""
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr ""
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "Guardar como..."
 
@@ -509,6 +509,11 @@ msgstr "_Encaboxar"
 msgid "_Save"
 msgstr "_Guardar"
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "Documentu Escaneáu.pdf"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -519,11 +524,6 @@ msgstr ""
 msgid "All Files"
 msgstr ""
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr ""
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -539,6 +539,11 @@ msgstr ""
 msgid "PNG (lossless)"
 msgstr ""
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr ""
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -652,97 +657,180 @@ msgstr ""
 msgid "Quit without Saving"
 msgstr ""
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr ""
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr ""
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr ""
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr "Documentu nuevu"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr "Documentu"
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr "Corréu-e..."
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr "Imprentar..."
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr "Ayuda"
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr "Tocante a"
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr "Quitar"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr ""
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr "Más escuru"
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr "Más claru"
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr "Menos"
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr "Más"
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr "Mínimu"
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr "Máximu"
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr "Guardando documentu..."
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Guardando la páxina %d de %d"
diff --git a/po/az.po b/po/az.po
index e61a3d8..aba3913 100644
--- a/po/az.po
+++ b/po/az.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2015-01-01 15:02+0000\n"
 "Last-Translator: Nicat Məmmədov <n1c4t97@gmail.com>\n"
 "Language-Team: Azerbaijani <az@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr ""
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr ""
 
@@ -206,7 +206,7 @@ msgstr ""
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr ""
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "Kəs"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr ""
 
@@ -304,19 +304,6 @@ msgstr ""
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr ""
@@ -412,6 +399,19 @@ msgstr ""
 msgid "Quality value to use for JPEG compression."
 msgstr ""
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -451,11 +451,6 @@ msgstr ""
 msgid "Failed to scan"
 msgstr ""
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr ""
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -467,12 +462,7 @@ msgstr ""
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr ""
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr ""
 
@@ -492,8 +482,18 @@ msgstr ""
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr ""
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr ""
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr ""
 
@@ -505,6 +505,11 @@ msgstr ""
 msgid "_Save"
 msgstr ""
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr ""
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -515,11 +520,6 @@ msgstr ""
 msgid "All Files"
 msgstr ""
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr ""
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -535,6 +535,11 @@ msgstr ""
 msgid "PNG (lossless)"
 msgstr ""
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr ""
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -634,97 +639,180 @@ msgstr ""
 msgid "Quit without Saving"
 msgstr ""
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr ""
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr ""
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr ""
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr ""
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/bg.po b/po/bg.po
index 03ad2b5..1cd6e45 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2012-12-01 09:04+0000\n"
 "Last-Translator: Svetoslav Stefanov <svetlisashkov@yahoo.com>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "Снимка"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr ""
 
@@ -206,7 +206,7 @@ msgstr "Сканирай"
 msgid "Save document to a file"
 msgstr "Съхрани документа като файл"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "Съхрани"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "Изрежи"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "Настройки"
 
@@ -304,19 +304,6 @@ msgstr "Сканиране на документи"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Устройство за сканиране"
@@ -418,6 +405,19 @@ msgstr "Стойността на качеството, за използван�
 msgid "Quality value to use for JPEG compression."
 msgstr "Стойността на качеството, за използваната JPEG компресия."
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -457,11 +457,6 @@ msgstr "Поправи PDF файловете, създадени с по-ста
 msgid "Failed to scan"
 msgstr "Неусшно сканиране"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "Сканиран документ"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -474,12 +469,7 @@ msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Изпълнете „%s --help“, за да видите списъка с всички опции на командния ред."
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "Сканиран документ.pdf"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr "_Затвори"
 
@@ -499,8 +489,18 @@ msgstr "Не са открити скенери"
 msgid "Please check your scanner is connected and powered on"
 msgstr "Моля проверете дали скенерът ви е свързан и включен"
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr ""
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr ""
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "Съхрани като..."
 
@@ -512,6 +512,11 @@ msgstr "_Отмени"
 msgid "_Save"
 msgstr "_Съхрани"
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "Сканиран документ.pdf"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -522,11 +527,6 @@ msgstr "Файлове с изображения"
 msgid "All Files"
 msgstr "Всички файлове"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr "Избор на _тип файл"
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -542,6 +542,11 @@ msgstr "JPEG (компресирани)"
 msgid "PNG (lossless)"
 msgstr "PNG (без загуби на качеството)"
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr ""
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -661,97 +666,180 @@ msgstr "Да съхраня ли документа, преди да затво�
 msgid "Quit without Saving"
 msgstr "Излез без запазване"
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr ""
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr ""
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr ""
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (по подразбиране)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (чернова)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (висока разделителна способност)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "Смени _скенера"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "Автоматично"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr "Тъмно"
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr "Светло"
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr "Малко"
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr "Много"
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr "Минимално"
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr "Максимално"
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr "Съхраняване на документа..."
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Съхраняване на страница %d от %d"
@@ -823,6 +911,9 @@ msgstr "Съхраняване на страница %d от %d"
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Ширина на сканираните изображения в пиксели"
 
+#~ msgid "Scanned Document"
+#~ msgstr "Сканиран документ"
+
 #, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
@@ -843,6 +934,9 @@ msgstr "Съхраняване на страница %d от %d"
 #~ "  --gtk-module=МОДУЛИ Зареждане на допълнителни модули на GTK+\n"
 #~ "  --g-fatal-warnings Всички предупреждения да се считат за грешки"
 
+#~ msgid "Select File _Type"
+#~ msgstr "Избор на _тип файл"
+
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "TRUE ако прозореца на приложението е максимизиран."
 
diff --git a/po/bo.po b/po/bo.po
index e928646..480446f 100644
--- a/po/bo.po
+++ b/po/bo.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Tibetan <bo@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "པར"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr ""
 
@@ -206,7 +206,7 @@ msgstr "པར་བཤུ"
 msgid "Save document to a file"
 msgstr "ཡི་གེ་ཡིག་ཆའི་ནང་གསོག་ཉར"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "གསོག་ཉར"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "གཅད"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "རང་མོས་སྒྲིག་བཟོ"
 
@@ -304,19 +304,6 @@ msgstr "ཡིག་གེ་པར་བཤུ"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "འབྱུང་ཁུངས་མི་འདྲ་བའི་པར་བཤུ་སྒྲིག་ཆས"
@@ -414,6 +401,19 @@ msgstr ""
 msgid "Quality value to use for JPEG compression."
 msgstr ""
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -453,11 +453,6 @@ msgstr ""
 msgid "Failed to scan"
 msgstr "པར་བཤུ་བྱེད་མ་ཐུབ་པ"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "པར་བཤུ་ཚར་བའི་ཡི་གེ"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -469,12 +464,7 @@ msgstr ""
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "པར་བཤུས་ཡིག་ཆ.pdf"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr ""
 
@@ -494,8 +484,18 @@ msgstr "པར་བཤུ་ཆས་རྙེད་མ་བྱུང་"
 msgid "Please check your scanner is connected and powered on"
 msgstr "ཁྱོད་ཀྱི་པར་བཤུ་ཆས་སྦྲེལ་ཡོད་པ་དང་གློག་བཏང་ཡོད་པར་དག་བཤེར་བྱེད་རོགས"
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr ""
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr ""
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "ཉར་སྟངས་་་"
 
@@ -507,6 +507,11 @@ msgstr ""
 msgid "_Save"
 msgstr ""
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "པར་བཤུས་ཡིག་ཆ.pdf"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -517,11 +522,6 @@ msgstr "གཟུགས་བརྙན་ཡིག་ཆ"
 msgid "All Files"
 msgstr "ཡིག་ཆ་ཡོངས་རྫོགས"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr "ཡིག་ཆའི་རིགས་གདམ་པ_T"
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -537,6 +537,11 @@ msgstr "JPEG (བསྡུ་འཇུག)"
 msgid "PNG (lossless)"
 msgstr "PNG (བོར་བརླག་མ་ཤོར་བ)"
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr ""
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -647,97 +652,180 @@ msgstr "ཕྱིར་འཐེན་མ་བྱས་གོང་གསོག
 msgid "Quit without Saving"
 msgstr "གསོག་འཇོག་མ་བྱས་པར་ཕྱིར་འཐེན"
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr ""
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr ""
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr ""
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (སྔོན་འཛུགས)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (ཟིན་བྲིས)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (སྤུས་ཚད་མཐོན་པོ)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "པར་བཤུ་ཆས་བརྗེ་བ_S"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "ར་ང་འགུལ་ངང"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
@@ -796,6 +884,9 @@ msgstr ""
 #~ msgid "Window width in pixels"
 #~ msgstr "Window width in pixels"
 
+#~ msgid "Scanned Document"
+#~ msgstr "པར་བཤུ་ཚར་བའི་ཡི་གེ"
+
 #, c-format
 #~ msgid ""
 #~ "Help Options:\n"
@@ -834,6 +925,9 @@ msgstr ""
 #~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
 #~ "  --g-fatal-warnings              Make all warnings fatal"
 
+#~ msgid "Select File _Type"
+#~ msgstr "ཡིག་ཆའི་རིགས་གདམ་པ_T"
+
 #~ msgid "Files missing"
 #~ msgstr "ཡིག་ཆ་བརླགས་ཚར་འདུག"
 
diff --git a/po/ca.po b/po/ca.po
index 7cbec33..e0c73e3 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2012-07-23 08:57+0000\n"
 "Last-Translator: David Planella <david.planella@ubuntu.com>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "Foto"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr "Reordena les pàgines"
 
@@ -206,7 +206,7 @@ msgstr "Escaneja"
 msgid "Save document to a file"
 msgstr "Desa el document en un fitxer"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "Desa"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "Escapça"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "Preferències"
 
@@ -304,19 +304,6 @@ msgstr "Escanegeu documents"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Dispositiu d'escaneig"
@@ -420,6 +407,19 @@ msgstr "Valor de la qualitat a utilitzar per la compressió JPEG"
 msgid "Quality value to use for JPEG compression."
 msgstr "Valor de la qualitat a utilitzar per la compressió JPEG."
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -460,11 +460,6 @@ msgstr ""
 msgid "Failed to scan"
 msgstr "Ha fallat l'escaneig"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "Document escanejat"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -478,12 +473,7 @@ msgstr ""
 "Executeu «%s --help» per veure la llista completa d'opcions disponibles de "
 "la línia d'ordres."
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "Document escanejat.pdf"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr "_Tanca"
 
@@ -503,8 +493,18 @@ msgstr "No s'ha detectat cap escàner"
 msgid "Please check your scanner is connected and powered on"
 msgstr "Comproveu que l'escàner està connectat i engegat"
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr ""
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr ""
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "Anomena i desa..."
 
@@ -516,6 +516,11 @@ msgstr "_Cancel·la"
 msgid "_Save"
 msgstr "De_sa"
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "Document escanejat.pdf"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -526,11 +531,6 @@ msgstr "Fitxers d'imatge"
 msgid "All Files"
 msgstr "Tots els fitxers"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr "Seleccioneu el _tipus de fitxer"
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -546,6 +546,11 @@ msgstr "JPEG (comprimit)"
 msgid "PNG (lossless)"
 msgstr "PNG (sense pèrdua)"
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr ""
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -667,97 +672,180 @@ msgstr "Voleu desar el document abans de sortir?"
 msgid "Quit without Saving"
 msgstr "Surt sense desar"
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr ""
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr ""
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr ""
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (predeterminat)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (esborrany)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d ppp (alta resolució)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr "Document nou"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr "Document"
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr "Envia per correu electrònic..."
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr "Imprimeix..."
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr "Ajuda"
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "Canvia l'e_scàner"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "Automàtic"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr "Més fosc"
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr "Més clar"
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr "Menys"
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr "Més"
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr "Mínim"
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr "Màxim"
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr "S'està desant el document..."
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "S'està desant la pàgina %d de %d"
@@ -864,6 +952,9 @@ msgstr "S'està desant la pàgina %d de %d"
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Amplada de la imatge escanejada en píxels"
 
+#~ msgid "Select File _Type"
+#~ msgstr "Seleccioneu el _tipus de fitxer"
+
 #, c-format
 #~ msgid ""
 #~ "Help Options:\n"
@@ -880,5 +971,8 @@ msgstr "S'està desant la pàgina %d de %d"
 #~ "  --help-all                      Mostra l'ajuda de totes les opcions\n"
 #~ "  --help-gtk                      Mostra l'ajuda de les opcions de la GTK+"
 
+#~ msgid "Scanned Document"
+#~ msgstr "Document escanejat"
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "La direcció de l'escànner a través de la pàgina escanejada."
diff --git a/po/ca@valencia.po b/po/ca@valencia.po
index 1452a85..27ef6a5 100644
--- a/po/ca@valencia.po
+++ b/po/ca@valencia.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Catalan (Valencian) <ca@valencia@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "Foto"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr ""
 
@@ -206,7 +206,7 @@ msgstr "Escaneja"
 msgid "Save document to a file"
 msgstr "Guarda el document en un fitxer"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "Guarda"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "Escapça"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "Preferències"
 
@@ -304,19 +304,6 @@ msgstr "Escanegeu documents"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Dispositiu d'escaneig"
@@ -420,6 +407,19 @@ msgstr "Valor de la qualitat a utilitzar per la compressió JPEG"
 msgid "Quality value to use for JPEG compression."
 msgstr "Valor de la qualitat a utilitzar per la compressió JPEG."
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -460,11 +460,6 @@ msgstr ""
 msgid "Failed to scan"
 msgstr "Ha fallat l'escaneig"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "Document escanejat"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -478,12 +473,7 @@ msgstr ""
 "Executeu «%s --help» per veure la llista completa d'opcions disponibles de "
 "la línia d'ordes."
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "Document escanejat.pdf"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr "_Tanca"
 
@@ -503,8 +493,18 @@ msgstr "No s'ha detectat cap escàner"
 msgid "Please check your scanner is connected and powered on"
 msgstr "Comproveu que l'escàner està connectat i engegat"
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr ""
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr ""
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "Anomena i guarda..."
 
@@ -516,6 +516,11 @@ msgstr "_Cancel·la"
 msgid "_Save"
 msgstr "Al_ça"
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "Document escanejat.pdf"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -526,11 +531,6 @@ msgstr "Fitxers d'imatge"
 msgid "All Files"
 msgstr "Tots els fitxers"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr "Seleccioneu el _tipus de fitxer"
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -546,6 +546,11 @@ msgstr "JPEG (comprimit)"
 msgid "PNG (lossless)"
 msgstr "PNG (sense pèrdua)"
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr ""
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -660,97 +665,180 @@ msgstr "Voleu guardar el document abans d'eixir?"
 msgid "Quit without Saving"
 msgstr "Ix sense guardar"
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr ""
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr ""
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr ""
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (predeterminat)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (esborrany)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d ppp (alta resolució)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "Canvia l'e_scàner"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "Automàtic"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr "Més fosc"
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr "Més clar"
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr "Menys"
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr "Més"
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr "Mínim"
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr "Màxim"
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr "S'està guardant el document..."
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "S'està guardant la pàgina %d de %d"
@@ -798,6 +886,9 @@ msgstr "S'està guardant la pàgina %d de %d"
 #~ msgid "Window width in pixels"
 #~ msgstr "Amplada de la finestra en píxels"
 
+#~ msgid "Scanned Document"
+#~ msgstr "Document escanejat"
+
 #, c-format
 #~ msgid ""
 #~ "Usage:\n"
@@ -822,6 +913,9 @@ msgstr "S'està guardant la pàgina %d de %d"
 #~ "  --help-all                      Mostra l'ajuda de totes les opcions\n"
 #~ "  --help-gtk                      Mostra l'ajuda de les opcions de la GTK+"
 
+#~ msgid "Select File _Type"
+#~ msgstr "Seleccioneu el _tipus de fitxer"
+
 #~ msgid "Files missing"
 #~ msgstr "Manquen fitxers"
 
diff --git a/po/ce.po b/po/ce.po
index 647a01a..06c8d99 100644
--- a/po/ce.po
+++ b/po/ce.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2014-08-12 08:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Chechen <ce@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr ""
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr ""
 
@@ -206,7 +206,7 @@ msgstr ""
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr ""
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr ""
 
@@ -304,19 +304,6 @@ msgstr ""
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr ""
@@ -412,6 +399,19 @@ msgstr ""
 msgid "Quality value to use for JPEG compression."
 msgstr ""
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -451,11 +451,6 @@ msgstr ""
 msgid "Failed to scan"
 msgstr ""
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr ""
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -467,12 +462,7 @@ msgstr ""
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr ""
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr ""
 
@@ -492,8 +482,18 @@ msgstr ""
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr ""
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr ""
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr ""
 
@@ -505,6 +505,11 @@ msgstr ""
 msgid "_Save"
 msgstr ""
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr ""
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -515,11 +520,6 @@ msgstr ""
 msgid "All Files"
 msgstr ""
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr ""
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -535,6 +535,11 @@ msgstr ""
 msgid "PNG (lossless)"
 msgstr ""
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr ""
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -631,97 +636,180 @@ msgstr ""
 msgid "Quit without Saving"
 msgstr ""
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr ""
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr ""
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr ""
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr ""
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/cs.po b/po/cs.po
index 52d7d19..e266499 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2013-12-18 12:25+0000\n"
 "Last-Translator: Tadeáš Pařík <tadeas.parik@gmail.com>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "Fotografie"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr ""
 
@@ -206,7 +206,7 @@ msgstr "Skenovat"
 msgid "Save document to a file"
 msgstr "Uložit dokument do souboru"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "Uložit"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "Oříznout"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "Předvolby"
 
@@ -304,19 +304,6 @@ msgstr "Naskenovat dokumenty"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Zařízení určené ke skenování"
@@ -418,6 +405,19 @@ msgstr "Hodnota kvality u JPEG komprese"
 msgid "Quality value to use for JPEG compression."
 msgstr "Hodnota kvality u JPEG komprese."
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -458,11 +458,6 @@ msgstr ""
 msgid "Failed to scan"
 msgstr "Skenování selhalo"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "Skenovaný dokument"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -476,12 +471,7 @@ msgstr ""
 "Spustit příkaz „%s --help“ k zobrazení úplného seznamu dostupných přepínačů "
 "příkazové řádky."
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "Naskenovaný dokument.pdf"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr "Z_avřít"
 
@@ -501,8 +491,18 @@ msgstr "Nenalezen žádný skener"
 msgid "Please check your scanner is connected and powered on"
 msgstr "Zkontrolujte prosím, že je váš skener připojen a zapnut"
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr ""
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr ""
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "Uložit jako..."
 
@@ -514,6 +514,11 @@ msgstr "_Zrušit"
 msgid "_Save"
 msgstr "_Uložit"
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "Naskenovaný dokument.pdf"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -524,11 +529,6 @@ msgstr "Soubory obrázků"
 msgid "All Files"
 msgstr "Všechny soubory"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr "Zvolit _typ souboru"
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -544,6 +544,11 @@ msgstr "JPEG (komprimovaný)"
 msgid "PNG (lossless)"
 msgstr "PNG (bezeztrátový)"
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr ""
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -666,97 +671,180 @@ msgstr "Uložit dokument před ukončením?"
 msgid "Quit without Saving"
 msgstr "Ukončit bez uložení"
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr ""
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr ""
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr ""
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (výchozí)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (náčrt)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (vysoké rozlišení)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "Změnit _skener"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "Automaticky"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr "Tmavší"
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr "Světlejší"
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr "Méně"
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr "Více"
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr "Maximum"
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr "Ukládání dokumentu..."
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Ukládání strany %d z %d"
@@ -785,6 +873,9 @@ msgstr "Ukládání strany %d z %d"
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Šířka skenovaného obrázku v pixelech"
 
+#~ msgid "Scanned Document"
+#~ msgstr "Skenovaný dokument"
+
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "Nastavit na hodnotu PRAVDA, pokud má být okno maximalizované"
 
@@ -870,6 +961,9 @@ msgstr "Ukládání strany %d z %d"
 #~ "  --gtk-module=MODULY             Načte přídavné moduly GTK+\n"
 #~ "  --g-fatal-warnings              Všechna varování budou kritická"
 
+#~ msgid "Select File _Type"
+#~ msgstr "Zvolit _typ souboru"
+
 #~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
diff --git a/po/da.po b/po/da.po
index 688067e..0262779 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2012-10-10 12:13+0000\n"
 "Last-Translator: AJenbo <anders@jenbo.dk>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "Billede"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr "Sortér sider påny"
 
@@ -206,7 +206,7 @@ msgstr "Skan"
 msgid "Save document to a file"
 msgstr "Gem dokument som en fil"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "Gem"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "Beskær"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "Indstillinger"
 
@@ -294,7 +294,7 @@ msgstr "Kvalitet:"
 
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Document Scanner"
-msgstr ""
+msgstr "Dokumentskanner"
 
 #: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
@@ -302,20 +302,7 @@ msgstr "Skan dokumenter"
 
 #: ../data/simple-scan.desktop.in.h:4
 msgid "scan;scanner;flatbed;adf;"
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
+msgstr "scan;scanner;flatbed;adf;skan;skanner;"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
@@ -419,6 +406,19 @@ msgstr "Kvalitetsværdi der bruges til JPEG-komprimering"
 msgid "Quality value to use for JPEG compression."
 msgstr "Kvalitetsværdi der bruges til JPEG-komprimering."
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -458,11 +458,6 @@ msgstr "Ret PDF-filer oprettet med ældre versioner af Simple Scan"
 msgid "Failed to scan"
 msgstr "Skanning mislykkedes"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "Skannet dokument"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -476,12 +471,7 @@ msgstr ""
 "Udfør \"%s --help\" for at se den fulde liste af tilgængelige "
 "kommandolinjetilvalg."
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "Skannet dokument.pdf"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr "_Luk"
 
@@ -501,8 +491,18 @@ msgstr "Ingen skannere fundet"
 msgid "Please check your scanner is connected and powered on"
 msgstr "Kontrollér venligst at skanneren er tændt og sluttet til"
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr "Yderligere software påkrævet"
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr "Det er nødvendigt at installere en driver til din skanner."
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "Gem som..."
 
@@ -514,6 +514,11 @@ msgstr "_Annullér"
 msgid "_Save"
 msgstr "_Gem"
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "Skannet dokument.pdf"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -524,11 +529,6 @@ msgstr "Billedfiler"
 msgid "All Files"
 msgstr "Alle filer"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr "Vælg fil_type"
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -544,6 +544,11 @@ msgstr "JPEG (komprimeret)"
 msgid "PNG (lossless)"
 msgstr "PNG (tabsfri)"
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr "Filformat:"
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -664,97 +669,182 @@ msgstr "Gem dokumentet før der afsluttes?"
 msgid "Quit without Saving"
 msgstr "Afslut uden at gemme"
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr "Du ser ud til at have en Brother skanner."
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+"Der er drivere er tilgængelige til denne på <a "
+"href=\"http://support.brother.com\">Brothers webside</a>."
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr "Du ser ud til at have en Samsung-skanner."
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr "Du ser ud til at have en HP-skanner"
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr "Du ser ud til at have en Epson-skanner"
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr ""
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr ""
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr "Driver installeret korrekt!"
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr "Installation af drivere mislykkedes (fejlkode %d)."
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr "Installation af drivere mislykkedes."
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (standard)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (udkast)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (høj opløsning)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr "Nyt dokument"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr "Dokument"
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr "E-post..."
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr "Udskriv..."
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr "Hjælp"
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr "Om"
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr "Afslut"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "Skift _skanner"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr "_Installér drivere"
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr "Mørkere"
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr "Lysere"
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr "Mindre"
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr "Mere"
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr "Maksimum"
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr "Gemmer dokument ..."
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Gemmer side %d ud af %d"
@@ -768,6 +858,9 @@ msgstr "Gemmer side %d ud af %d"
 #~ msgid "Files missing"
 #~ msgstr "Filer mangler"
 
+#~ msgid "Select File _Type"
+#~ msgstr "Vælg fil_type"
+
 #~ msgid "Direction of scan"
 #~ msgstr "Skanneretning"
 
@@ -863,6 +956,9 @@ msgstr "Gemmer side %d ud af %d"
 #~ "  --gtk-module=MODULER            Indlæs ekstra GTK+-moduler\n"
 #~ "  --g-fatal-warnings              Gør alle advarsler fatale"
 
+#~ msgid "Scanned Document"
+#~ msgstr "Skannet dokument"
+
 #~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
diff --git a/po/de.po b/po/de.po
index 6a10a9b..342aabe 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2015-01-16 18:30+0000\n"
 "Last-Translator: Tobias Bannert <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "Foto"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr "Seiten umsortieren"
 
@@ -206,7 +206,7 @@ msgstr "Scannen"
 msgid "Save document to a file"
 msgstr "Als Datei speichern"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "Speichern"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "Zuschneiden"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "Einstellungen"
 
@@ -304,26 +304,6 @@ msgstr "Dokumente scannen"
 msgid "scan;scanner;flatbed;adf;"
 msgstr "scan;einlesen;scanner;Flachbrett;flatbed;AVW;Vorlagenwechsler;adf;"
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-"Eine ganz einfache Methode, um sowohl Dokumente als auch Fotos zu scannen. "
-"Unbrauchbare Teile eines Fotos können abgeschnitten werden, es kann gedreht "
-"werden, falls es verkehrt herum liegt. Die Scans können gedruckt, als PDF-"
-"Dokument exportiert oder in einer Anzahl verschiedener Bildformate "
-"gespeichert werden."
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-"Simple Scan verwendet das SANE-Programmiergerüst für die Unterstützung der "
-"meisten verfügbaren Scanner."
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Scangerät"
@@ -425,6 +405,26 @@ msgstr "Qualitätswert für die JPEG-Komprimierung"
 msgid "Quality value to use for JPEG compression."
 msgstr "Qualitätswert, der für die JPEG-Komprimierung verwendet werden soll."
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"Eine ganz einfache Methode, um sowohl Dokumente als auch Fotos zu scannen. "
+"Unbrauchbare Teile eines Fotos können abgeschnitten werden, es kann gedreht "
+"werden, falls es verkehrt herum liegt. Die Scans können gedruckt, als PDF-"
+"Dokument exportiert oder in einer Anzahl verschiedener Bildformate "
+"gespeichert werden."
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Simple Scan verwendet das SANE-Programmiergerüst für die Unterstützung der "
+"meisten verfügbaren Scanner."
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -466,11 +466,6 @@ msgstr ""
 msgid "Failed to scan"
 msgstr "Scannen fehlgeschlagen"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "Gescanntes Dokument"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -484,12 +479,7 @@ msgstr ""
 "Rufen Sie »%s --help« auf, um eine vollständige Liste der verfügbaren "
 "Befehlszeileoptionen zu erhalten."
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "Gescanntes Dokument.pdf"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr "S_chließen"
 
@@ -511,8 +501,18 @@ msgid "Please check your scanner is connected and powered on"
 msgstr ""
 "Bitte überprüfen Sie, ob Ihr Scanner angeschlossen und eingeschaltet ist"
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr "Zusätzliche Software wird benötigt"
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr "Sie müssen die Treibersoftware für Ihren Scanner installieren"
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "Speichern unter …"
 
@@ -524,6 +524,11 @@ msgstr "Abbre_chen"
 msgid "_Save"
 msgstr "_Speichern"
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "Gescanntes Dokument.pdf"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -534,11 +539,6 @@ msgstr "Bilddateien"
 msgid "All Files"
 msgstr "Alle Dateitypen"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr "_Dateityp auswählen"
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -554,6 +554,11 @@ msgstr "JPEG (Verlustbehaftet)"
 msgid "PNG (lossless)"
 msgstr "PNG (Verlustfrei)"
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr "Dateiformat:"
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -661,6 +666,7 @@ msgstr ""
 "  .daniel. https://launchpad.net/~faessje\n"
 "  Alexander Wilms https://launchpad.net/~alexander-wilms\n"
 "  Alvaro Aleman https://launchpad.net/~alvaroaleman\n"
+"  Anthony Harrington https://launchpad.net/~untaintableangel\n"
 "  Charon https://launchpad.net/~markus-lobedann\n"
 "  Daniel Schury https://launchpad.net/~surst\n"
 "  Daniel Winzen https://launchpad.net/~q-d\n"
@@ -710,97 +716,186 @@ msgstr "Dokument vor dem Beenden speichern?"
 msgid "Quit without Saving"
 msgstr "Beenden ohne zu speichern"
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr "Scheinbar ist ein Brother Scanner angeschlossen."
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+"Treiber hierfür sind verfügbar auf der <a "
+"href=\"http://support.brother.com\">Brother Webseite</a>."
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr "Scheinbar ist ein Samsung Scanner angeschlossen."
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+"Treiber hierfür sind verfügbar auf der <a "
+"href=\"http://samsung.com/support\">Samsung Webseite</a>."
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr "Scheinbar ist ein HP Scanner angeschlossen."
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr "Scheinbar ist ein Epson Scanner angeschlossen."
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+"Treiber hierfür sind verfügbar auf der <a "
+"href=\"http://support.epsom.com\">Epson Webseite</a>."
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr "Treiber installieren"
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr "Nach der Installation müssen Simple Scan erneut starten."
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr "Treiber werden installiert…"
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr "Treiber wurden erfolgreich installiert!"
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr "Treiberinstallation fehlgeschlagen (Fehlernummer %d)."
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr "Treiberinstallation fehlgeschlagen."
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (Vorgabe)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (Entwurf)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (Hohe Auflösung)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr "Neues Dokument"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr "Dokument"
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr "E-Mail …"
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr "Drucken …"
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr "Hilfe"
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr "Über"
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr "Beenden"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "_Scanner wechseln"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr "_Treiber installieren"
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr "Dunkler"
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr "Heller"
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr "Weniger"
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr "Mehr"
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr "Niedrig"
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr "Hoch"
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr "Dokument wird gespeichert …"
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Seite %d von %d wird gespeichert"
@@ -842,6 +937,9 @@ msgstr "Seite %d von %d wird gespeichert"
 #~ msgid "Window width in pixels"
 #~ msgstr "Fensterbreite in Pixel"
 
+#~ msgid "Scanned Document"
+#~ msgstr "Gescanntes Dokument"
+
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Höhe des gescannten Bilds in Pixel"
 
@@ -924,3 +1022,6 @@ msgstr "Seite %d von %d wird gespeichert"
 
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "Die Richtung des Scanners über die gescannte Seite."
+
+#~ msgid "Select File _Type"
+#~ msgstr "_Dateityp auswählen"
diff --git a/po/el.po b/po/el.po
index 27b69f8..05368df 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2013-07-03 07:45+0000\n"
 "Last-Translator: John Pag <ioanpagges@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "Φωτογραφία"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr "Επαναδιάταξη σελίδων"
 
@@ -206,7 +206,7 @@ msgstr "Σάρωση"
 msgid "Save document to a file"
 msgstr "Αποθήκευση εγγράφου σε αρχείο"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "Αποθήκευση"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "Περικοπή"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "Προτιμήσεις"
 
@@ -304,19 +304,6 @@ msgstr "Σάρωση εγγράφων"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Συσκευή που χρησιμοποιείται για σάρωση"
@@ -423,6 +410,19 @@ msgstr "Τιμή της ποιότητας που θα χρησιμοποιηθ�
 msgid "Quality value to use for JPEG compression."
 msgstr "Τιμή της ποιότητας που θα χρησιμοποιηθεί για τη συμπίεση JPEG."
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -464,11 +464,6 @@ msgstr ""
 msgid "Failed to scan"
 msgstr "Η σάρωση απέτυχε"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "Σαρωμένο"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -482,12 +477,7 @@ msgstr ""
 "Εκτελέστε «%s --help» για να δείτε την πλήρη λίστα των διαθέσιμων επιλογών "
 "εντολής γραμμής."
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "Σαρωμένο.pdf"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr "_Κλείσιμο"
 
@@ -509,8 +499,18 @@ msgstr ""
 "Παρακαλούμε βεβαιωθείτε ότι ο σαρωτής σας είναι συνδεδεμένος και σε "
 "λειτουργία"
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr ""
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr ""
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "Αποθήκευση ως..."
 
@@ -522,6 +522,11 @@ msgstr "_Ακύρωση"
 msgid "_Save"
 msgstr "Απο_θήκευση"
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "Σαρωμένο.pdf"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -532,11 +537,6 @@ msgstr "Αρχεία εικόνων"
 msgid "All Files"
 msgstr "Όλα τα αρχεία"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr "Επιλογή _τύπου αρχείου"
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -552,6 +552,11 @@ msgstr "JPEG (συμπιεσμένο)"
 msgid "PNG (lossless)"
 msgstr "PNG (δίχως συμπίεση)"
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr ""
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -678,97 +683,180 @@ msgstr "Αποθήκευση του εγγράφου πριν την έξοδο;
 msgid "Quit without Saving"
 msgstr "Έξοδος χωρίς Αποθήκευση"
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr ""
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr ""
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr ""
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (προεπιλογή)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (πρόχειρο)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (υψηλή ανάλυση)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr "Νέο έγγραφο"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr "Έγγραφο"
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr "Ηλεκτρονική αλληλογραφία..."
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr "Εκτύπωση..."
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr "Βοήθεια"
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr "Περί"
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr "'Εξοδος"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "Αλλαγή _σαρωτή"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "Αυτόματο"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr "Σκοτεινότερο"
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr "Φωτεινότερο"
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr "Λιγότερο"
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr "Περισσότερο"
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr "Ελάχιστο"
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr "Μέγιστο"
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr "Αποθήκευση εγγράφου..."
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Αποθήκευση σελίδας %d από %d"
@@ -844,6 +932,9 @@ msgstr "Αποθήκευση σελίδας %d από %d"
 #~ "  --help-all Εμφάνιση όλων των επιλογών βοήθειας\n"
 #~ "  --help-gtk Εμφάνιση επιλογών GTK+"
 
+#~ msgid "Select File _Type"
+#~ msgstr "Επιλογή _τύπου αρχείου"
+
 #~ msgid "Files missing"
 #~ msgstr "Λείπουν αρχεία"
 
@@ -884,5 +975,8 @@ msgstr "Αποθήκευση σελίδας %d από %d"
 #~ "  --gtk-module=MODULES            Φόρτωση πρόσθετων αρθρωμάτων GTK+\n"
 #~ "  --g-fatal-warnings              Να είναι όλες οι προειδοποιήσεις μοιραίες"
 
+#~ msgid "Scanned Document"
+#~ msgstr "Σαρωμένο"
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "Ο προσανατολισμός του σαρωτή  στη σαρωμένη σελίδα"
diff --git a/po/en_GB.po b/po/en_GB.po
index fa8b314..7a9cb0c 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2012-07-23 08:58+0000\n"
 "Last-Translator: James Thorrold <jameslin@inbox.com>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "Photo"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr "Reorder Pages"
 
@@ -206,7 +206,7 @@ msgstr "Scan"
 msgid "Save document to a file"
 msgstr "Save document to a file"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "Save"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "Crop"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "Preferences"
 
@@ -304,24 +304,6 @@ msgstr "Scan Documents"
 msgid "scan;scanner;flatbed;adf;"
 msgstr "scan;scanner;flatbed;adf;"
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to PDF or save them in a range of image "
-"formats."
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-"Simple Scan uses the SANE framework which supports most existing scanners."
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Device to scan from"
@@ -423,6 +405,24 @@ msgstr "Quality value to use for JPEG compression"
 msgid "Quality value to use for JPEG compression."
 msgstr "Quality value to use for JPEG compression."
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to PDF or save them in a range of image "
+"formats."
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Simple Scan uses the SANE framework which supports most existing scanners."
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -462,11 +462,6 @@ msgstr "Fix PDF files generated with older versions of Simple Scan"
 msgid "Failed to scan"
 msgstr "Failed to scan"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "Scanned Document"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -479,12 +474,7 @@ 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."
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "Scanned Document.pdf"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr "_Close"
 
@@ -504,8 +494,18 @@ msgstr "No scanners detected"
 msgid "Please check your scanner is connected and powered on"
 msgstr "Please check your scanner is connected and powered on"
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr "Additional software needed"
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr "You need to install driver software for your scanner."
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "Save As..."
 
@@ -517,6 +517,11 @@ msgstr "_Cancel"
 msgid "_Save"
 msgstr "_Save"
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "Scanned Document.pdf"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -527,11 +532,6 @@ msgstr "Image Files"
 msgid "All Files"
 msgstr "All Files"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr "Select File _Type"
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -547,6 +547,11 @@ msgstr "JPEG (compressed)"
 msgid "PNG (lossless)"
 msgstr "PNG (lossless)"
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr "File format:"
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -665,97 +670,186 @@ msgstr "Save document before quitting?"
 msgid "Quit without Saving"
 msgstr "Quit without Saving"
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr "You appear to have a Brother scanner."
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr "You appear to have a Samsung scanner."
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr "You appear to have an HP scanner."
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr "You appear to have an Epson scanner."
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epson.com\">Epson website</a>."
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr "Install drivers"
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr "Once installed, you will need to restart Simple Scan."
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr "Installing drivers..."
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr "Drivers installed successfully!"
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr "Failed to install drivers (error code %d)."
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr "Failed to install drivers."
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr "You need to install the %s package(s)."
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (default)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (draft)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (high resolution)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr "New Document"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr "Document"
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr "E-mail..."
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr "Print..."
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr "Help"
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr "About"
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr "Quit"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "Change _Scanner"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr "_Install Drivers"
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "Automatic"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr "Darker"
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr "Lighter"
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr "Less"
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr "More"
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr "Maximum"
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr "Saving document..."
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Saving page %d out of %d"
@@ -847,9 +941,15 @@ msgstr "Saving page %d out of %d"
 #~ msgid "Window width in pixels"
 #~ msgstr "Window width (in pixels)"
 
+#~ msgid "Scanned Document"
+#~ msgstr "Scanned Document"
+
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Width of scanned image (in pixels)"
 
+#~ msgid "Select File _Type"
+#~ msgstr "Select File _Type"
+
 #, c-format
 #~ msgid ""
 #~ "Help Options:\n"
diff --git a/po/eo.po b/po/eo.po
index 0b27613..a4359d7 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2015-06-06 14:32+0000\n"
 "Last-Translator: Manuel Ortega <manuel@grupolasindias.coop>\n"
 "Language-Team: Esperanto\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 "Language: eo\n"
 
 #. Button to submit authorization dialog
@@ -89,7 +89,7 @@ msgstr "Foto"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr "Reordigi paĝojn"
 
@@ -207,7 +207,7 @@ msgstr "Skani"
 msgid "Save document to a file"
 msgstr "Konservi dokumenton en dosiero"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "Konservi"
 
@@ -249,7 +249,7 @@ msgid "Crop"
 msgstr "Stuci"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "Agordoj"
 
@@ -305,19 +305,6 @@ msgstr "Skani dokumentojn"
 msgid "scan;scanner;flatbed;adf;"
 msgstr "skani;skanilo;plata;adf;"
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "La aparato el kiu skani"
@@ -419,6 +406,19 @@ msgstr "Kvalito por JPEG-densigo"
 msgid "Quality value to use for JPEG compression."
 msgstr "Kvalito por JPEG-densigo"
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -458,11 +458,6 @@ msgstr "Ripari PDF-dosierojn generitajn per antaŭaj versioj de Simple Scan"
 msgid "Failed to scan"
 msgstr "Ne sukcesi skani"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "Skanita Dokumento"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -475,12 +470,7 @@ 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."
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "Skanita Dokumento.pdf"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr "_Fermi"
 
@@ -500,8 +490,18 @@ msgstr "Neniuj skaniloj eltrovis"
 msgid "Please check your scanner is connected and powered on"
 msgstr "Bonvolu kontrolas ke via skanilo estas kenekta kaj kurentŝalta"
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr ""
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr ""
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "Konservi kiel..."
 
@@ -513,6 +513,11 @@ msgstr "_Nuligi"
 msgid "_Save"
 msgstr "Kon_servi"
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "Skanita Dokumento.pdf"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -523,11 +528,6 @@ msgstr "Bildo-dosieroj"
 msgid "All Files"
 msgstr "Ĉiuj dosieroj"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr "Elekti speco de dosieron"
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -543,6 +543,11 @@ msgstr "JPEG (densigita)"
 msgid "PNG (lossless)"
 msgstr "PNG (senperda)"
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr ""
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -661,97 +666,180 @@ msgstr "Konservi dokumenton antaŭe ĉesanta?"
 msgid "Quit without Saving"
 msgstr "Fini sen konservanta"
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr ""
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr ""
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr ""
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d punktoj en colo (defaŭlto)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d punktoj en colo (malneto)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d punktoj en colo (alta distingivo)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr "%d punktoj en colo"
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "Ŝanĝi _Skanilo"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "Aŭtomata"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr "Pli malhele"
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr "Pli hele"
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr "Malpli"
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr "Pli"
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr "Minimume"
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr "Maksimume"
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr "Konservado de dokumento..."
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Konservado de paĝo %d el %d"
@@ -820,6 +908,9 @@ msgstr "Konservado de paĝo %d el %d"
 #~ msgid "Window width in pixels"
 #~ msgstr "Fenestro-larĝo en rastrumeroj"
 
+#~ msgid "Scanned Document"
+#~ msgstr "Skanita Dokumento"
+
 #, c-format
 #~ msgid ""
 #~ "Usage:\n"
@@ -865,6 +956,9 @@ msgstr "Konservado de paĝo %d el %d"
 #~ "  --gtk-module=MODULAJ            Ŝargi suplementaj GTK+ moduloj\n"
 #~ "  --g-fatal-warnings              Fari ĉiujn avertojn neripareblaj"
 
+#~ msgid "Select File _Type"
+#~ msgstr "Elekti speco de dosieron"
+
 #~ msgid "Files missing"
 #~ msgstr "Dosieroj estas perdiĝantoj"
 
diff --git a/po/es.po b/po/es.po
index da8371e..62cbad5 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2015-05-25 02:42+0000\n"
 "Last-Translator: Adolfo Jayme <fitoschido@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "Foto"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr "Reordenar las páginas"
 
@@ -206,7 +206,7 @@ msgstr "Escanear"
 msgid "Save document to a file"
 msgstr "Guardar documento a un archivo"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "Guardar"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "Recortar"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "Preferencias"
 
@@ -304,25 +304,6 @@ msgstr "Escanear documentos"
 msgid "scan;scanner;flatbed;adf;"
 msgstr "escanear;escáner;plano;adf;"
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-"Escanee documentos y fotos con suma sencillez. Es posible recortar las "
-"partes no deseadas de una foto y girarla si quedó al revés. Luego podrá "
-"imprimir las digitalizaciones, exportarlas a PDF o guardarlas en diversos "
-"formatos de imagen."
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-"Simple Scan emplea el marco SANE para compatibilidad con la mayoría de los "
-"escáneres existentes."
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Para escanear desde el dispositivo"
@@ -425,6 +406,25 @@ msgstr "Calidad de la compresión de JPEG"
 msgid "Quality value to use for JPEG compression."
 msgstr "Calidad de la compresión de JPEG."
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"Escanee documentos y fotos con suma sencillez. Es posible recortar las "
+"partes no deseadas de una foto y girarla si quedó al revés. Luego podrá "
+"imprimir las digitalizaciones, exportarlas a PDF o guardarlas en diversos "
+"formatos de imagen."
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Simple Scan emplea el marco SANE para compatibilidad con la mayoría de los "
+"escáneres existentes."
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -465,11 +465,6 @@ msgstr ""
 msgid "Failed to scan"
 msgstr "Falló al escanear"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "Documento escaneado"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -483,12 +478,7 @@ msgstr ""
 "Ejecute «%s --help» para ver una lista completa de las opciones de línea de "
 "órdenes disponibles."
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "Documento.pdf escaneado"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr "_Cerrar"
 
@@ -508,8 +498,18 @@ msgstr "No se detectó ningún escáner"
 msgid "Please check your scanner is connected and powered on"
 msgstr "Compruebe que su escáner está encendido y conectado"
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr "Se necesita software adicional"
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr "Es necesario instalar controladores para el escáner."
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "Guardar como…"
 
@@ -521,6 +521,11 @@ msgstr "_Cancelar"
 msgid "_Save"
 msgstr "_Guardar"
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "Documento.pdf escaneado"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -531,11 +536,6 @@ msgstr "Archivos de imagen"
 msgid "All Files"
 msgstr "Todos los archivos"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr "Seleccione el _tipo de archivo"
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -551,6 +551,11 @@ msgstr "JPEG (comprimido)"
 msgid "PNG (lossless)"
 msgstr "PNG (sin pérdida)"
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr "Formato de archivo:"
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -686,97 +691,184 @@ msgstr "¿Guardar el documento antes de salir?"
 msgid "Quit without Saving"
 msgstr "Salir sin guardar"
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr "Parece que tiene un escáner Brother."
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+"En el <a href=\"http://support.brother.com\">sitio web de Brother</a> "
+"encontrará controladores."
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr "Parece que tiene un escáner Samsung."
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+"En el <a href=\"http://samsung.com/support\">sitio web de Samsung</a> "
+"encontrará controladores."
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr "Parece que tiene un escáner HP."
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr "Parece que tiene un escáner Epson."
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr "Instalación de controladores"
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr "Cuando finalice la instalación deberá reiniciar Simple Scan."
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr "Instalando los controladores…"
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr "Los controladores se instalaron correctamente."
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr "Falló la instalación de los controladores (cód. de error: %d)"
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr "Falló la instalación de los controladores"
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (predeterminado)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (borrador)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d ppp (alta resolución)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr "Documento nuevo"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr "Documento"
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr "Correo..."
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr "Imprimir…"
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr "Ayuda"
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr "Acerca de"
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr "Salir"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "Cambiar _escáner"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr "_Instalar controladores"
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr "Más oscuro"
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr "Más claro"
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr "Menos"
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr "Más"
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr "Mínima"
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr "Máxima"
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr "Guardando el documento…"
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Guardando la página %d de %d"
@@ -884,6 +976,9 @@ msgstr "Guardando la página %d de %d"
 #~ msgstr ""
 #~ "La resolución en puntos por pulgada de la imagen escaneada anteriormente."
 
+#~ msgid "Select File _Type"
+#~ msgstr "Seleccione el _tipo de archivo"
+
 #~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
@@ -893,6 +988,9 @@ msgstr "Guardando la página %d de %d"
 #~ "«Fotografía» para fotografías. Esta opción determina la resolución, los "
 #~ "colores y el post-procesamiento del escaneado."
 
+#~ msgid "Scanned Document"
+#~ msgstr "Documento escaneado"
+
 #~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
diff --git a/po/et.po b/po/et.po
index de39413..a7e0ae9 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2012-07-23 08:59+0000\n"
 "Last-Translator: mahfiaz <mahfiaz@gmail.com>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "Foto"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr ""
 
@@ -206,7 +206,7 @@ msgstr "Skanni"
 msgid "Save document to a file"
 msgstr "Dokumendi salvestamine faili"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "Salvesta"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "Kärbi"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "Eelistused"
 
@@ -304,19 +304,6 @@ msgstr "Dokumentide skannimine"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Seade, millest skannida"
@@ -415,6 +402,19 @@ msgstr ""
 msgid "Quality value to use for JPEG compression."
 msgstr ""
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -454,11 +454,6 @@ msgstr ""
 msgid "Failed to scan"
 msgstr "Skannimine nurjus"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "Skannitud dokument"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -470,12 +465,7 @@ msgstr ""
 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."
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "Skannitud dokument.pdf"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr ""
 
@@ -495,8 +485,18 @@ msgstr "Ühtegi skannerit ei tuvastatud"
 msgid "Please check your scanner is connected and powered on"
 msgstr "Kontrolli, kas skanner on ühendatud ja sisse lülitatud"
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr ""
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr ""
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "Salvesta kui..."
 
@@ -508,6 +508,11 @@ msgstr ""
 msgid "_Save"
 msgstr ""
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "Skannitud dokument.pdf"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -518,11 +523,6 @@ msgstr "Pildifailid"
 msgid "All Files"
 msgstr "Kõik failid"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr "Vali faili _tüüp"
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -538,6 +538,11 @@ msgstr "JPEG (tihendatud)"
 msgid "PNG (lossless)"
 msgstr "PNG (kadudeta)"
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr ""
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -651,97 +656,180 @@ msgstr "Kas salvestada dokument enne väljumist?"
 msgid "Quit without Saving"
 msgstr "Välju ilma salvestamata"
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr ""
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr ""
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr ""
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (vaikimisi)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (mustand)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (kõrge kvaliteet)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "_Skanneri vahetamine"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "Automaatne"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr "Dokumendi salvestamine..."
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
@@ -812,6 +900,9 @@ msgstr ""
 #~ "Kasutus:\n"
 #~ "  %s [SEADE...] - Skannimise vahend"
 
+#~ msgid "Scanned Document"
+#~ msgstr "Skannitud dokument"
+
 #, c-format
 #~ msgid ""
 #~ "Help Options:\n"
@@ -848,6 +939,9 @@ msgstr ""
 #~ "  --gtk-module=MOODULID     Täiendavate GTK+ moodulite laadimine\n"
 #~ "  --g-fatal-warnings        Kõikide hoiatuste muutmine saatuslikuks"
 
+#~ msgid "Select File _Type"
+#~ msgstr "Vali faili _tüüp"
+
 #~ msgid "Files missing"
 #~ msgstr "Puuduvad failid"
 
diff --git a/po/eu.po b/po/eu.po
index 6d54a67..373016d 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2014-03-11 21:02+0000\n"
 "Last-Translator: Asier Sarasua Garmendia <Unknown>\n"
 "Language-Team: Basque <eu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "Argazkia"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr "Berrordenatu orrialdeak"
 
@@ -206,7 +206,7 @@ msgstr "Eskaneatu"
 msgid "Save document to a file"
 msgstr "Gorde dokumentua fitxategi batean"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "Gorde"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "Moztu"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "Hobespenak"
 
@@ -304,19 +304,6 @@ msgstr "Eskaneatu dokumentuak"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Eskaneatze-gailua"
@@ -420,6 +407,19 @@ msgstr "Kalitatearen balioa, JPEG konpresioan erabiltzeko"
 msgid "Quality value to use for JPEG compression."
 msgstr "Kalitatearen balioa, JPEG konpresioan erabiltzeko."
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -460,11 +460,6 @@ msgstr ""
 msgid "Failed to scan"
 msgstr "Ezin izan da eskaneatu"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "Eskaneatutako dokumentua"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -476,12 +471,7 @@ msgstr "[DEVICE...] - Eskaneatze-aplikazioa"
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "Exekutatu '%s --help' komando-lerroko aukera guztiak zerrendatzeko."
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "Dokumentu.pdf eskaneatuta"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr "_Itxi"
 
@@ -501,8 +491,18 @@ msgstr "Ez da eskanerrik detektatu"
 msgid "Please check your scanner is connected and powered on"
 msgstr "Egiaztatu zure eskanerra konektatuta eta piztuta dagoela"
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr ""
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr ""
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "Gorde honela..."
 
@@ -514,6 +514,11 @@ msgstr "_Utzi"
 msgid "_Save"
 msgstr "_Gorde"
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "Dokumentu.pdf eskaneatuta"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -524,11 +529,6 @@ msgstr "Irudi-fitxategiak"
 msgid "All Files"
 msgstr "Fitxategi guztiak"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr "Hautatu fit_xategi-mota"
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -544,6 +544,11 @@ msgstr "JPEG (konprimitua)"
 msgid "PNG (lossless)"
 msgstr "PNG (galerarik gabea)"
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr ""
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -663,97 +668,180 @@ msgstr "Gorde dokumentua irten baino lehen?"
 msgid "Quit without Saving"
 msgstr "Irten gorde gabe"
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr ""
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr ""
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr ""
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (lehenetsia)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (zirriborroa)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (bereizmen altua)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr "Dokumentu berria"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr "Dokumentua"
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr "Bidali postaz..."
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr "Inprimatu..."
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr "Laguntza"
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr "Honi buruz"
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr "Irten"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "Aldatu e_skanerra"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "Automatikoa"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr "Ilunago"
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr "Argiago"
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr "Gutxiago"
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr "Gehiago"
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr "Minimoa"
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr "Maximoa"
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr "Dokumentua gordetzen..."
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "%d orria (%d-etik) gordetzen"
@@ -830,6 +918,12 @@ msgstr "%d orria (%d-etik) gordetzen"
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Eskaneatutako irudiaren zabalera pixeletan"
 
+#~ msgid "Scanned Document"
+#~ msgstr "Eskaneatutako dokumentua"
+
+#~ msgid "Select File _Type"
+#~ msgstr "Hautatu fit_xategi-mota"
+
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "Aurretik eskaneatutako irudiaren bereizmena (puntuak hazbeteko)."
 
diff --git a/po/fi.po b/po/fi.po
index d886102..b8fe63a 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2013-09-22 12:07+0000\n"
 "Last-Translator: Jiri Grönroos <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "Valokuva"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr "Järjestä sivut"
 
@@ -206,7 +206,7 @@ msgstr "Lue"
 msgid "Save document to a file"
 msgstr "Tallenna asiakirja tiedostoon"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "Tallenna"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "Rajaa"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "Asetukset"
 
@@ -304,19 +304,6 @@ msgstr "Lue asiakirjoja kuvanlukijalta"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Laite jolta luetaan"
@@ -419,6 +406,19 @@ msgstr "JPEG-pakkaukseen käytettävä laatuarvo"
 msgid "Quality value to use for JPEG compression."
 msgstr "JPEG-pakkaukseen käytettävä laatuarvo."
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -458,11 +458,6 @@ msgstr "Korjaa vanhemmilla Kuvanlukijan versioilla luodut PDF-tiedostot"
 msgid "Failed to scan"
 msgstr "Kuvanluku epäonnistui"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "Kuvanlukuasiakirja"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -474,12 +469,7 @@ msgstr "[LAITE...] - Skannaus apuohjelma"
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "Näet kaikki komentorivivalitsimet komennolla \"%s --help\""
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "Asiakirja kuvanlukijasta.pdf"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr "_Sulje"
 
@@ -499,8 +489,18 @@ msgstr "Kuvanlukijoita ei havaittu"
 msgid "Please check your scanner is connected and powered on"
 msgstr "Varmista että kuvanlukijasi on yhdistetty ja kytketty päälle"
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr "Lisäohjelmistoja vaaditaan"
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr "Kuvanlukijaa varten on asennettava erillinen ajuri."
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "Tallenna nimellä..."
 
@@ -512,6 +512,11 @@ msgstr "_Peru"
 msgid "_Save"
 msgstr "_Tallenna"
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "Asiakirja kuvanlukijasta.pdf"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -522,11 +527,6 @@ msgstr "Kuvatiedostot"
 msgid "All Files"
 msgstr "Kaikki tiedostot"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr "Valitse tiedosto_tyyppi"
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -542,6 +542,11 @@ msgstr "JPEG (pakattu)"
 msgid "PNG (lossless)"
 msgstr "PNG (häviötön)"
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr "Tiedostomuoto:"
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -662,97 +667,187 @@ msgstr "Tallennetaanko asiakirja ennen sovelluksen sulkemista?"
 msgid "Quit without Saving"
 msgstr "Sulje tallentamatta"
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr "Käytössäsi vaikuttaa olevan Brother-kuvanlukija."
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+"Sen ajurit voi ladata <a href=\"http://support.brother.com\">Brotherin "
+"verkkosivustolta</a>."
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr "Käytössäsi vaikuttaa olevan Samsung-kuvanlukija."
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+"Sen ajurit voi ladata <a href=\"http://samsung.com/support\">Samsungin "
+"verkkosivustolta</a>."
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr "Käytössäsi vaikuttaa olevan HP-kuvanlukija."
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr "Käytössäsi vaikuttaa olevan Epson-kuvanlukija."
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+"Sen ajurit voi ladata <a href=\"http://support.epsom.com\">Epsonin "
+"verkkosivustolta</a>."
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr "Asenna ajurit"
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+"Kun ajurit on asennettu, kuvanlukusovellus on käynnistettävä uudelleen."
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr "Asennetaan ajureita..."
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr "Ajurit asennettiin onnistuneesti!"
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr "Ajurien asentaminen epäonnistui (virhekoodi %d)."
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr "Ajurien asentaminen epäonnistui."
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (oletus)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (vedos)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (korkea tarkkuus)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr "Uusi asiakirja"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr "Asiakirja"
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr "Sähköposti..."
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr "Tulosta..."
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr "Ohje"
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr "Tietoja"
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr "Lopeta"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "Muuta _kuvanlukijaa"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr "_Asenna ajurit"
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "Automaattinen"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr "Tummempi"
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr "Vaaleampi"
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr "Vähemmän"
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr "Enemmän"
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr "Heikompi"
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr "Parempi"
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr "Tallennetaan asiakirjaa..."
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Tallennetaan sivua %d/%d"
@@ -798,6 +893,12 @@ msgstr "Tallennetaan sivua %d/%d"
 #~ msgid "Window width in pixels"
 #~ msgstr "Ikkunan leveys pikseleinä"
 
+#~ msgid "Scanned Document"
+#~ msgstr "Kuvanlukuasiakirja"
+
+#~ msgid "Select File _Type"
+#~ msgstr "Valitse tiedosto_tyyppi"
+
 #~ msgid "Please check your installation"
 #~ msgstr "Tarkista asennuksesi tila"
 
diff --git a/po/fr.po b/po/fr.po
index 146d601..b649da0 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
-"PO-Revision-Date: 2015-04-21 20:04+0000\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
+"PO-Revision-Date: 2015-10-01 05:39+0000\n"
 "Last-Translator: Jean-Marc <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "Photo"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr "Réorganiser les pages"
 
@@ -206,7 +206,7 @@ msgstr "Numériser"
 msgid "Save document to a file"
 msgstr "Enregistrer le document dans un fichier"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "Enregistrer"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "Recadrer"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "Préférences"
 
@@ -304,25 +304,6 @@ msgstr "Numériser des documents"
 msgid "scan;scanner;flatbed;adf;"
 msgstr "numériser;périphérique de numérisation;numériseur;à plat;adf;"
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-"Une façon très simple de numériser à la fois documents et photos. Vous "
-"pouvez recadrer une photo et la faire pivoter si elle est dans le mauvais "
-"sens. Vous pouvez imprimer vos numérisations, les exporter au format pdf ou "
-"les enregistrer dans d'autres formats d'image."
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-"Simple Scan utilise la structure logicielle de SANE pour prendre en charge "
-"la plupart des périphériques de numérisation existants."
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Numériser depuis"
@@ -430,6 +411,25 @@ msgstr "Taux de qualité à utiliser pour la compression JPEG"
 msgid "Quality value to use for JPEG compression."
 msgstr "Taux de qualité à utiliser pour la compression JPEG."
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"Une façon très simple de numériser à la fois documents et photos. Vous "
+"pouvez recadrer une photo et la faire pivoter si elle est dans le mauvais "
+"sens. Vous pouvez imprimer vos numérisations, les exporter au format pdf ou "
+"les enregistrer dans d'autres formats d'image."
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Simple Scan utilise la structure logicielle de SANE pour prendre en charge "
+"la plupart des périphériques de numérisation existants."
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -471,11 +471,6 @@ msgstr ""
 msgid "Failed to scan"
 msgstr "Échec de la numérisation"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "Document numérisé"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -489,12 +484,7 @@ msgstr ""
 "Exécutez « %s --help » pour voir la liste complète des options disponibles "
 "en ligne de commande."
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "Document.pdf numérisé"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr "_Fermer"
 
@@ -516,8 +506,18 @@ msgstr ""
 "Veuillez vérifier que votre périphérique de numérisation est connecté et "
 "sous tension."
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr "Logiciel supplémentaire nécessaire"
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr "Vous devez installer le logiciel du pilote de votre scanner."
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "Enregistrer sous..."
 
@@ -529,6 +529,11 @@ msgstr "_Annuler"
 msgid "_Save"
 msgstr "_Enregistrer"
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "Document.pdf numérisé"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -539,11 +544,6 @@ msgstr "Fichiers image"
 msgid "All Files"
 msgstr "Tous les fichiers"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr "Sélectionner le _type de fichier"
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -559,6 +559,11 @@ msgstr "JPEG (compressé)"
 msgid "PNG (lossless)"
 msgstr "PNG (sans perte)"
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr "Format du fichier :"
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -662,6 +667,8 @@ msgstr ""
 "  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"
+"  Anthony Harrington https://launchpad.net/~untaintableangel\n"
 "  Antoine Pernot https://launchpad.net/~antoinepernot\n"
 "  Bruno Patri https://launchpad.net/~bruno666-deactivatedaccount\n"
 "  Christophe Herot https://launchpad.net/~tictoc-free\n"
@@ -707,97 +714,186 @@ msgstr "Enregistrer le document avant de quitter ?"
 msgid "Quit without Saving"
 msgstr "Quitter sans enregistrer"
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr "Il semblerait que vous ayez un scanner Brother."
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+"Les pilotes sont disponibles sur le <a "
+"href=\"http://support.brother.com\">site Web de Brother</a>."
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr "Il semblerait que vous ayez un scanner Samsung."
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+"Les pilotes sont disponibles sur le <a "
+"href=\"http://samsung.com/support\">site Web de Samsung</a>."
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr "Il semblerait que vous ayez un scanner HP."
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr "Il semblerait que vous ayez un scanner Epson."
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+"Les pilotes sont disponibles sur le <a "
+"href=\"http://support.epson.com\">site Web d'Epson</a>."
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr "Installer les pilotes"
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr "Une fois installés, vous devrez redémarrer Simple Scan."
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr "Installation des pilotes..."
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr "Pilotes installés avec succès !"
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr "Impossible d'installer les pilotes (code d'erreur %d)."
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr "Impossible d'installer les pilotes."
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr "Vous devez installer le(s) paquet(s) %s."
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (par défaut)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (brouillon)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d ppp (haute résolution)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr "Nouveau document"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr "Document"
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr "Courriel..."
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr "Imprimer..."
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr "Aide"
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr "À propos"
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr "Quitter"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "Changer de _périphérique de numérisation"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr "_Installer les pilotes"
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "Automatique"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr "Plus foncé"
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr "Plus clair"
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr "Moins"
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr "Plus"
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr "Maximum"
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr "Enregistrement du document..."
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Enregistrement de la page %d sur %d"
@@ -886,6 +982,9 @@ msgstr "Enregistrement de la page %d sur %d"
 #~ "  --help-all Affiche toutes les options d'aide\n"
 #~ "  --help-gtk Affiche les options de GTK+"
 
+#~ msgid "Scanned Document"
+#~ msgstr "Document numérisé"
+
 #~ msgid ""
 #~ "The direction of the scanner across the scanned page. It can be one of the "
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
@@ -909,6 +1008,9 @@ msgstr "Enregistrement de la page %d sur %d"
 #~ "« photo » pour les photographies. Ce paramètre détermine la résolution de "
 #~ "numérisation, le nombre de couleurs et les traitements postérieurs."
 
+#~ msgid "Select File _Type"
+#~ msgstr "Sélectionner le _type de fichier"
+
 #~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
diff --git a/po/gd.po b/po/gd.po
index 9ca87fb..1adc07e 100644
--- a/po/gd.po
+++ b/po/gd.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Gaelic; Scottish <gd@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "Dealbh"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr "Atharraich òrdugh nan duilleagan"
 
@@ -206,7 +206,7 @@ msgstr "Sganaich"
 msgid "Save document to a file"
 msgstr "Sàbhail an sgrìobhainn mar fhaidhle"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "Sàbhail"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "Bearr"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "Roghainnean"
 
@@ -304,19 +304,6 @@ msgstr "Sganaich sgrìobhainnean"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "An t-uidheam a nì an sganadh"
@@ -428,6 +415,19 @@ msgstr "Ìre na càileachd a thèid a chleachdadh airson dùmhlachdh JPEG"
 msgid "Quality value to use for JPEG compression."
 msgstr "Ìre na càileachd a thèid a chleachdadh airson dùmhlachdh JPEG."
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -469,11 +469,6 @@ msgstr ""
 msgid "Failed to scan"
 msgstr "Dh'fhàillig an sganadh"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "Sgrìobhainn sganaichte"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -487,12 +482,7 @@ msgstr ""
 "Ruith \"%s --help\" airson liosta shlàn dhe na roghainnean command line a "
 "tha ri làimh fhaicinn."
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "Sgrìobhainn sganaichte.pdf"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr "_Dùin"
 
@@ -514,8 +504,18 @@ msgstr "Cha deach sganair sam bith a lorg"
 msgid "Please check your scanner is connected and powered on"
 msgstr "Dèan cinnteach gu bheil sganair ceangailte ris agus gu bheil e air"
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr ""
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr ""
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "Sàbhail mar..."
 
@@ -527,6 +527,11 @@ msgstr "_Sguir dheth"
 msgid "_Save"
 msgstr "_Sàbhail"
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "Sgrìobhainn sganaichte.pdf"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -537,11 +542,6 @@ msgstr "Faidhlichean deilbh"
 msgid "All Files"
 msgstr "Na h-uile faidhle"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr "Tagh _seòrsa an fhaidhle"
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -557,6 +557,11 @@ msgstr "JPEG (dùmhlaichte)"
 msgid "PNG (lossless)"
 msgstr "PNG (gun chall càileachd)"
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr ""
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -669,97 +674,180 @@ msgstr "A bheil thu airson an sgrìobhainn a shàbhaladh mus dèan sinn fàgail?
 msgid "Quit without Saving"
 msgstr "Fàg gun a shàbhaladh"
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr ""
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr ""
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr ""
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (bun-roghainn)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (dreachd)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (dùmhlachd-bhreacaidh àrd)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr "Sgrìobhainn ùr"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr "Sgrìobhainn"
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr "Post-d..."
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr "Clò-bhuail..."
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr "Cobhair"
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr "Mu dhèidhinn"
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr "Fàg an-seo"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "Atharraich an _sganair"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "Gu fèin-obrachail"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr "Nas duirche"
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr "Nas soilleire"
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr "Nas lugha"
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr "Barrrachd"
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr "As lugha"
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr "As motha"
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr "A' sàbhaladh na sgrìobhainn..."
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "A' sàbhaladh duilleag %d a-mach à %d"
@@ -811,6 +899,12 @@ msgstr "A' sàbhaladh duilleag %d a-mach à %d"
 #~ msgstr ""
 #~ "Dùmhlachd-bhreacaidh na h-ìomhaighe a chaidh a sganadh turas mu dheireadh"
 
+#~ msgid "Scanned Document"
+#~ msgstr "Sgrìobhainn sganaichte"
+
+#~ msgid "Select File _Type"
+#~ msgstr "Tagh _seòrsa an fhaidhle"
+
 #~ msgid "Please check your installation"
 #~ msgstr "Thoir sùil air an stàladh agad"
 
diff --git a/po/gl.po b/po/gl.po
index 3a758f7..a216c8f 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2013-10-05 07:56+0000\n"
 "Last-Translator: Fran Diéguez <Unknown>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "Fotografía"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr "Reordenar as páxinas"
 
@@ -206,7 +206,7 @@ msgstr "Escanear"
 msgid "Save document to a file"
 msgstr "Gardar o documento nun ficheiro"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "Gardar"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "Recortar"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "Preferencias"
 
@@ -304,24 +304,6 @@ msgstr "Escanear documentos"
 msgid "scan;scanner;flatbed;adf;"
 msgstr "escanear;escáner;flatbed;adf;"
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-"Un xeito ben sinxelo de escanear documentos e imaxes. Pode recortar as "
-"partes malas dunha foto e rotala se está do revés. Pode imprimir os "
-"escaneos, exportalos a un PDF ou gardalos en varios formatos de imaxe."
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-"Escáner Sinxelo usa o marco de traballo de SANE para ser compatíbel coa "
-"maioría de escáneres existentes."
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Dispositivo desde o que escanear"
@@ -425,6 +407,24 @@ msgstr "Valor de calidade a usar na compresión JPEG"
 msgid "Quality value to use for JPEG compression."
 msgstr "Valor de calidade a usar na compresión JPEG."
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"Un xeito ben sinxelo de escanear documentos e imaxes. Pode recortar as "
+"partes malas dunha foto e rotala se está do revés. Pode imprimir os "
+"escaneos, exportalos a un PDF ou gardalos en varios formatos de imaxe."
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Escáner Sinxelo usa o marco de traballo de SANE para ser compatíbel coa "
+"maioría de escáneres existentes."
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -464,11 +464,6 @@ msgstr "Arranxar ficheiros PDF xerados con versións antigas de Simple Scan"
 msgid "Failed to scan"
 msgstr "Produciuse un fallo ao escanear"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "Documento escaneado"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -482,12 +477,7 @@ msgstr ""
 "Ejecute «%s --help» para ver unha lista completa das opcións de liña de "
 "ordes dispoñíbeis."
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "Document.pdf escaneado"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr "_Pechar"
 
@@ -507,8 +497,18 @@ msgstr "Non se detectou ningún escáner"
 msgid "Please check your scanner is connected and powered on"
 msgstr "Verifique que o seu escáner está conectado e aceso"
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr "Precísase software adicional"
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr "Precisa instalar controladores para o seu escáner."
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "Gardar como..."
 
@@ -520,6 +520,11 @@ msgstr "_Cancelar"
 msgid "_Save"
 msgstr "_Gardar"
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "Document.pdf escaneado"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -530,11 +535,6 @@ msgstr "Ficheiros de imaxes"
 msgid "All Files"
 msgstr "Todos os ficheiros"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr "Elixa o _tipo de ficheiro"
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -550,6 +550,11 @@ msgstr "JPEG (comprimido)"
 msgid "PNG (lossless)"
 msgstr "PNG (sen perdas)"
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr "Formato do ficheiro:"
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -664,97 +669,187 @@ msgstr "Gardar o documento antes de saír?"
 msgid "Quit without Saving"
 msgstr "Saír sen gardar"
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr "Semella que ten un escáner Brother."
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+"Os controladores para este dispositivo están dispoñíbeis na páxina de <a "
+"href=\"http://support.brother.com\">Brother</a>."
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr "Semella ter un escáner Samsung."
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+"Os controladores para este dispositivo están dispoñíbeis na páxina de <a "
+"href=\"http://samsung.com/support\">Samsung</a>."
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr "Semella ter un escáner HP."
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr "Semella ter un escáner Epson."
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+"Os controladores para este dispositivo están dispoñíbeis na páxina de <a "
+"href=\"http://support.epsom.com\">Epson</a>."
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr "Instalar controladores"
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr "Unha vez instalados deberá reiniciar o Escáner Sinxelo."
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr "Instalando os controladores..."
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr "Os controladores instaláronse correctamente."
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+"Produciuse un fallo na instalación dos controladores (código do erro %d)."
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr "Produciuse un fallo na instalación dos controladores."
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr "Necesita instalar o paquete(s) %s."
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (predeterminada)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (borrador)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d ppp (alta resolución)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr "Novo documento"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr "Documento"
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr "Correo electrónico..."
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr "Axuda"
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr "Sobre"
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr "Saír"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "Cambiar o _escáner"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr "_Instalar controladores"
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr "Máis escuro"
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr "Máis claro"
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr "Menos"
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr "Máis"
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr "Mínimo"
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr "Máximo"
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr "Gardando o documento..."
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Gardando páxina %d de %d"
@@ -832,6 +927,12 @@ msgstr "Gardando páxina %d de %d"
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "Resolución en puntos por polgada da imaxe escaneada anteriormente."
 
+#~ msgid "Scanned Document"
+#~ msgstr "Documento escaneado"
+
+#~ msgid "Select File _Type"
+#~ msgstr "Elixa o _tipo de ficheiro"
+
 #~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
diff --git a/po/he.po b/po/he.po
index a0bb8a2..5d20c9c 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2012-07-23 09:01+0000\n"
 "Last-Translator: Robert Ancell <robert.ancell@canonical.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "צילום"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr "סידור הדפים מחדש"
 
@@ -206,7 +206,7 @@ msgstr "סריקה"
 msgid "Save document to a file"
 msgstr "שמירת המסמך לקובץ"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "שמירה"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "חיתוך"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "העדפות"
 
@@ -294,7 +294,7 @@ msgstr "איכות:"
 
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Document Scanner"
-msgstr ""
+msgstr "סורק מסמכים"
 
 #: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
@@ -302,20 +302,7 @@ msgstr "סריקת מסמכים"
 
 #: ../data/simple-scan.desktop.in.h:4
 msgid "scan;scanner;flatbed;adf;"
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
+msgstr "סורק;סריקה;משטח;מזין דפים;"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
@@ -419,6 +406,19 @@ msgstr "ערך האיכות לשימוש לדחיסת JPEG"
 msgid "Quality value to use for JPEG compression."
 msgstr "ערך האיכות לשימוש לדחיסת JPEG."
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -458,11 +458,6 @@ msgstr "תיקון קובצי PDF שנוצרו באמצעות גרסאות יש�
 msgid "Failed to scan"
 msgstr "הסריקה נכשלה"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "מסמך שנסרק"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -475,12 +470,7 @@ 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."
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "מסמך סרוק.pdf"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr "ס_גירה"
 
@@ -500,8 +490,18 @@ msgstr "לא נמצאו סורקים"
 msgid "Please check your scanner is connected and powered on"
 msgstr "יש לבדוק כי הסורק מחובר ומופעל"
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr "נדרשות תכניות נוספות"
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr ""
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "שמירה בשם..."
 
@@ -513,6 +513,11 @@ msgstr "_ביטול"
 msgid "_Save"
 msgstr "_שמירה"
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "מסמך סרוק.pdf"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -523,11 +528,6 @@ msgstr "קובצי תמונה"
 msgid "All Files"
 msgstr "כל הקבצים"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr "בחירת _סוג הקובץ"
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -543,6 +543,11 @@ msgstr "JPEG (דחוס)"
 msgid "PNG (lossless)"
 msgstr "PNG (ללא אבדן נתונים)"
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr "תבנית הקובץ:"
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -657,97 +662,180 @@ msgstr "האם לשמור את המסמך בטרם היציאה?"
 msgid "Quit without Saving"
 msgstr "לצאת ללא שמירה"
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr "התקנת מנהלי התקן"
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr "מנהלי ההתקן מותקנים…"
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr "מנהלי ההתקנים הותקנו בהצלחה!"
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr "התקנת מנהלי ההתקנים נכשלה (קוד שגיאה %d)."
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr "התקנת מנהלי ההתקן נכשלה."
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (בררת מחדל)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (טיוטה)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (רזולוציה גבוהה)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr "מסמך חדש"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr "מסמך"
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr "דוא״ל…"
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr "הדפסה…"
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr "עזרה"
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr "על אודות"
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr "יציאה"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "ב_חירה בסורק אחר"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "אוטומטי"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr "כהה יותר"
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr "בהיר יותר"
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr "פחות"
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr "יותר"
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr "מזערי"
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr "מרבי"
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr "המסמך נשמר...‏"
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "נשמר העמוד %d מתוך %d"
@@ -861,10 +949,16 @@ msgstr "נשמר העמוד %d מתוך %d"
 #~ "  --help-all                      Show all help options\n"
 #~ "  --help-gtk                      Show GTK+ options"
 
+#~ msgid "Scanned Document"
+#~ msgstr "מסמך שנסרק"
+
 #~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 
+#~ msgid "Select File _Type"
+#~ msgstr "בחירת _סוג הקובץ"
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "The direction of the scanner across the scanned page."
diff --git a/po/hr.po b/po/hr.po
index 74bbd9b..1d71b50 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2012-07-23 09:01+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "Fotografija"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr "Presloži stranice"
 
@@ -206,7 +206,7 @@ msgstr "Skeniraj"
 msgid "Save document to a file"
 msgstr "Spremi dokument u datoteku"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "Spremi"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "Izreži"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "Osobitosti"
 
@@ -304,19 +304,6 @@ msgstr "Skenirajte dokumente"
 msgid "scan;scanner;flatbed;adf;"
 msgstr "skeniraj;skener;plosnat;adf;"
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Uređaj za skeniranje"
@@ -420,6 +407,25 @@ msgstr "Vrijednost kvalitetete pri JPEG sažimanju"
 msgid "Quality value to use for JPEG compression."
 msgstr "Vrijednost kvalitetete pri JPEG sažimanju."
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"Istinski jednostavan način skeniranja dokumenata i fotografija. Možete "
+"izrezati loše dijelove fotografija i zakrenuti ih ako su pogrešno okrenute. "
+"Možete ispisati vaše skenirane dokumente ili fotografije, izvesti ih u pdf "
+"ili ih spremiti u različite slikovne formate."
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Skeniranje dokumenata koristi SANE radni okvir za podršku većine postojećih "
+"skenera."
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -460,11 +466,6 @@ msgstr ""
 msgid "Failed to scan"
 msgstr "Neuspjelo skeniranje"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "Skenirani dokument"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -478,12 +479,7 @@ msgstr ""
 "Pokrenite '%s --help'  kako biste vidjeli potpuni popis dostupnih mogućnosti "
 "naredbenog retka."
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "Skenirani dokument.pdf"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr "_Zatvori"
 
@@ -503,8 +499,18 @@ msgstr "Nema otkrivenih skenera"
 msgid "Please check your scanner is connected and powered on"
 msgstr "Provjerite je li vaš skener spojen i uključen"
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr "Potreban je daodatan softver"
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr "Morate instalirati upravljački program za vaš skener."
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "Spremi kao..."
 
@@ -516,6 +522,11 @@ msgstr "_Odustani"
 msgid "_Save"
 msgstr "_Spremi"
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "Skenirani dokument.pdf"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -526,11 +537,6 @@ msgstr "Slikovne datoteke"
 msgid "All Files"
 msgstr "Sve datoteke"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr "Odaberi _vrstu datoteke"
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -546,6 +552,11 @@ msgstr "JPEG (sažeto)"
 msgid "PNG (lossless)"
 msgstr "PNG (bez gubitaka)"
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr "Format datoteke:"
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -663,97 +674,187 @@ msgstr "Spremi dokument prije zatvaranja?"
 msgid "Quit without Saving"
 msgstr "Zatvori bez spremanja"
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr "Izgleda kako imate Brother skener."
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+"Upravljački programi su dostupni na <a "
+"href=\"http://support.brother.com\">Brother web stranici</a>."
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr "Izgleda kako imate Samsung skener."
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+"Upravljački programi su dostupni na <a "
+"href=\"http://samsung.com/support\">Samsung web stranici</a>."
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr "Izgleda kako imate HP skener."
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr "Izgleda kako imate Epson skener."
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+"Upravljački programi su dostupni na <a "
+"href=\"http://support.epsom.com\">Epson web stranici</a>."
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr "Instaliraj upravljački program"
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+"Jednom kada se instalira, morate ponovno pokrenuti Skeniranje dokumenata."
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr "Instalacija upravljačkih programa..."
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr "Upravljački programi su uspješno instalirani!"
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr "Neuspjela instalacija upravljačkih programa (kôd greške %d)."
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr "Neuspjela instalacija upravljačkih programa."
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr "Morate instalirati %s package(s)."
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (zadano)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (skica)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (visoka razlučivost)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr "Novi dokument"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr "Dokument"
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr "E-pošta..."
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr "Ispiši…"
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr "Pomoć"
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr "O programu"
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr "Zatvori"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "Promijeni _skener"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr "_Instaliraj upravljačke programe"
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "Automatska"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr "Tamnije"
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr "Svjetlije"
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr "Manje"
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr "Više"
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr "Najmanje"
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr "Najviše"
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr "Spremanje dokumenta..."
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Spremanje stranice %d od %d"
@@ -839,6 +940,9 @@ msgstr "Spremanje stranice %d od %d"
 #~ "Upotreba:\n"
 #~ "  %s [UREĐAJ...] - Korist skeniranja"
 
+#~ msgid "Scanned Document"
+#~ msgstr "Skenirani dokument"
+
 #, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
@@ -869,5 +973,8 @@ msgstr "Spremanje stranice %d od %d"
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "Smjer skenera preko skenirane stranice."
 
+#~ msgid "Select File _Type"
+#~ msgstr "Odaberi _vrstu datoteke"
+
 #~ msgid "Please check your installation"
 #~ msgstr "Provjerite vašu instalaciju"
diff --git a/po/hu.po b/po/hu.po
index 5d874b8..b4f613f 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2014-02-18 14:14+0000\n"
 "Last-Translator: Gabor Kelemen <kelemeng@openscope.org>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "Fénykép"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr "Oldalak újrarendezése"
 
@@ -206,7 +206,7 @@ msgstr "Szkennelés"
 msgid "Save document to a file"
 msgstr "Dokumentum fájlba mentése"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "Mentés"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "Vágás"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "Beállítások"
 
@@ -304,19 +304,6 @@ msgstr "Dokumentumok szkennelése"
 msgid "scan;scanner;flatbed;adf;"
 msgstr "szkennelés;szkenner;beolvasó;síkágyas;adf;"
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "A szkennelő eszkőz"
@@ -418,6 +405,19 @@ msgstr "A minőségi tényező megadása a JPEG tömörítéshez"
 msgid "Quality value to use for JPEG compression."
 msgstr "A minőségi tényező megadása a JPEG tömörítéshez."
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -457,11 +457,6 @@ msgstr "A Simple Scan régebbi verzióival készült PDF fájlok javítása"
 msgid "Failed to scan"
 msgstr "A szkennelés meghiúsult"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "Beszkennelt dokumentum"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -474,12 +469,7 @@ 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."
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "Szkennelt dokumentum.pdf"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr "_Bezárás"
 
@@ -500,8 +490,18 @@ msgid "Please check your scanner is connected and powered on"
 msgstr ""
 "Ellenőrizze, hogy a szkenner csatlakoztatva van, és be van-e kapcsolva"
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr ""
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr ""
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "Mentés másként…"
 
@@ -513,6 +513,11 @@ msgstr "_Mégse"
 msgid "_Save"
 msgstr "_Mentés"
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "Szkennelt dokumentum.pdf"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -523,11 +528,6 @@ msgstr "Képfájlok"
 msgid "All Files"
 msgstr "Minden fájl"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr "Válasszon fájl_típust"
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -543,6 +543,11 @@ msgstr "JPEG (tömörített)"
 msgid "PNG (lossless)"
 msgstr "PNG (veszteségmentes)"
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr ""
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -662,97 +667,180 @@ msgstr "Menti a dokumentumot kilépés előtt?"
 msgid "Quit without Saving"
 msgstr "Kilépés mentés nélkül"
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr ""
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr ""
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr ""
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (alapértelmezett)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (vázlat)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (nagy felbontás)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr "Új dokumentum"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr "Dokumentum"
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr "E-mail…"
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr "Nyomtatás…"
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr "Súgó"
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr "Névjegy"
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr "Kilépés"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "_Szkennerváltás"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "Automatikus"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr "Sötétebb"
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr "Világosabb"
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr "Kevesebb"
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr "Több"
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr "Maximum"
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr "Dokumentum mentése..."
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "%d. oldal mentése, összesen %d"
@@ -868,6 +956,12 @@ msgstr "%d. oldal mentése, összesen %d"
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Az utoljára beszkennelt kép felbontása"
 
+#~ msgid "Scanned Document"
+#~ msgstr "Beszkennelt dokumentum"
+
+#~ msgid "Select File _Type"
+#~ msgstr "Válasszon fájl_típust"
+
 #~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
diff --git a/po/hy.po b/po/hy.po
index bc3e79e..23a74ff 100644
--- a/po/hy.po
+++ b/po/hy.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Armenian <hy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:14+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr ""
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr ""
 
@@ -206,7 +206,7 @@ msgstr ""
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr ""
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr ""
 
@@ -304,19 +304,6 @@ msgstr ""
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr ""
@@ -412,6 +399,19 @@ msgstr ""
 msgid "Quality value to use for JPEG compression."
 msgstr ""
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -451,11 +451,6 @@ msgstr ""
 msgid "Failed to scan"
 msgstr ""
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr ""
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -467,12 +462,7 @@ msgstr ""
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr ""
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr ""
 
@@ -492,8 +482,18 @@ msgstr ""
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr ""
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr ""
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr ""
 
@@ -505,6 +505,11 @@ msgstr ""
 msgid "_Save"
 msgstr ""
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr ""
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -515,11 +520,6 @@ msgstr ""
 msgid "All Files"
 msgstr ""
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr ""
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -535,6 +535,11 @@ msgstr ""
 msgid "PNG (lossless)"
 msgstr ""
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr ""
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -633,97 +638,180 @@ msgstr ""
 msgid "Quit without Saving"
 msgstr ""
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr ""
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr ""
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr ""
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr ""
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index 7261457..731d9c5 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2014-01-18 00:43+0000\n"
 "Last-Translator: Andika Triwidada <andika@gmail.com>\n"
 "Language-Team: Indonesian <id@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "Foto"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr "Atur Ulang Halaman"
 
@@ -206,7 +206,7 @@ msgstr "Pindai"
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr ""
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "Preferensi"
 
@@ -304,19 +304,6 @@ msgstr "Pindai Dokumen"
 msgid "scan;scanner;flatbed;adf;"
 msgstr "scan;scanner;pelarik;pemindai;flatbed;adf;"
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Perangkat untuk memindai"
@@ -418,6 +405,19 @@ msgstr "Nilai kualitas yang akan dipakai untuk kompresi JPEG"
 msgid "Quality value to use for JPEG compression."
 msgstr "Nilai kualitas yang akan dipakai untuk kompresi JPEG."
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -457,11 +457,6 @@ msgstr "Perbaiki berkas PDF yang dibuat dengan Simple Scan versi lawas"
 msgid "Failed to scan"
 msgstr "Gagal memindai"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "Dokumen Terpindai"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -473,12 +468,7 @@ msgstr "[PERANGKAT...] - Utilitas pemindaian"
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "Jalankan '%s --help' untuk daftar lengkap opsi yang tersedia."
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "Dokumen Hasil Pindai.pdf"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr "_Tutup"
 
@@ -499,8 +489,18 @@ msgid "Please check your scanner is connected and powered on"
 msgstr ""
 "Mohon periksa apakah pemindai Anda terhubung dan dalam keadaan menyala"
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr ""
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr ""
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "Simpan Sebagai..."
 
@@ -512,6 +512,11 @@ msgstr "_Batal"
 msgid "_Save"
 msgstr "_Simpan"
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "Dokumen Hasil Pindai.pdf"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -522,11 +527,6 @@ msgstr "Berkas Citra"
 msgid "All Files"
 msgstr "Semua Berkas"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr "Pilih _Tipe Berkas"
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -542,6 +542,11 @@ msgstr "JPEG (terkompresi)"
 msgid "PNG (lossless)"
 msgstr "PNG (lossless)"
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr ""
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -665,97 +670,180 @@ msgstr "Simpan dokumen sebelum keluar"
 msgid "Quit without Saving"
 msgstr "Keluar tanpa menyimpan"
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr ""
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr ""
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr ""
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (default)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (draft)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (resolusi tinggi)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr "Dokumen Baru"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr "Dokumen"
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr "Surel..."
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr "Cetak..."
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr "Bantuan"
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr "Perihal"
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr "Keluar"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "Ganti _Pemindai"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "Otomatis"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr "Lebih Gelap"
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr "Lebih Terang"
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr "Kurang"
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr "Lebih"
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr "Maksimum"
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr "Menyimpan dokumen..."
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Menyimpan halaman %d dari %d"
@@ -804,5 +892,11 @@ msgstr "Menyimpan halaman %d dari %d"
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Lebar gambar terpindai dalam piksel"
 
+#~ msgid "Scanned Document"
+#~ msgstr "Dokumen Terpindai"
+
+#~ msgid "Select File _Type"
+#~ msgstr "Pilih _Tipe Berkas"
+
 #~ msgid "Please check your installation"
 #~ msgstr "Mohon periksa instalasi Anda"
diff --git a/po/it.po b/po/it.po
index d4498ab..5140875 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2012-08-22 07:09+0000\n"
 "Last-Translator: Leonardo Corato <leocor@gmail.com>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "Foto"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr "Riordina pagine"
 
@@ -206,7 +206,7 @@ msgstr "Acquisisci"
 msgid "Save document to a file"
 msgstr "Salva documento in un file"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "Salva"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "Ritaglia"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "Preferenze"
 
@@ -304,25 +304,6 @@ msgstr "Acquisisci documenti"
 msgid "scan;scanner;flatbed;adf;"
 msgstr "scan;scanner;scansiona;adf;"
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-"Un modo molto semplice per acquisire documenti e foto. È possibile "
-"ritagliare le parti non necessarie di una foto e ruotarla se è nel verso "
-"sbagliato. È anche possibile stampare i file acquisiti esportarli in formato "
-"PDF o salvarli in vari formati di immagine."
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-"Simple Scan usa il framework SANE per supportare il maggior numero di "
-"scanner esistenti."
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Dispositivo di acquisizione"
@@ -428,6 +409,25 @@ msgstr "Indica il valore della qualità per la compressione JPEG"
 msgid "Quality value to use for JPEG compression."
 msgstr "Indica il valore della qualità per la compressione JPEG"
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"Un modo molto semplice per acquisire documenti e foto. È possibile "
+"ritagliare le parti non necessarie di una foto e ruotarla se è nel verso "
+"sbagliato. È anche possibile stampare i file acquisiti esportarli in formato "
+"PDF o salvarli in vari formati di immagine."
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Simple Scan usa il framework SANE per supportare il maggior numero di "
+"scanner esistenti."
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -467,11 +467,6 @@ msgstr "Corregge file PDF generati con una vecchia versione di Simple Scan"
 msgid "Failed to scan"
 msgstr "Acquisizione non riuscita"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "Documento acquisito"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -485,12 +480,7 @@ msgstr ""
 "Eseguire \"%s --help\" per l'elenco completo delle opzioni disponibili a "
 "riga di comando."
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "Documento-acquisito.pdf"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr "_Chiudi"
 
@@ -510,8 +500,18 @@ msgstr "Nessuno scanner rilevato"
 msgid "Please check your scanner is connected and powered on"
 msgstr "Controllare che lo scanner sia collegato e acceso"
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr "Software aggiuntivo necessario"
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr "È necessario installare i driver dello scanner."
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "Salva come..."
 
@@ -523,6 +523,11 @@ msgstr "A_nnulla"
 msgid "_Save"
 msgstr "_Salva"
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "Documento-acquisito.pdf"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -533,11 +538,6 @@ msgstr "File immagine"
 msgid "All Files"
 msgstr "Tutti i file"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr "Seziona il _tipo di file"
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -553,6 +553,11 @@ msgstr "JPEG (compresso)"
 msgid "PNG (lossless)"
 msgstr "PNG (senza perdita di qualità)"
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr "Formato file:"
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -686,97 +691,187 @@ msgstr "Salvare il documento prima di uscire?"
 msgid "Quit without Saving"
 msgstr "Esci senza salvare"
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr "Sembra essere uno scanner «Brother»."
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+"I driver per questo dispositivo sono disponibili sul <a "
+"href=\"http://support.brother.com\">sito web Brother</a>."
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr "Sembra essere uno scanner «Samsung»."
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+"I driver per questo dispositivo sono disponibili sul <a "
+"href=\"http://samsung.com/support\">sito web Samsung</a>."
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr "Sembra essere uno scanner «HP»."
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr "Sembra essere uno scanner «Epson»."
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+"I driver per questo dispositivo sono disponibili sul  <a "
+"href=\"http://support.epsom.com\">sito web Epson</a>."
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr "Installazione dei driver"
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+"Una volta completata l'installazione sarà necessario riavviare Simple Scan."
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr "Installazione dei driver..."
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr "Driver installati con successo."
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr "Installazione dei driver non riuscita (codice errore %d)."
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr "Installazione driver non riuscita."
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (predefinita)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (bozza)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (alta risoluzione)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr "Nuovo documento"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr "Documento"
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr "Email..."
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr "Stampa..."
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr "Aiuto"
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr "Informazioni"
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr "Esci"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "Cambia _scanner"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr "_Installa driver"
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "Automatico"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr "Più scura"
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr "Più chiara"
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr "Minore"
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr "Maggiore"
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr "Minima"
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr "Massima"
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr "Salvataggio del documento..."
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Salvataggio pagina %d di %d"
@@ -805,6 +900,9 @@ msgstr "Salvataggio pagina %d di %d"
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Larghezza dell'immagine acquisita in pixel"
 
+#~ msgid "Select File _Type"
+#~ msgstr "Seziona il _tipo di file"
+
 #~ msgid ""
 #~ "The width of scanned image in pixels. This value is updated to what the last "
 #~ "scanned page was."
@@ -823,6 +921,9 @@ msgstr "Salvataggio pagina %d di %d"
 #~ msgstr ""
 #~ "La risoluzione in punti per pollice del documento precedentemente acquisito."
 
+#~ msgid "Scanned Document"
+#~ msgstr "Documento acquisito"
+
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "VERO se la finestra dell'applicazione è massimizzata"
 
diff --git a/po/ja.po b/po/ja.po
index d3e7155..2a8cd9f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2014-11-20 05:14+0000\n"
 "Last-Translator: Kentaro Kazuhama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "写真"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr "ページを再整列"
 
@@ -206,7 +206,7 @@ msgstr "スキャン"
 msgid "Save document to a file"
 msgstr "ドキュメントをファイルに保存"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "保存"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "切り抜き"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "設定"
 
@@ -294,7 +294,7 @@ msgstr "品質:"
 
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Document Scanner"
-msgstr ""
+msgstr "ドキュメントスキャナ―"
 
 #: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
@@ -302,20 +302,7 @@ msgstr "ドキュメントをスキャンします"
 
 #: ../data/simple-scan.desktop.in.h:4
 msgid "scan;scanner;flatbed;adf;"
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
+msgstr "scan;scanner;flatbed;adf;スキャン;スキャナー;フラットベッド;オートドキュメントフィーダ;自動給紙装置;"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
@@ -412,6 +399,19 @@ msgstr "JPEGの圧縮に使用する品質の値"
 msgid "Quality value to use for JPEG compression."
 msgstr "JPEGの圧縮に使用する品質の値です。"
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -451,11 +451,6 @@ msgstr "古いバージョンの Simple Scan によって生成されたPDFフ�
 msgid "Failed to scan"
 msgstr "スキャンに失敗しました"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "スキャン済みドキュメント"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -467,12 +462,7 @@ msgstr "[デバイス...] - スキャンユーティリティ"
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "'%s --help' を実行すると利用可能なすべてのコマンドラインオプションの一覧が表示されます"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "スキャンされたドキュメント.pdf"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr "閉じる(_C)"
 
@@ -492,8 +482,18 @@ msgstr "スキャナが検出されていません"
 msgid "Please check your scanner is connected and powered on"
 msgstr "スキャナが接続されて電源が入っているか確認してください"
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr ""
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr ""
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "名前を付けて保存..."
 
@@ -505,6 +505,11 @@ msgstr "キャンセル(_C)"
 msgid "_Save"
 msgstr "保存(_S)"
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "スキャンされたドキュメント.pdf"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -515,11 +520,6 @@ msgstr "画像ファイル"
 msgid "All Files"
 msgstr "すべてのファイル"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr "ファイルタイプの選択(_T)"
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -535,6 +535,11 @@ msgstr "JPEG (圧縮済み)"
 msgid "PNG (lossless)"
 msgstr "PNG (ロスレス)"
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr ""
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -654,97 +659,180 @@ msgstr "終了する前にドキュメントを保存しますか?"
 msgid "Quit without Saving"
 msgstr "保存せずに終了"
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr ""
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr ""
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr ""
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (標準)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (ドラフト)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (高解像度)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr "新しいドキュメント"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr "ドキュメント"
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr "メール..."
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr "印刷..."
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr "ヘルプ"
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr "このプログラムについて"
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr "終了"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "スキャナを変更(_S)"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "自動"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr "暗く"
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr "明るく"
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr "弱く"
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr "強く"
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr "最小"
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr "最大"
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr "ドキュメントを保存しています..."
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "%2$dページ中%1$dページを保存しています"
@@ -772,6 +860,9 @@ msgstr "%2$dページ中%1$dページを保存しています"
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "スキャンされる画像の高さ(ピクセル)"
 
+#~ msgid "Select File _Type"
+#~ msgstr "ファイルタイプの選択(_T)"
+
 #~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr "スキャンする面のことです。次のうちから 1 つ選択できます: '両面' '表面' '裏面'"
@@ -801,3 +892,6 @@ msgstr "%2$dページ中%1$dページを保存しています"
 
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "スキャナの走査方向"
+
+#~ msgid "Scanned Document"
+#~ msgstr "スキャン済みドキュメント"
diff --git a/po/kk.po b/po/kk.po
index 591418c..79e3279 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Kazakh <kk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "Фото"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr ""
 
@@ -206,7 +206,7 @@ msgstr "Іздеу"
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "Сақтау"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "Қиып жіберу"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "Баптаулары"
 
@@ -304,19 +304,6 @@ msgstr ""
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr ""
@@ -412,6 +399,19 @@ msgstr ""
 msgid "Quality value to use for JPEG compression."
 msgstr ""
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -451,11 +451,6 @@ msgstr ""
 msgid "Failed to scan"
 msgstr ""
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr ""
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -467,12 +462,7 @@ msgstr ""
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr ""
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr ""
 
@@ -492,8 +482,18 @@ msgstr ""
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr ""
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr ""
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "Қалайша сақтау..."
 
@@ -505,6 +505,11 @@ msgstr ""
 msgid "_Save"
 msgstr ""
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr ""
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -515,11 +520,6 @@ msgstr ""
 msgid "All Files"
 msgstr "Бүкіл файлдар"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr ""
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -535,6 +535,11 @@ msgstr ""
 msgid "PNG (lossless)"
 msgstr ""
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr ""
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -634,97 +639,180 @@ msgstr ""
 msgid "Quit without Saving"
 msgstr ""
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr ""
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr ""
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr ""
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr ""
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "Авто"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/km.po b/po/km.po
index ea41bec..c58c782 100644
--- a/po/km.po
+++ b/po/km.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Khmer <km@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "រូបថត"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr "ការរៀបចំទំព័រ"
 
@@ -206,7 +206,7 @@ msgstr "ស្កេន"
 msgid "Save document to a file"
 msgstr "រក្សាទុកឯកសារទៅឯកសារ"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "រក្សាទុក"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "ច្រឹប"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "ចំណូលចិត្ត"
 
@@ -304,19 +304,6 @@ msgstr "ស្កេនឯកសារ"
 msgid "scan;scanner;flatbed;adf;"
 msgstr "ស្កេន;ម៉ាស៊ីនស្កេន;flatbed;adf;"
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "ឧបករណ៍ដែលត្រូវស្កេន"
@@ -421,6 +408,19 @@ msgstr "តម្លៃគុណភាពប្រើសម្រា
 msgid "Quality value to use for JPEG compression."
 msgstr "តម្លៃគុណភាពប្រើសម្រាប់ JPEG compression ។"
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -461,11 +461,6 @@ msgstr ""
 msgid "Failed to scan"
 msgstr "បានបរាជ័យក្នុងការស្កេន"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "ឯកសារដែលបានស្កេន"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -478,12 +473,7 @@ msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "ដំណើរការ '%s --help' ដើម្បីមើលបញ្ជីពេញលេញនៃបន្ទាត់បញ្ជាដែលមាន ។"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "Document.pdf ដែលបានស្កេន"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr "បិទ"
 
@@ -505,8 +495,18 @@ msgstr ""
 "សូមពិនិត្យមើលម៉ាស៊ីនស្កេនរបស់អ្នកថាតើបានតភ្ជាប់ "
 "និងបើកកុងតាក់ហើយឬនៅ"
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr ""
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr ""
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "រក្សាទុកជា..."
 
@@ -518,6 +518,11 @@ msgstr "បោះបង់"
 msgid "_Save"
 msgstr "រក្សាទុក"
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "Document.pdf ដែលបានស្កេន"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -528,11 +533,6 @@ msgstr "ឯកសាររូបភាព"
 msgid "All Files"
 msgstr "ឯកសារទាំងអស់"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr "ជ្រើសប្រភេទឯកសារ"
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -548,6 +548,11 @@ msgstr "JPEG (បានបង្ហាប់)"
 msgid "PNG (lossless)"
 msgstr "PNG (គ្មានការបាត់បង់)"
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr ""
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -664,97 +669,180 @@ msgstr "រក្សាទុកឯកសារមុនពេលប
 msgid "Quit without Saving"
 msgstr "បិទដោយមិនរក្សាទុក"
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr ""
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr ""
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr ""
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (លំនាំដើម)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (ពង្រាង)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (គុណភាពបង្ហាញខ្ពស់)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr "ឯកសារថ្មី"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr "ឯកសារ"
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr "អ៊ីមេល..."
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr "បោះពុម្ព..."
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr "ជំនួយ"
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr "អំពី"
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr "ចេញ"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "ប្ដូរម៉ាស៊ីនស្កេន"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "ស្វ័យប្រវត្តិ"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr "ងងឹត"
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr "ស្រាល"
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr "តិចជាង"
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr "ផ្សេងទៀត"
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr "អប្បបរមា"
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr "អតិបរមា"
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr "កំពុងរក្សាទុកឯកសារ..."
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "រក្សាទុកទំព័រ %d ផុតសម័យ %d"
@@ -806,6 +894,12 @@ msgstr "រក្សាទុកទំព័រ %d ផុតសម័យ %
 #~ msgstr ""
 #~ "គុណភាពបង្ហាញគិតជាចំណុចក្នុងមួយអ៊ិន្ឈ៍ នៃរូបភាពដែលបានស្កេនមុន ។"
 
+#~ msgid "Scanned Document"
+#~ msgstr "ឯកសារដែលបានស្កេន"
+
+#~ msgid "Select File _Type"
+#~ msgstr "ជ្រើសប្រភេទឯកសារ"
+
 #~ msgid "Files missing"
 #~ msgstr "បាត់ឯកសារ"
 
diff --git a/po/ky.po b/po/ky.po
index 9fabd75..f4ce9e5 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Kirghiz <ky@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr ""
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr ""
 
@@ -206,7 +206,7 @@ msgstr ""
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr ""
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr ""
 
@@ -304,19 +304,6 @@ msgstr ""
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr ""
@@ -412,6 +399,19 @@ msgstr ""
 msgid "Quality value to use for JPEG compression."
 msgstr ""
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -451,11 +451,6 @@ msgstr ""
 msgid "Failed to scan"
 msgstr ""
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr ""
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -467,12 +462,7 @@ msgstr ""
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr ""
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr ""
 
@@ -492,8 +482,18 @@ msgstr ""
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr ""
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr ""
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr ""
 
@@ -505,6 +505,11 @@ msgstr ""
 msgid "_Save"
 msgstr ""
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr ""
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -515,11 +520,6 @@ msgstr ""
 msgid "All Files"
 msgstr ""
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr ""
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -535,6 +535,11 @@ msgstr ""
 msgid "PNG (lossless)"
 msgstr ""
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr ""
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -633,97 +638,180 @@ msgstr ""
 msgid "Quit without Saving"
 msgstr ""
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr ""
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr ""
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr ""
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr ""
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/lt.po b/po/lt.po
index 107017e..0c2e7a1 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2012-07-23 09:03+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Lithuanian <lt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr ""
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr ""
 
@@ -206,7 +206,7 @@ msgstr ""
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr ""
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr ""
 
@@ -304,19 +304,6 @@ msgstr ""
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr ""
@@ -414,6 +401,19 @@ msgstr "Kokybės reikšmė JPEG glaudinimui"
 msgid "Quality value to use for JPEG compression."
 msgstr "Kokybės reikšmė JPEG glaudinimui."
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -455,11 +455,6 @@ msgstr ""
 msgid "Failed to scan"
 msgstr ""
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr ""
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -472,12 +467,7 @@ 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“."
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr ""
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr "_Užverti"
 
@@ -497,8 +487,18 @@ msgstr ""
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr ""
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr ""
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr ""
 
@@ -510,6 +510,11 @@ msgstr "_Atsisakyti"
 msgid "_Save"
 msgstr "Į_rašyti"
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr ""
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -520,11 +525,6 @@ msgstr ""
 msgid "All Files"
 msgstr ""
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr ""
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -540,6 +540,11 @@ msgstr ""
 msgid "PNG (lossless)"
 msgstr ""
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr ""
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -644,97 +649,180 @@ msgstr "Išsaugoti dokumentą prieš išeinant iš programos?"
 msgid "Quit without Saving"
 msgstr "Išeiti neišsaugant"
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr ""
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr ""
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr ""
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr ""
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "Automatinis"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr "Tamsesnis"
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr "Šviesesnis"
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr "Mažiau"
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr "Daugiau"
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr "Mažiausia"
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr "Didžiausia"
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr "Saugomas dokumentas..."
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Saugomas puslapis %d iš %d"
diff --git a/po/lv.po b/po/lv.po
index 8a329c2..5e5d2d2 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2012-10-07 21:28+0000\n"
 "Last-Translator: Rūdolfs Mazurs <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "Foto"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr ""
 
@@ -206,7 +206,7 @@ msgstr "Skenēt"
 msgid "Save document to a file"
 msgstr "Saglabāt dokumentu datnē"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "Saglabāt"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "Apcirst"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "Iestatījumi"
 
@@ -304,19 +304,6 @@ msgstr "Skenēt dokumentus"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Ierīce, no kuras skenēt"
@@ -419,6 +406,19 @@ msgstr "Kvalitātes vērtība, ko izmantot JPEG saspiešanai"
 msgid "Quality value to use for JPEG compression."
 msgstr "Kvalitātes vērtība, ko izmantot JPEG saspiešanai."
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -458,11 +458,6 @@ msgstr "Salabot PDF datnes, kas ir veidotas ar vecākām Simple Scan versijām"
 msgid "Failed to scan"
 msgstr "Neizdevās skenēt"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "Skenēts dokuments"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -476,12 +471,7 @@ msgstr ""
 "Palaidiet “%s --help”, lai redzētu pilnu pieejamo komandrindas opciju "
 "sarakstu."
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "Ieskenēts Dokuments.pdf"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr "_Aizvērt"
 
@@ -501,8 +491,18 @@ msgstr "Nav atrasts neviens skeneris"
 msgid "Please check your scanner is connected and powered on"
 msgstr "Lūdzu, pārbaudiet, vai skeneris ir pievienots un ieslēgts"
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr ""
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr ""
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "Saglabāt kā..."
 
@@ -514,6 +514,11 @@ msgstr "At_celt"
 msgid "_Save"
 msgstr "_Saglabāt"
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "Ieskenēts Dokuments.pdf"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -524,11 +529,6 @@ msgstr "Attēlu datnes"
 msgid "All Files"
 msgstr "Visas datnes"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr "Norādīt datnes _tipu"
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -544,6 +544,11 @@ msgstr "JPEG (saspiests)"
 msgid "PNG (lossless)"
 msgstr "PNG (bez zudumiem)"
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr ""
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -654,97 +659,180 @@ msgstr "Pirms iziešanas saglabāt dokumentu?"
 msgid "Quit without Saving"
 msgstr "Iziet nesaglabājot"
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr ""
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr ""
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr ""
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (noklusējuma)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (melraksts)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (augsta izšķirtspēja)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr "Jauns dokuments"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr "Dokuments"
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr "Epasts..."
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr "Drukāt..."
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr "Palīdzība"
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr "Par"
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr "Iziet"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "Mainīt _skeneri"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "Automātiski"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr "Tumšāks"
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr "Gaišāks"
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr "Mazāk"
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr "Vairāk"
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr "Minimums"
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr "Maksimums"
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr "Saglabā dokumentu..."
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Saglabā lapu %d no %d"
@@ -790,11 +878,17 @@ msgstr "Saglabā lapu %d no %d"
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "Iepriekšēji skenētā attēla izšķirtspēja punktos/collā."
 
+#~ msgid "Scanned Document"
+#~ msgstr "Skenēts dokuments"
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "Skenera virziens pāri skenējamai lapai."
 
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "PATIESS, ja lietotnes logs ir maksimizēts"
 
+#~ msgid "Select File _Type"
+#~ msgstr "Norādīt datnes _tipu"
+
 #~ msgid "Files missing"
 #~ msgstr "Pietrūkst datņu"
diff --git a/po/mhr.po b/po/mhr.po
index 9a33ddc..b1e6df2 100644
--- a/po/mhr.po
+++ b/po/mhr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Mari (Meadow) <mhr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "Фотосӱрет"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr ""
 
@@ -206,7 +206,7 @@ msgstr ""
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "Аныклаш"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "Лектыш"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "Келыштарымаш-влак"
 
@@ -304,19 +304,6 @@ msgstr ""
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr ""
@@ -412,6 +399,19 @@ msgstr ""
 msgid "Quality value to use for JPEG compression."
 msgstr ""
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -451,11 +451,6 @@ msgstr ""
 msgid "Failed to scan"
 msgstr ""
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "Сканироватлыме документ"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -467,12 +462,7 @@ msgstr ""
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr ""
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr ""
 
@@ -492,8 +482,18 @@ msgstr ""
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr ""
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr ""
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr ""
 
@@ -505,6 +505,11 @@ msgstr ""
 msgid "_Save"
 msgstr ""
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr ""
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -515,11 +520,6 @@ msgstr ""
 msgid "All Files"
 msgstr ""
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr ""
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -535,6 +535,11 @@ msgstr ""
 msgid "PNG (lossless)"
 msgstr ""
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr ""
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -634,100 +639,186 @@ msgstr ""
 msgid "Quit without Saving"
 msgstr ""
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr ""
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr ""
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr ""
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr ""
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr "Пычкемышрак"
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
 
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
+
+#~ msgid "Scanned Document"
+#~ msgstr "Сканироватлыме документ"
diff --git a/po/ms.po b/po/ms.po
index 9fcdc80..f7661f6 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2012-07-23 09:04+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Malay <ms@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "Foto"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr "Tertib Semula Halaman"
 
@@ -206,7 +206,7 @@ msgstr "Imbas"
 msgid "Save document to a file"
 msgstr "Simpan dokumen ke fail"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "Simpan"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "Kerat"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "Keutamaan"
 
@@ -304,19 +304,6 @@ msgstr "Imbas Dokumen"
 msgid "scan;scanner;flatbed;adf;"
 msgstr "imbs;pengimbas;rata;adf;"
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Peranti untuk diimbas dari"
@@ -420,6 +407,19 @@ msgstr "Nilai kualiti yang digunakan untuk pemampatan JPEG"
 msgid "Quality value to use for JPEG compression."
 msgstr "Nilai kualiti yang digunakan untuk pemampatan JPEG."
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -459,11 +459,6 @@ msgstr "Baiki fail PDF yang dijana dengan versi lama Simple Scan"
 msgid "Failed to scan"
 msgstr "Gagal mengimbas"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "Dokumen Terimbas"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -477,12 +472,7 @@ msgstr ""
 "Jalankan '%s --help' untuk melihat senarai penuh pilihan baris perintah yang "
 "ada."
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "Dokumen Diimbas.pdf"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr "_Tutup"
 
@@ -502,8 +492,18 @@ msgstr "Tiada pengimbas dikesan"
 msgid "Please check your scanner is connected and powered on"
 msgstr "Sila semak pengimbas anda sama ada ia bersambung dan dihidupkan"
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr ""
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr ""
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "Simpan Sebagai..."
 
@@ -515,6 +515,11 @@ msgstr "_Batal"
 msgid "_Save"
 msgstr "_Simpan"
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "Dokumen Diimbas.pdf"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -525,11 +530,6 @@ msgstr "Fail Imej"
 msgid "All Files"
 msgstr "Semua Fail"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr "Pilih Jenis _Fail"
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -545,6 +545,11 @@ msgstr "JPEG (termampat)"
 msgid "PNG (lossless)"
 msgstr "PNG (tidak hilang)"
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr ""
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -660,97 +665,180 @@ msgstr "Simpan dokumen sebelum keluar?"
 msgid "Quit without Saving"
 msgstr "Keluar tanpa Menyimpan"
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr ""
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr ""
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr ""
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (tersedia)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (draf)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (resolusi tinggi)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr "Dokumen Baharu"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr "Dokumen"
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr "Emel..."
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr "Cetak..."
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr "Bantuan"
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr "Perihal"
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr "Keluar"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "Ubah _Pengimbas"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "Automatik"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr "Lebih Gelap"
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr "Lebih Cerah"
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr "Kurang"
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr "Lagi"
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr "Maksimum"
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr "Menyimpan dokumen..."
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Menyimpan halaman %d daripada %d"
@@ -777,6 +865,9 @@ msgstr "Menyimpan halaman %d daripada %d"
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Tinggi imej terimbas dalam piksel"
 
+#~ msgid "Scanned Document"
+#~ msgstr "Dokumen Terimbas"
+
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Lebar imej terimbas dalam piksel"
 
@@ -794,6 +885,9 @@ msgstr "Menyimpan halaman %d daripada %d"
 #~ "Penggunaan:\n"
 #~ "  %s [DEVICE...] - Utiliti pengimbasan"
 
+#~ msgid "Select File _Type"
+#~ msgstr "Pilih Jenis _Fail"
+
 #~ msgid "Please check your installation"
 #~ msgstr "Sila semak pemasangan anda"
 
diff --git a/po/my.po b/po/my.po
index 49f669b..fd9967a 100644
--- a/po/my.po
+++ b/po/my.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Burmese <my@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "ဓာတ်ပုံ"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr ""
 
@@ -206,7 +206,7 @@ msgstr "Scan"
 msgid "Save document to a file"
 msgstr "ဖိုင် တစ်ခုထဲသို့ စာရွက်စာတမ်း ကိုသိမ်းပါ။"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "သိမ်းဆည်းပါ"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "ဖြတ်ပါ။"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "Preferences"
 
@@ -304,19 +304,6 @@ msgstr "Scan Documents"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "ဘယ်ကိရိယာမှ Scan ဖတ်မည်..."
@@ -419,6 +406,19 @@ msgstr ""
 msgid "Quality value to use for JPEG compression."
 msgstr ""
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -458,11 +458,6 @@ msgstr "Fix PDF files generated with older versions of Simple Scan"
 msgid "Failed to scan"
 msgstr "Scan မဖတ်ဖြစ်ပါ။"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "Scan ဖတ်ပြီးသော စာရွက်စာတမ်း"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -474,12 +469,7 @@ msgstr "[DEVICE...] - Scanning utility"
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "အမိန့်ပေး စာရင်း အပြည့်အစုံမြင်ရရန်  '%s--help' ဖြင့် ခိုင်းပါ"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "Scanned Document.pdf"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr ""
 
@@ -501,8 +491,18 @@ msgstr ""
 "သင်၏ Scanner ကိုချိတ်ဆက်ပြီးကြောင်း၊ "
 "ပါဝါဖွင့်ထားကြောင်းသေချာအောင်ပြန်လည်စစ်ဆေးပါ။"
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr ""
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr ""
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "Save As..."
 
@@ -514,6 +514,11 @@ msgstr ""
 msgid "_Save"
 msgstr ""
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "Scanned Document.pdf"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -524,11 +529,6 @@ msgstr "Image Files"
 msgid "All Files"
 msgstr "ဖိုင်အလုံးစုံ"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr "_T ဖိုင်အမျိုးအစားရွေးပါ။"
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -544,6 +544,11 @@ msgstr "JPEG (compressed)"
 msgid "PNG (lossless)"
 msgstr "PNG (lossless)"
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr ""
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -655,97 +660,180 @@ msgstr "မပိတ်ခင် စာရွက်စာတမ်းမျာ�
 msgid "Quit without Saving"
 msgstr "မသိမ်းပဲနှင့်ထွက်မည်။"
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr ""
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr ""
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr ""
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (default)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (draft)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (high resolution)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "Change _Scanner"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "အလိုအလျှောက်"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
@@ -794,6 +882,12 @@ msgstr ""
 #~ msgid "Window width in pixels"
 #~ msgstr "Window width in pixels"
 
+#~ msgid "Scanned Document"
+#~ msgstr "Scan ဖတ်ပြီးသော စာရွက်စာတမ်း"
+
+#~ msgid "Select File _Type"
+#~ msgstr "_T ဖိုင်အမျိုးအစားရွေးပါ။"
+
 #~ msgid "Files missing"
 #~ msgstr "ဖိုင်များပျောက်နေပါသည်။"
 
diff --git a/po/nb.po b/po/nb.po
index 9709088..7902647 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2014-09-02 16:41+0000\n"
 "Last-Translator: Kjetil Birkeland Moe <kjetil@skifremme.no>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "Bilde"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr "Omplasser sider"
 
@@ -206,7 +206,7 @@ msgstr "Skann"
 msgid "Save document to a file"
 msgstr "Lagre dokument til fil"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "Lagre"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "Beskjær"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "Innstillinger"
 
@@ -304,19 +304,6 @@ msgstr "Skann dokumenter"
 msgid "scan;scanner;flatbed;adf;"
 msgstr "skan;skanner;plan;adf;"
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Enhet det skal skannes fra"
@@ -418,10 +405,27 @@ msgstr "Kvalitetsverdi som skal brukes til JPEG-komprimering"
 msgid "Quality value to use for JPEG compression."
 msgstr "Kvalitetsverdi som skal brukes til JPEG-komprimering"
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"En enkel måte å skanne dokumenter og bilder på. Du kan skjære bort uønskede "
+"deler og rotere bilder hvis de skannes inn feil vei. Skannede elementer kan "
+"skrives ut, eksporteres i pdf-format og lagres i ulike bildeformater."
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Simple Scan bruker rammeverket SANE til å støtte de vanligste skannerne."
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
-msgstr "Ingen skanner tilgjengelig. Vennligst koble til en skanner."
+msgstr "Ingen skanner tilgjengelig. Koble til en skanner."
 
 #. Error displayed when cannot connect to scanner
 #: ../src/scanner.vala:870
@@ -458,11 +462,6 @@ msgstr ""
 msgid "Failed to scan"
 msgstr "Klarte ikke å utføre skanningen"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "Skannet dokument"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -475,12 +474,7 @@ 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."
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "Skannet_dokument.pdf"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr "_Lukk"
 
@@ -500,8 +494,18 @@ msgstr "Fant ingen skannere"
 msgid "Please check your scanner is connected and powered on"
 msgstr "Undersøk om skanneren er riktig tilkoblet, og at den er slått på"
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr "Tilleggsprogram må installeres"
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr "Du må installere en driver for denne skanneren."
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "Lagre som..."
 
@@ -513,6 +517,11 @@ msgstr "_Avbryt"
 msgid "_Save"
 msgstr "_Lagre"
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "Skannet_dokument.pdf"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -523,11 +532,6 @@ msgstr "Bildefiler"
 msgid "All Files"
 msgstr "Alle Filer"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr "Velg fil_type"
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -543,6 +547,11 @@ msgstr "JPEG (komprimert)"
 msgid "PNG (lossless)"
 msgstr "PNG (tapsfri)"
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr "Filformat:"
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -566,7 +575,7 @@ msgstr "Forkast endringer"
 #. Error message display when unable to save image for preview
 #: ../src/ui.vala:991
 msgid "Unable to save image for preview"
-msgstr "Kunne ikke lagre forhåndsvisning"
+msgstr "Klarte ikke å lagre forhåndsvisning"
 
 #. Error message display when unable to preview image
 #: ../src/ui.vala:1003
@@ -596,7 +605,7 @@ msgstr "Behold uendret"
 #. Error message displayed when unable to launch help browser
 #: ../src/ui.vala:1450
 msgid "Unable to open help file"
-msgstr "Kan ikke åpne hjelpfil"
+msgstr "Klarte ikke å åpne hjelpefil"
 
 #. The license this software is under (GPL3+)
 #: ../src/ui.vala:1471
@@ -658,97 +667,186 @@ msgstr "Lagre dokumentet før du avslutter?"
 msgid "Quit without Saving"
 msgstr "Avslutt uten å lagre"
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr "Det ser ut som at du har en Brother-skanner."
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+"Du skal kunne finne drivere på <a "
+"href=\"http://support.brother.com\">Brothers nettsider</a>."
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr "Det ser ut som at du har en Samsung-skanner."
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+"Du skal kunne finne drivere på <a "
+"href=\"http://samsung.com/support\">Samsungs nettsider</a>."
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr "Det ser ut som at du har en HP-skanner."
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr "Det ser ut som at du har en Epson-skanner."
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+"Du skal kunne finne drivere på <a href=\"http://support.epsom.com\">Epsons "
+"nettsider</a>."
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr "Installer drivere"
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr "Start Simple Scan på nytt når driveren er installert."
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr "Installerer drivere …"
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr "Driverne er nå installert."
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr "Klarte ikke å installere drivere (feilkode %d)."
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr "Klarte ikke å installere drivere."
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (standard)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (kladd)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (høy oppløsning)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr "Nytt dokument"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr "Dokument"
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr "E-post …"
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr "Skriv ut …"
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr "Hjelp"
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr "Om"
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr "Avslutt"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "Bytt _skanner"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr "_Installer drivere"
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr "Mørkere"
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr "Lysere"
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr "Mindre"
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr "Mer"
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr "Maksimum"
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr "Lagrer dokument …"
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Lagrer side nr. %d av %d"
@@ -812,6 +910,9 @@ msgstr "Lagrer side nr. %d av %d"
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Bredde på skannet bilde, i pixler"
 
+#~ msgid "Scanned Document"
+#~ msgstr "Skannet dokument"
+
 #, c-format
 #~ msgid ""
 #~ "Help Options:\n"
@@ -858,6 +959,9 @@ msgstr "Lagrer side nr. %d av %d"
 #~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
 #~ "  --g-fatal-warnings              Make all warnings fatal"
 
+#~ msgid "Select File _Type"
+#~ msgstr "Velg fil_type"
+
 #~ msgid "Please check your installation"
 #~ msgstr "Vennligst undersøk installasjonen"
 
diff --git a/po/nl.po b/po/nl.po
index 6c52cc4..069d285 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2012-07-23 09:04+0000\n"
 "Last-Translator: Robert Ancell <robert.ancell@canonical.com>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "Foto"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr "Bladzijden herschikken"
 
@@ -206,7 +206,7 @@ msgstr "Scannen"
 msgid "Save document to a file"
 msgstr "Document naar een bestand opslaan"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "Opslaan"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "Bijsnijden"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "Voorkeuren"
 
@@ -304,25 +304,6 @@ msgstr "Documenten scannen"
 msgid "scan;scanner;flatbed;adf;"
 msgstr "scan;scanner;flatbed;adf;"
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-"Een heel makkelijke manier om zowel documenten als foto's te scannen. U kunt "
-"de lelijke delen van een foto wegsnijden en hem draaien als hij niet goed "
-"staat. U kunt uw scans afdrukken, exporteren naar pdf, of opslaan in een "
-"reeks afbeeldingsbestandsoorten."
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-"Simple Scan gebruikt het SANE-kader om de meeste scanners te kunnen "
-"gebruiken."
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Te gebruiken scanapparaat"
@@ -430,6 +411,25 @@ msgstr "De kwaliteitswaarde die gebruikt zal worden voor JPEG-compressie"
 msgid "Quality value to use for JPEG compression."
 msgstr "De kwaliteitswaarde die gebruikt zal worden voor JPEG-compressie."
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"Een heel makkelijke manier om zowel documenten als foto's te scannen. U kunt "
+"de lelijke delen van een foto wegsnijden en hem draaien als hij niet goed "
+"staat. U kunt uw scans afdrukken, exporteren naar pdf, of opslaan in een "
+"reeks afbeeldingsbestandsoorten."
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Simple Scan gebruikt het SANE-kader om de meeste scanners te kunnen "
+"gebruiken."
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -473,11 +473,6 @@ msgstr ""
 msgid "Failed to scan"
 msgstr "Scannen is mislukt"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "Gescand document"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -491,12 +486,7 @@ msgstr ""
 "Voer ‘%s --help’ uit om een volledige lijst van alle opdrachtregelopties te "
 "zien."
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "Gescand document.pdf"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr "_Sluiten"
 
@@ -516,8 +506,18 @@ msgstr "Geen scanners gevonden"
 msgid "Please check your scanner is connected and powered on"
 msgstr "Controleer of uw scanner is aangesloten en is ingeschakeld"
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr "Extra programmatuur vereist"
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr "U dient een stuurprogramma te installeren voor uw scanner."
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "Opslaan als..."
 
@@ -529,6 +529,11 @@ msgstr "_Annuleren"
 msgid "_Save"
 msgstr "_Opslaan"
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "Gescand document.pdf"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -539,11 +544,6 @@ msgstr "Afbeeldingsbestanden"
 msgid "All Files"
 msgstr "Alle bestanden"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr "Bestands_type selecteren"
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -559,6 +559,11 @@ msgstr "JPEG (gecomprimeerd)"
 msgid "PNG (lossless)"
 msgstr "PNG (lossless)"
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr "Bestandsformaat:"
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -688,97 +693,186 @@ msgstr "Document opslaan voor afsluiten?"
 msgid "Quit without Saving"
 msgstr "Afsluiten zonder opslaan"
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr "U lijkt een Brother-scanner te hebben."
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+"Stuurprogramma's hiervoor zijn beschikbaar op de <a "
+"href=\"http://support.brother.com\">website van Brother</a>."
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr "U lijkt een Samsung-scanner te hebben."
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+"Stuurprogramma's hiervoor zijn beschikbaar op de <a "
+"href=\"http://samsung.com/support\">website van Samsung</a>."
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr "U lijkt een HP-scanner te hebben."
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr "U lijkt een Epson-scanner te hebben."
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+"Stuurprogramma's hiervoor zijn beschikbaar op de <a "
+"href=\"http://support.epsom.com\">website van Epson</a>."
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr "Stuurprogramma's installeren"
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr "Eenmaal geïnstalleerd, zult u Simple Scan moeten herstarten."
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr "Stuurprogramma's aan het installeren..."
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr "Stuurprogramma's met succes geïnstalleerd!"
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr "Kon geen stuurprogramma's installeren (foutcode %d)."
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr "Kon geen stuurprogramma's installeren."
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (standaard)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (klad)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (hoge resolutie)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr "Nieuw document"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr "Document"
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr "E-mail..."
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr "Afdrukken..."
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr "Hulp"
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr "Over"
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr "Afsluiten"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "_Scanner wijzigen"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr "Stuurprogramma's _installeren"
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr "Donkerder"
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr "Lichter"
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr "Minder"
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr "Meer"
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr "Maximum"
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr "Bezig met opslaan van document..."
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Bezig met opslaan van pagina %d van %d"
@@ -893,6 +987,12 @@ msgstr "Bezig met opslaan van pagina %d van %d"
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Breedte van gescande afbeelding in pixels"
 
+#~ msgid "Scanned Document"
+#~ msgstr "Gescand document"
+
+#~ msgid "Select File _Type"
+#~ msgstr "Bestands_type selecteren"
+
 #~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
diff --git a/po/oc.po b/po/oc.po
index 4b2ebb0..1d9e9a9 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2013-10-15 16:43+0000\n"
 "Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "Fòto"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr ""
 
@@ -206,7 +206,7 @@ msgstr "Numerizar"
 msgid "Save document to a file"
 msgstr "Enregistrar lo document dins un fichièr"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "Enregistrar"
 
@@ -249,7 +249,7 @@ msgid "Crop"
 msgstr "Requadrar"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "Preferéncias"
 
@@ -305,19 +305,6 @@ msgstr "Numerizar de documents"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Numerizar dempuèi"
@@ -425,6 +412,19 @@ msgstr "Taus de qualitat d'utilizar per la compression JPEG"
 msgid "Quality value to use for JPEG compression."
 msgstr "Taus de qualitat d'utilizar per la compression JPEG."
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -465,11 +465,6 @@ msgstr ""
 msgid "Failed to scan"
 msgstr "Fracàs de la numerizacion"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "Document numerizat"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -483,12 +478,7 @@ msgstr ""
 "Aviatz « %s --help » per veire la lista completa de opcions disponiblas en "
 "linha de comanda"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "Document.pdf numerizat"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr "_Tampar"
 
@@ -508,8 +498,18 @@ msgstr "Cap de scanner es pas estat detectat"
 msgid "Please check your scanner is connected and powered on"
 msgstr "Verificatz que vòstre scanner es connectat e jos tension"
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr ""
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr ""
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "Enregistrar jos..."
 
@@ -521,6 +521,11 @@ msgstr "A_nullar"
 msgid "_Save"
 msgstr "_Salvar"
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "Document.pdf numerizat"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -531,11 +536,6 @@ msgstr "Fichièrs imatges"
 msgid "All Files"
 msgstr "Totes los fichièrs"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr "Seleccionatz lo _tipe de fichièr"
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -551,6 +551,11 @@ msgstr "JPEG (compressat)"
 msgid "PNG (lossless)"
 msgstr "PNG (sens pèrda)"
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr ""
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -663,97 +668,180 @@ msgstr "Enregistrar lo document abans de quitar ?"
 msgid "Quit without Saving"
 msgstr "Quitar sens enregistrar"
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr ""
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr ""
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr ""
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (per defaut)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (borrolhon)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d ppp (nauta resolucion)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "Cambiar de _scanner"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "Automatic"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr "Mai escur"
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr "Mai clar"
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr "Mens"
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr "Mai"
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr "Maximum"
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr "Enregistrament del document..."
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Enregistrament de la pagina %d sus %d"
@@ -816,6 +904,9 @@ msgstr "Enregistrament de la pagina %d sus %d"
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Largor de l'imatge numerizat en pixèls"
 
+#~ msgid "Scanned Document"
+#~ msgstr "Document numerizat"
+
 #, c-format
 #~ msgid ""
 #~ "Help Options:\n"
@@ -861,6 +952,9 @@ msgstr "Enregistrament de la pagina %d sus %d"
 #~ "  --gtk-module=MODULS Cargar de moduls GTK+ suplementaris\n"
 #~ "  --g-fatal-warnings Rendre totes los avertiments fatals"
 
+#~ msgid "Select File _Type"
+#~ msgstr "Seleccionatz lo _tipe de fichièr"
+
 #~ msgid "Files missing"
 #~ msgstr "Fichièrs mancants"
 
diff --git a/po/pa.po b/po/pa.po
index fafca46..bd1b259 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Punjabi <pa@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "ਫੋਟੋ"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr ""
 
@@ -206,7 +206,7 @@ msgstr "ਸਕੈਨ"
 msgid "Save document to a file"
 msgstr "ਡੌਕੂਮੈਂਟ ਫਾਇਲ ਵਿੱਚ ਸੰਭਾਲੋ"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "ਸੰਭਾਲੋ"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "ਕਰੋਪ ਕਰੋ"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "ਮੇਰੀ ਪਸੰਦ"
 
@@ -304,19 +304,6 @@ msgstr "ਸਕੈਨ ਕੀਤੇ ਡੌਕੂਮੈਂਟ"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "ਸਕੈਨ ਕਰਨ ਲਈ ਜੰਤਰ"
@@ -414,6 +401,19 @@ msgstr ""
 msgid "Quality value to use for JPEG compression."
 msgstr ""
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -453,11 +453,6 @@ msgstr ""
 msgid "Failed to scan"
 msgstr "ਸਕੈਨ ਕਰਨ ਲਈ ਫੇਲ੍ਹ"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "ਸਕੈਨ ਕੀਤੇ ਡੌਕੂਮੈਂਟ"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -469,12 +464,7 @@ msgstr ""
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "ਸਕੈਨ ਕੀਤਾ ਡੌਕੂਮੈਂਟ.pdf"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr ""
 
@@ -494,8 +484,18 @@ msgstr "ਕੋਈ ਸਕੈਨਰ ਨਹੀਂ ਮਿਲਿਆ"
 msgid "Please check your scanner is connected and powered on"
 msgstr "ਆਪਣੇ ਜੁੜ ਹੋਏ ਸਕੈਨਰ ਨੂੰ ਚੈੱਕ ਕਰੋ ਅਤੇ ਚਾਲੂ ਕਰੋ"
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr ""
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr ""
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "ਇੰਝ ਸੰਭਾਲੋ..."
 
@@ -507,6 +507,11 @@ msgstr ""
 msgid "_Save"
 msgstr ""
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "ਸਕੈਨ ਕੀਤਾ ਡੌਕੂਮੈਂਟ.pdf"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -517,11 +522,6 @@ msgstr "ਚਿੱਤਰ ਫਾਇਲਾਂ"
 msgid "All Files"
 msgstr "ਸਭ ਫਾਇਲਾਂ"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr "ਫਾਇਲ ਕਿਸਮ ਚੁਣੋ(_T)"
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -537,6 +537,11 @@ msgstr "JPEG (compressed)"
 msgid "PNG (lossless)"
 msgstr "PNG (lossless)"
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr ""
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -635,97 +640,180 @@ msgstr "ਕੀ ਬੰਦ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਡੌਕੂਮ�
 msgid "Quit without Saving"
 msgstr "ਬਿਨਾਂ ਸੰਭਾਲੇ ਬੰਦ ਕਰਨਾ ਹੈ"
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr ""
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr ""
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr ""
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (ਡਿਫਾਲਟ)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (draft)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (ਵੱਧ ਰੈਜ਼ੋਲੂਸ਼ਨ)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "ਸਕੈਨਰ ਬਦਲੋ(_S)"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "ਆਟੋਮੈਟਿਕ"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
@@ -744,6 +832,12 @@ msgstr ""
 #~ "ਵਰਤੋਂ:\n"
 #~ "  %s [DEVICE...] - Scanning utility"
 
+#~ msgid "Scanned Document"
+#~ msgstr "ਸਕੈਨ ਕੀਤੇ ਡੌਕੂਮੈਂਟ"
+
+#~ msgid "Select File _Type"
+#~ msgstr "ਫਾਇਲ ਕਿਸਮ ਚੁਣੋ(_T)"
+
 #~ msgid "Please check your installation"
 #~ msgstr "ਆਪਣੀ ਇੰਸਟਾਲੇਸ਼ਨ ਚੈੱਕ ਕਰੋ ਜੀ"
 
diff --git a/po/pl.po b/po/pl.po
index 2572360..c690e44 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
-"PO-Revision-Date: 2015-08-27 17:25+0000\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
+"PO-Revision-Date: 2015-09-29 13:16+0000\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "Zdjęcie"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr "Zmień kolejność stron"
 
@@ -206,7 +206,7 @@ msgstr "Skanuj"
 msgid "Save document to a file"
 msgstr "Zapisuje dokument do pliku"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "Zapisz"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "Przytnij"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "Preferencje"
 
@@ -304,24 +304,6 @@ msgstr "Skanowanie dokumentów"
 msgid "scan;scanner;flatbed;adf;"
 msgstr "skan;skanowanie;skaner;scan;scanner;flatbed;adf;"
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-"Bardzo prosty sposób na skanowanie dokumentów i zdjęć. Umożliwia kadrowanie "
-"i obracanie zdjęć, drukowanie, eksportowanie do formatu PDF oraz zapisywanie "
-"w wielu formatach."
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-"Program Simple Scan używa mechanizmu SANE do obsługi większości istniejących "
-"skanerów."
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Urządzenie skanujące"
@@ -427,6 +409,24 @@ msgstr "Wartość jakości używana do kompresji JPEG"
 msgid "Quality value to use for JPEG compression."
 msgstr "Wartość jakości używana do kompresji JPEG."
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"Bardzo prosty sposób na skanowanie dokumentów i zdjęć. Umożliwia kadrowanie "
+"i obracanie zdjęć, drukowanie, eksportowanie do formatu PDF oraz zapisywanie "
+"w wielu formatach."
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Program Simple Scan używa mechanizmu SANE do obsługi większości istniejących "
+"skanerów."
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -466,11 +466,6 @@ msgstr "Naprawia pliki PDF utworzone przy użyciu starszych wersji programu"
 msgid "Failed to scan"
 msgstr "Skanowanie się nie powiodło"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "Zeskanowany dokument"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -484,12 +479,7 @@ msgstr ""
 "Polecenie \"%s --help\" wyświetli pełną listę dostępnych opcji wiersza "
 "poleceń."
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "Zeskanowany dokument.pdf"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr "Za_mknij"
 
@@ -509,8 +499,18 @@ msgstr "Nie wykryto żadnego skanera"
 msgid "Please check your scanner is connected and powered on"
 msgstr "Proszę sprawdzić, czy skaner jest podłączony i włączony"
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr "Wymagane dodatkowe oprogramowanie"
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr "Należy zainstalować sterownik skanera."
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "Zapisz jako…"
 
@@ -522,6 +522,11 @@ msgstr "_Anuluj"
 msgid "_Save"
 msgstr "_Zapisz"
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "Zeskanowany dokument.pdf"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -532,11 +537,6 @@ msgstr "Pliki obrazów"
 msgid "All Files"
 msgstr "Wszystkie pliki"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr "Proszę wybrać _typ pliku"
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -552,6 +552,11 @@ msgstr "JPEG (skompresowany)"
 msgid "PNG (lossless)"
 msgstr "PNG (bezstratny)"
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr "Format pliku:"
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -680,97 +685,186 @@ msgstr "Zapisać dokument przed zakończeniem programu?"
 msgid "Quit without Saving"
 msgstr "Zakończ bez zapisywania"
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr "Wykryto skaner marki Brother."
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+"Sterowniki dla tego urządzenia są dostępne na <a "
+"href=\"http://support.brother.com\">stronie firmy Brother</a>."
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr "Wykryto skaner marki Samsung."
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+"Sterowniki dla tego urządzenia są dostępne na <a "
+"href=\"http://samsung.com/support\">stronie firmy Samsung</a>."
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr "Wykryto skaner marki HP."
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr "Wykryto skaner marki Epson."
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+"Sterowniki dla tego urządzenia są dostępne na <a "
+"href=\"http://support.epsom.com\">stronie firmy Epson</a>."
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr "Instalowanie sterowników"
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr "Po zakończeniu instalowania należy uruchomić program ponownie."
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr "Instalowanie sterowników..."
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr "Zainstalowano sterowniki!"
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr "Nie udało się zainstalować sterowników (kod błędu %d)."
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr "Nie udało się zainstalować sterowników."
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr "Należy zainstalować pakiety %s."
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d DPI (domyślnie)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d DPI (szkic)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d DPI (wysoka rozdzielczość)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr "%d DPI"
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr "Nowy dokument"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr "Dokument"
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr "E-mail…"
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr "Wydrukuj…"
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr "Pomoc"
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr "O programie"
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr "Zakończ"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "Zmień _skaner"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr "_Zainstaluj sterowniki"
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "Automatyczny"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr "Ciemniej"
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr "Jaśniej"
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr "Mniejszy"
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr "Większy"
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr "Minimalnie"
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr "Maksymalnie"
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr "Zapisywanie dokumentu…"
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Zapisywanie strony %d z %d"
@@ -842,6 +936,9 @@ msgstr "Zapisywanie strony %d z %d"
 #~ msgid "Window width in pixels"
 #~ msgstr "Szerokość okna w pikselach"
 
+#~ msgid "Scanned Document"
+#~ msgstr "Zeskanowany dokument"
+
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Szerokość zeskanowanego obrazu w pikselach"
 
@@ -861,6 +958,9 @@ msgstr "Zapisywanie strony %d z %d"
 #~ "  --help-all                      Wyświetla wszystkie opcje pomocy\n"
 #~ "  --help-gtk                      Wyświetla opcje GTK+"
 
+#~ msgid "Select File _Type"
+#~ msgstr "Proszę wybrać _typ pliku"
+
 #~ msgid "Please check your installation"
 #~ msgstr "Proszę sprawdzić poprawność instalacji"
 
diff --git a/po/pt.po b/po/pt.po
index a2ca636..2f6168b 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
-"PO-Revision-Date: 2014-07-24 15:38+0000\n"
-"Last-Translator: Paulo Henriques <Unknown>\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
+"PO-Revision-Date: 2015-09-22 09:45+0000\n"
+"Last-Translator: Ivo Xavier <ivofernandes12@gmail.com>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "Foto"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr "Reordenar páginas"
 
@@ -206,7 +206,7 @@ msgstr "Digitalizar"
 msgid "Save document to a file"
 msgstr "Guardar documento num ficheiro"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "Guardar"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "Recortar"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "Preferências"
 
@@ -304,19 +304,6 @@ msgstr "Digitalizar documentos"
 msgid "scan;scanner;flatbed;adf;"
 msgstr "scan;scanner;flatbed;adf;"
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Dispositivo de onde digitalizar"
@@ -420,6 +407,24 @@ msgstr "Valor de qualidade a usar na compressão JPEG"
 msgid "Quality value to use for JPEG compression."
 msgstr "Valor de qualidade a usar na compressão JPEG."
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"Uma ferramenta muito fácil para digitalizar documentos e fotografias. Pode "
+"cortar e rodar. Pode imprimir as digitalizações, exportar para PDF, ou "
+"guardar em vários tipos de formatos de imagem."
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Simple Scan usa a estrutura SANE para suportar a maior parte dos scanners "
+"atuais."
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -461,11 +466,6 @@ msgstr ""
 msgid "Failed to scan"
 msgstr "Falhou ao digitalizar"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "Documento digitalizado"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -479,12 +479,7 @@ msgstr ""
 "Execute '%s --help' para consultar uma lista completa das opções de linha de "
 "comando disponíveis."
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "Documento digitalizado.pdf"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr "Fechar"
 
@@ -504,8 +499,18 @@ msgstr "Sem scanners detetados"
 msgid "Please check your scanner is connected and powered on"
 msgstr "Verifique se o seu scanner está conetado e ligado"
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr ""
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr ""
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "Guardar como..."
 
@@ -517,6 +522,11 @@ msgstr "Cancelar"
 msgid "_Save"
 msgstr "Guardar"
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "Documento digitalizado.pdf"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -527,11 +537,6 @@ msgstr "Ficheiros de imagem"
 msgid "All Files"
 msgstr "Todos os ficheiros"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr "Selecionar _tipo de ficheiro"
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -547,6 +552,11 @@ msgstr "JPEG (comprimido)"
 msgid "PNG (lossless)"
 msgstr "PNG (sem perdas)"
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr ""
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -688,97 +698,180 @@ msgstr "Guardar documento antes de sair?"
 msgid "Quit without Saving"
 msgstr "Sair sem guardar"
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr ""
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr ""
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr ""
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (predefinido)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (rascunho)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (alta-resolução)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr "Novo documento"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr "Documento"
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr "Email..."
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr "Ajuda"
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr "Sobre"
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr "Sair"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "Alterar _digitalizador"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr "Escurecer"
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr "Clarear"
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr "Menos"
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr "Mais"
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr "Mínimo"
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr "Máximo"
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr "A guardar o documento..."
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "A guardar a página %d de %d"
@@ -878,6 +971,9 @@ msgstr "A guardar a página %d de %d"
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Largura da imagem digitalizada em pixels"
 
+#~ msgid "Scanned Document"
+#~ msgstr "Documento digitalizado"
+
 #, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
@@ -902,3 +998,6 @@ msgstr "A guardar a página %d de %d"
 
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "A direção do scanner através da página digitalizada."
+
+#~ msgid "Select File _Type"
+#~ msgstr "Selecionar _tipo de ficheiro"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index e65d0a6..04b3a99 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2013-04-16 12:21+0000\n"
 "Last-Translator: Neliton Pereira Jr. <nelitonpjr@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "Foto"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr "Reordenar páginas"
 
@@ -206,7 +206,7 @@ msgstr "Digitalizar"
 msgid "Save document to a file"
 msgstr "Salvar documento em arquivo"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "Salvar"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "Recortar"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "Preferências"
 
@@ -304,19 +304,6 @@ msgstr "Digitalizar documentos"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Dispositivo de onde digitalizar"
@@ -421,6 +408,19 @@ msgstr "Qualidade para usar na compressão JPEG"
 msgid "Quality value to use for JPEG compression."
 msgstr "Qualidade para usar na compressão JPEG."
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -462,11 +462,6 @@ msgstr ""
 msgid "Failed to scan"
 msgstr "Falha ao digitalizar"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "Documento digitalizado"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -480,12 +475,7 @@ msgstr ""
 "Execute '%s --help' para ver a lista completa de opções disponíveis para "
 "linha de comando."
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "Documento digitalizado.pdf"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr "Fe_char"
 
@@ -505,8 +495,18 @@ msgstr "Nenhum digitalizador detectado"
 msgid "Please check your scanner is connected and powered on"
 msgstr "Por favor verifique se o seu digitalizador está conectado e ligado"
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr ""
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr ""
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "Salvar como..."
 
@@ -518,6 +518,11 @@ msgstr "_Cancelar"
 msgid "_Save"
 msgstr "_Salvar"
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "Documento digitalizado.pdf"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -528,11 +533,6 @@ msgstr "Arquivos de imagem"
 msgid "All Files"
 msgstr "Todos os arquivos"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr "Selecionar _tipo de arquivo"
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -548,6 +548,11 @@ msgstr "JPEG (comprimido)"
 msgid "PNG (lossless)"
 msgstr "PNG (sem perdas)"
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr ""
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -681,97 +686,180 @@ msgstr "Salvar o documento antes de sair?"
 msgid "Quit without Saving"
 msgstr "Sair sem salvar"
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr ""
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr ""
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr ""
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (padrão)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (rascunho)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (alta resolução)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr "Novo documento"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr "Documentos"
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr "E-mail..."
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr "Ajuda"
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr "Sobre"
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr "Sair"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "Alterar _digitalizador"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr "Mais escuro"
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr "Mais claro"
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr "Menos"
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr "Mais"
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr "Mínima"
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr "Máxima"
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr "Salvando documento..."
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Salvando página %d de %d"
@@ -877,6 +965,12 @@ msgstr "Salvando página %d de %d"
 #~ "  --help-all                      Mostra todas as opções de ajuda\n"
 #~ "  --help-gtk                      Mostra as opções do GTK+"
 
+#~ msgid "Select File _Type"
+#~ msgstr "Selecionar _tipo de arquivo"
+
+#~ msgid "Scanned Document"
+#~ msgstr "Documento digitalizado"
+
 #~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
diff --git a/po/ro.po b/po/ro.po
index 10c91db..afe1938 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2012-09-11 18:43+0000\n"
 "Last-Translator: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>\n"
 "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 "Language: ro\n"
 
 #. Button to submit authorization dialog
@@ -89,7 +89,7 @@ msgstr "Foto"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr ""
 
@@ -207,7 +207,7 @@ msgstr "Scanează"
 msgid "Save document to a file"
 msgstr "Salvează documentul ca fișier"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "Salvează"
 
@@ -249,7 +249,7 @@ msgid "Crop"
 msgstr "Decupează"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "Preferințe"
 
@@ -305,19 +305,6 @@ msgstr "Scanează documente"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Dispozitiv de folosit pentru scanare"
@@ -420,6 +407,19 @@ msgstr "Valoare calitate pentru compresia JPEG"
 msgid "Quality value to use for JPEG compression."
 msgstr "Valoare calitate pentru compresia JPEG"
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -461,11 +461,6 @@ msgstr ""
 msgid "Failed to scan"
 msgstr "Scanarea a eșuat"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "Document scanat"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -479,12 +474,7 @@ msgstr ""
 "Rulați „%s --help” pentru a consulta lista completă a opțiunilor pentru "
 "comenzile mediului text."
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "Document scanat.pdf"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr "Înc_hide"
 
@@ -504,8 +494,18 @@ msgstr "Nu a fost detectat niciun scaner"
 msgid "Please check your scanner is connected and powered on"
 msgstr "Verificați dacă scanerul este conectat și pornit"
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr ""
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr ""
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "Salvează ca..."
 
@@ -517,6 +517,11 @@ msgstr "_Anulare"
 msgid "_Save"
 msgstr "_Salvează"
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "Document scanat.pdf"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -527,11 +532,6 @@ msgstr "Fișiere imagine"
 msgid "All Files"
 msgstr "Toate fișierele"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr "Alegeți _tipul de fișier"
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -547,6 +547,11 @@ msgstr "JPEG (comprimat)"
 msgid "PNG (lossless)"
 msgstr "PNG (fără pierderi)"
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr ""
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -667,97 +672,180 @@ msgstr "Salvați documentul înainte de ieșire?"
 msgid "Quit without Saving"
 msgstr "Închide fără a salva"
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr ""
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr ""
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr ""
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (implicit)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (ciornă)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (rezoluție înaltă)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "Schimbă _scanerul"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "Automată"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr "Mai întunecat"
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr "Mai luminos"
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr "Mai puțin"
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr "Mai mult"
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr "Minim"
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr "Maxim"
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr "Se salvează documentul..."
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Se salvează pagina %d din %d"
@@ -836,6 +924,9 @@ msgstr "Se salvează pagina %d din %d"
 #~ msgid "Window width in pixels"
 #~ msgstr "Lățimea ferestrei, în pixeli"
 
+#~ msgid "Scanned Document"
+#~ msgstr "Document scanat"
+
 #, c-format
 #~ msgid ""
 #~ "Help Options:\n"
@@ -874,6 +965,9 @@ msgstr "Se salvează pagina %d din %d"
 #~ "  --gtk-module=MODULE             Încarcă module GTK+ adiționale\n"
 #~ "  --g-fatal-warnings              Consideră toate avertismentele fatale"
 
+#~ msgid "Select File _Type"
+#~ msgstr "Alegeți _tipul de fișier"
+
 #~ msgid "Files missing"
 #~ msgstr "Lipsesc fișierele"
 
diff --git a/po/ru.po b/po/ru.po
index 3b77fe7..40b84db 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2015-09-02 21:09+0000\n"
 "Last-Translator: Alexandre Prokoudine <alexandre.prokoudine@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "Фотография"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr "Организация страниц"
 
@@ -206,7 +206,7 @@ msgstr "Сканировать"
 msgid "Save document to a file"
 msgstr "Сохранить документ в файл"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "Сохранить"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "Обрезать"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "Параметры"
 
@@ -304,25 +304,6 @@ msgstr "Сканирование документов"
 msgid "scan;scanner;flatbed;adf;"
 msgstr "сканировать;сканер;планшетный;автоподатчик;"
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-"Наиболее простой способ сканирования документов и фотографий. Вы можете "
-"обрезать испорченные края снимков и повернуть их, если расположили "
-"неправильно. Вы можете распечатать сканированные материалы, экспортировать "
-"их в PDF или изображения ряда форматов."
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-"Простое сканирование использует фреймворк SANE для поддержки большинства "
-"существующих сканеров."
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Устройство сканирования"
@@ -421,6 +402,25 @@ msgstr "Значение качества, используемого для с�
 msgid "Quality value to use for JPEG compression."
 msgstr "Значение качества, используемого для сжатия JPEG."
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"Наиболее простой способ сканирования документов и фотографий. Вы можете "
+"обрезать испорченные края снимков и повернуть их, если расположили "
+"неправильно. Вы можете распечатать сканированные материалы, экспортировать "
+"их в PDF или изображения ряда форматов."
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Простое сканирование использует фреймворк SANE для поддержки большинства "
+"существующих сканеров."
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -460,11 +460,6 @@ msgstr "Исправить PDF-файлы, созданные предыдущи
 msgid "Failed to scan"
 msgstr "Сканирование не удалось"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "Отсканированный документ"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -476,12 +471,7 @@ msgstr "[DEVICE...] — Устройство сканирования"
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "Выполните '%s --help', чтобы вывести полный список доступных опций."
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "Сканированный документ.pdf"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr "_Закрыть"
 
@@ -501,8 +491,18 @@ msgstr "Сканеры не обнаружены"
 msgid "Please check your scanner is connected and powered on"
 msgstr "Проверьте, что сканер подсоединён и включён"
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr "Необходимо дополнительно программное обеспечение"
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr "Необходимо установить драйвер для вашего сканера."
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "Сохранить как..."
 
@@ -514,6 +514,11 @@ msgstr "_Отменить"
 msgid "_Save"
 msgstr "Со_хранить"
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "Сканированный документ.pdf"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -524,11 +529,6 @@ msgstr "Файлы изображений"
 msgid "All Files"
 msgstr "Все файлы"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr "Выберите _тип файла"
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -544,6 +544,11 @@ msgstr "JPEG (сжатый)"
 msgid "PNG (lossless)"
 msgstr "PNG (без потерь в качестве)"
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr "Формат файла:"
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -689,97 +694,186 @@ msgstr "Сохранить документ перед выходом?"
 msgid "Quit without Saving"
 msgstr "Выйти без сохранения"
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr "Похоже, у вас сканер компании Brother."
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+"Драйверы для этих сканеров доступны на <a "
+"href=\"http://support.brother.com\">веб-сайте Brother</a>."
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr "Похоже, у вас сканер компании Samsung."
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+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>."
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr "Похоже, у вас сканер компании HP."
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr "Похоже, у вас сканер компании Epson."
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+"Драйверы для этих сканеров доступны на <a "
+"href=\"http://support.epsom.com\">веб-сайте Epson</a>."
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr "Установка драйверов"
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr "После установки необходимо перезапустить Simple Scan."
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr "Установка драйверов…"
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr "Драйверы успешно установлены!"
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr "Не удалось установить драйверы (код ошибки %d)."
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr "Не удалось установить драйверы."
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (по умолчанию)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (черновик)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (высокое разрешение)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr "Новый документ"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr "Документ"
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr "Отправить..."
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr "Печать..."
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr "Справка"
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr "О программе"
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr "Завершить"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "Сменить _сканер"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "Выбрать автоматически"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr "Темнее"
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr "Светлее"
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr "Меньше"
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr "Больше"
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr "Мин."
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr "Макс."
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr "Сохранение документа..."
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Сохранение страницы %d из %d"
@@ -883,6 +977,12 @@ msgstr "Сохранение страницы %d из %d"
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Ширина отсканированного изображения в пикселах"
 
+#~ msgid "Scanned Document"
+#~ msgstr "Отсканированный документ"
+
+#~ msgid "Select File _Type"
+#~ msgstr "Выберите _тип файла"
+
 #~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
diff --git a/po/sd.po b/po/sd.po
index d19390e..0fc97eb 100644
--- a/po/sd.po
+++ b/po/sd.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Sindhi <sd@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "فوٽو"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr ""
 
@@ -206,7 +206,7 @@ msgstr "اسڪين"
 msgid "Save document to a file"
 msgstr "دستاويز کي فائل ۾ سانڍيو"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "سانڍيو"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "ڪاٽيو"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "ترجيحون"
 
@@ -304,19 +304,6 @@ msgstr "دستاويزات اسڪين ڪريو"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "اسڪين ڪرڻ لاءِ اوزار"
@@ -412,6 +399,19 @@ msgstr ""
 msgid "Quality value to use for JPEG compression."
 msgstr ""
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -451,11 +451,6 @@ msgstr ""
 msgid "Failed to scan"
 msgstr "اسڪين ڪرڻ ۾ ناڪامي"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "اسڪين ٿيل دستاويز"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -467,12 +462,7 @@ msgstr ""
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "اسڪين دستاويز.pdf"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr ""
 
@@ -492,8 +482,18 @@ msgstr ""
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr ""
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr ""
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "هينئن سانڍيو..."
 
@@ -505,6 +505,11 @@ msgstr ""
 msgid "_Save"
 msgstr ""
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "اسڪين دستاويز.pdf"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -515,11 +520,6 @@ msgstr "شڪل فائلون"
 msgid "All Files"
 msgstr "تمام فائلون"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr "فائل جو _قسم چونڊيو"
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -535,6 +535,11 @@ msgstr ""
 msgid "PNG (lossless)"
 msgstr ""
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr ""
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -633,97 +638,180 @@ msgstr "نڪرڻ کان پهرين دستاويز سانڍيو؟"
 msgid "Quit without Saving"
 msgstr "سانڍڻ بغير نڪرو"
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr ""
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr ""
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr ""
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "اسڪينر _تبديل ڪريو"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "پاڻمرادو"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
@@ -731,5 +819,11 @@ msgstr ""
 #~ msgid "Direction of scan"
 #~ msgstr "اسڪين جو رخ"
 
+#~ msgid "Scanned Document"
+#~ msgstr "اسڪين ٿيل دستاويز"
+
+#~ msgid "Select File _Type"
+#~ msgstr "فائل جو _قسم چونڊيو"
+
 #~ msgid "Files missing"
 #~ msgstr "فائلون وڃايل"
diff --git a/po/se.po b/po/se.po
index 54f426d..96c24d7 100644
--- a/po/se.po
+++ b/po/se.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2012-08-18 11:22+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Northern Sami <se@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "Fotografiija"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr ""
 
@@ -206,7 +206,7 @@ msgstr "Oza"
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "Vurke"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "Oidimat"
 
@@ -304,19 +304,6 @@ msgstr ""
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr ""
@@ -412,6 +399,19 @@ msgstr ""
 msgid "Quality value to use for JPEG compression."
 msgstr ""
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -451,11 +451,6 @@ msgstr ""
 msgid "Failed to scan"
 msgstr ""
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr ""
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -467,12 +462,7 @@ msgstr ""
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr ""
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr ""
 
@@ -492,8 +482,18 @@ msgstr ""
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr ""
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr ""
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "Vurke nugo …"
 
@@ -505,6 +505,11 @@ msgstr ""
 msgid "_Save"
 msgstr ""
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr ""
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -515,11 +520,6 @@ msgstr ""
 msgid "All Files"
 msgstr "Buot fiillat"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr ""
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -535,6 +535,11 @@ msgstr ""
 msgid "PNG (lossless)"
 msgstr ""
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr ""
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -633,97 +638,180 @@ msgstr ""
 msgid "Quit without Saving"
 msgstr ""
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr ""
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr ""
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr ""
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr ""
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "Automáhtalaš"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/shn.po b/po/shn.po
index 864282a..b00ff5e 100644
--- a/po/shn.po
+++ b/po/shn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Shan <shn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr ""
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr ""
 
@@ -206,7 +206,7 @@ msgstr ""
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr ""
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr ""
 
@@ -304,19 +304,6 @@ msgstr ""
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr ""
@@ -412,6 +399,19 @@ msgstr ""
 msgid "Quality value to use for JPEG compression."
 msgstr ""
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -451,11 +451,6 @@ msgstr ""
 msgid "Failed to scan"
 msgstr ""
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr ""
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -467,12 +462,7 @@ msgstr ""
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr ""
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr ""
 
@@ -492,8 +482,18 @@ msgstr ""
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr ""
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr ""
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr ""
 
@@ -505,6 +505,11 @@ msgstr ""
 msgid "_Save"
 msgstr ""
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr ""
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -515,11 +520,6 @@ msgstr ""
 msgid "All Files"
 msgstr ""
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr ""
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -535,6 +535,11 @@ msgstr ""
 msgid "PNG (lossless)"
 msgstr ""
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr ""
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -631,97 +636,180 @@ msgstr ""
 msgid "Quit without Saving"
 msgstr ""
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr ""
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr ""
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr ""
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr ""
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/sk.po b/po/sk.po
index 970c810..cace2a5 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
-"PO-Revision-Date: 2015-08-25 17:58+0000\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
+"PO-Revision-Date: 2015-10-10 18:57+0000\n"
 "Last-Translator: Dusan Kazik <prescott66@gmail.com>\n"
 "Language-Team: slovenčina <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 "Language: sk\n"
 
 #. Button to submit authorization dialog
@@ -90,7 +90,7 @@ msgstr "Fotografia"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr "Zmeniť poradie stránok"
 
@@ -208,7 +208,7 @@ msgstr "Skenovať"
 msgid "Save document to a file"
 msgstr "Uloží dokument do súboru"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "Uložiť"
 
@@ -251,7 +251,7 @@ msgid "Crop"
 msgstr "Orezanie"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "Nastavenia"
 
@@ -301,31 +301,12 @@ msgstr "Skener dokumentov"
 
 #: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
-msgstr "Skenovať dokumenty"
+msgstr "Skenuje dokumenty"
 
 #: ../data/simple-scan.desktop.in.h:4
 msgid "scan;scanner;flatbed;adf;"
 msgstr "skenovanie;skenovať;skener;plochý;adf;"
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-"Skutočne jednoduchý spôsob ako oskenovať dokumenty aj fotografie. Môžete "
-"orezať nevhodné časti fotografie a otočiť ich podľa potreby. Vaše oskenované "
-"dokumenty môžete vytlačiť, exportovať ich do pdf, alebo ich uložiť v rôznych "
-"formátoch obrázkov."
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-"Aplikácia Jednoduché skenovanie využíva rozhranie SANE, kvôli podpore "
-"väčšiny existujúcich skenerov."
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Zariadenie z ktorého skenovať"
@@ -432,10 +413,29 @@ msgstr "Hodnota kvality kompresie obrázkov JPEG"
 msgid "Quality value to use for JPEG compression."
 msgstr "Hodnota kvality, ktorá sa má použiť pre kompresiu obrázkov JPEG."
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"Skutočne jednoduchý spôsob ako oskenovať dokumenty aj fotografie. Môžete "
+"orezať nevhodné časti fotografie a otočiť ich podľa potreby. Vaše oskenované "
+"dokumenty môžete vytlačiť, exportovať ich do pdf, alebo ich uložiť v rôznych "
+"formátoch obrázkov."
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Aplikácia Jednoduché skenovanie využíva rozhranie SANE, kvôli podpore "
+"väčšiny existujúcich skenerov."
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
-msgstr "Žiaden skener nie je k dispozícii. Prosím pripojte skener."
+msgstr "Nie sú dostupné žiadne skenery. Prosím, pripojte skener."
 
 #. Error displayed when cannot connect to scanner
 #: ../src/scanner.vala:870
@@ -473,11 +473,6 @@ msgstr ""
 msgid "Failed to scan"
 msgstr "Skenovanie zlyhalo"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "Oskenovaný dokument"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -491,12 +486,7 @@ msgstr ""
 "Zoznam všetkých dostupných volieb príkazového riadka zobrazíte spustením „%s "
 "--help“."
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "Naskenovaný dokument.pdf"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr "_Zavrieť"
 
@@ -516,8 +506,18 @@ msgstr "Nezistili sa žiadne skenery"
 msgid "Please check your scanner is connected and powered on"
 msgstr "Prosím, skontrolujte, či je skener pripojený a zapnutý"
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr "Vyžaduje sa dodatočný softvér"
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr "Musíte nainštalovať softvér ovládača pre váš skener."
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "Uložiť ako..."
 
@@ -529,6 +529,11 @@ msgstr "Z_rušiť"
 msgid "_Save"
 msgstr "_Uložiť"
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "Naskenovaný dokument.pdf"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -539,15 +544,10 @@ msgstr "Súbory obrázkov"
 msgid "All Files"
 msgstr "Všetky súbory"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr "Vybrať _typ súboru"
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
-msgstr "PDF (dokument s viacerými stranami)"
+msgstr "PDF (dokument s viacerými stránkami)"
 
 #. Save dialog: Label for saving in JPEG format
 #: ../src/ui.vala:541
@@ -559,6 +559,11 @@ msgstr "JPEG (komprimovaný)"
 msgid "PNG (lossless)"
 msgstr "PNG (bezstratový)"
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr "Formát súboru:"
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -676,100 +681,190 @@ msgstr "Uložiť dokument pred ukončením?"
 msgid "Quit without Saving"
 msgstr "Ukončiť bez uloženia"
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr "Zdá sa, že máte skener značky Brother."
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+"Ovládače pre tento skener sú dostupné na <a "
+"href=\"http://support.brother.com\">webovej stránke výrobcu Brother</a>."
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr "Zdá sa, že máte skener značky Samsung."
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+"Ovládače pre tento skener sú dostupné na <a "
+"href=\"http://samsung.com/support\">webovej stránke výrobcu Samsung</a>."
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr "Zdá sa, že máte skener značky HP."
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr "Zdá sa, že máte skener značky Epson."
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+"Ovládače pre tento skener sú dostupné na <a "
+"href=\"http://support.epson.com\">webovej stránke výrobcu Epson</a>."
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr "Inštalácia ovládačov"
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+"Po inštalácii budete musieť aplikáciu Jednoduché skenovanie reštartovať."
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr "Inštalujú sa ovládače..."
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr "Ovládače boli úspešne nainštalované!"
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr "Zlyhala inštalácia ovládačov (kód chyby %d)."
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr "Zlyhala inštalácia ovládačov."
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr "Musíte nainštalovať balík(y) %s."
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (predvolené)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (koncept)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (vysoké rozlíšenie)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr "Nový dokument"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr "Dokument"
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr "Email..."
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr "Tlačiť..."
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr "Pomocník"
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr "O programe"
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr "Ukončiť"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "Zmeniť _skener"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr "Na_inštalovať ovládače"
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "Automatická"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr "Tmavší"
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr "Svetlejší"
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr "Menší"
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr "Väčší"
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr "Minimálna"
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr "Maximálna"
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr "Ukladá sa dokument…"
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
-msgstr "Ukladá sa %d. strana z %d"
+msgstr "Ukladá sa %d. stránka z %d"
 
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
@@ -871,3 +966,9 @@ msgstr "Ukladá sa %d. strana z %d"
 
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Šírka skenovaného obrázku v pixeloch"
+
+#~ msgid "Scanned Document"
+#~ msgstr "Oskenovaný dokument"
+
+#~ msgid "Select File _Type"
+#~ msgstr "Vybrať _typ súboru"
diff --git a/po/sl.po b/po/sl.po
index 3d3269f..9583234 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2012-07-23 09:19+0000\n"
 "Last-Translator: Andrej Znidarsic <andrej.znidarsic@gmail.com>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "Fotografija"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr "Prerazporeditev strani"
 
@@ -206,7 +206,7 @@ msgstr "Optično branje"
 msgid "Save document to a file"
 msgstr "Shrani dokument v datoteko"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "Shrani"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "Obreži"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "Možnosti"
 
@@ -304,19 +304,6 @@ msgstr "Optično preberite dokumente"
 msgid "scan;scanner;flatbed;adf;"
 msgstr "optični bralnik;adf;"
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Naprava za optično branje"
@@ -418,6 +405,19 @@ msgstr "Vrednost kakovosti za stiskanje JPEG"
 msgid "Quality value to use for JPEG compression."
 msgstr "Vrednost kakovosti za stiskanje JPEG."
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -458,11 +458,6 @@ msgstr ""
 msgid "Failed to scan"
 msgstr "Optično branje je spodletelo"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "Optično bran dokument"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -474,12 +469,7 @@ msgstr "[NAPRAVA ...] - pripomoček optičnega branja"
 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'."
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "Optično bran dokument.pdf"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr "_Zapri"
 
@@ -499,8 +489,18 @@ msgstr "Optičnega bralnika ni mogoče zaznati"
 msgid "Please check your scanner is connected and powered on"
 msgstr "Preverite, če je vaš optični bralnik povezan in vklopljen"
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr ""
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr ""
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "Shrani kot ..."
 
@@ -512,6 +512,11 @@ msgstr "_Prekliči"
 msgid "_Save"
 msgstr "_Shrani"
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "Optično bran dokument.pdf"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -522,11 +527,6 @@ msgstr "Slikovne datoteke"
 msgid "All Files"
 msgstr "Vse datoteke"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr "Izberite _vrsto datoteke"
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -542,6 +542,11 @@ msgstr "JPEG (stisnjen)"
 msgid "PNG (lossless)"
 msgstr "PNG (brez izgub)"
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr ""
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -662,97 +667,180 @@ msgstr "Ali naj bo dokument pred končanjem programa shranjen?"
 msgid "Quit without Saving"
 msgstr "Končaj brez shranjevanja"
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr ""
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr ""
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr ""
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d točk na palec (privzeto)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d točk na palec (osnutek)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d točk na palec (visoka ločljivost)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr "%d točk na palec"
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr "Nov dokument"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr "Dokument"
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr "E-pošta ..."
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr "Natisni ..."
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr "Pomoč"
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr "O programu"
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr "Izhod"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "Spremeni _optični bralnik"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "Samodejno"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr "Temenjše"
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr "Svetlejše"
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr "Manj"
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr "Več"
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr "Najmanj"
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr "Največ"
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr "Shranjevanje dokumenta ..."
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Shranjevanje strani %d od %d"
@@ -788,6 +876,9 @@ msgstr "Shranjevanje strani %d od %d"
 #~ "  --help-all Pokaže vse možnosti pomoči\n"
 #~ "  --help-gtk Pokaže možnosti GTK+"
 
+#~ msgid "Select File _Type"
+#~ msgstr "Izberite _vrsto datoteke"
+
 #~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
@@ -868,6 +959,9 @@ msgstr "Shranjevanje strani %d od %d"
 #~ "  --gtk-module=MODULES Naloži dodatnemodule GTK+\n"
 #~ "  --g-fatal-warnings Naredi vsa opozorila usodna"
 
+#~ msgid "Scanned Document"
+#~ msgstr "Optično bran dokument"
+
 #~ msgid "Please check your installation"
 #~ msgstr "Preverite svojo namestitev"
 
diff --git a/po/sq.po b/po/sq.po
index ec3b8ad..c5020ea 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2012-07-23 09:08+0000\n"
 "Last-Translator: Alket Rexhepi <alketii@gmail.com>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:13+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:14+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "Foto"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr ""
 
@@ -206,7 +206,7 @@ msgstr "Skanim"
 msgid "Save document to a file"
 msgstr "Ruaje dokumentin tek një fajll"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "Ruaj"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "Prej"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "Parapëlqimet"
 
@@ -304,19 +304,6 @@ msgstr "Skanoj Dokumentet"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Paisje për te skanuar prej"
@@ -418,6 +405,19 @@ msgstr "Vlera e cilësisë që do të përdoret në ngjashjen e JPEG"
 msgid "Quality value to use for JPEG compression."
 msgstr "Vlera e cilësisë që do të përdoret në ngjashjen e JPEG."
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -459,11 +459,6 @@ msgstr ""
 msgid "Failed to scan"
 msgstr "Skanimi dështoi"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "Dokumenti i Skanuar"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -477,12 +472,7 @@ msgstr ""
 "Nis '%s --ndihmë' për të parë një listë të plotë të linjave të disponueshme "
 "të komandës."
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "Dokumenti i Skanuar.pdf"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr "_Mbylle"
 
@@ -503,8 +493,18 @@ msgid "Please check your scanner is connected and powered on"
 msgstr ""
 "Ju lutemi të kontrolloni nëse skaneri juaj është i lidhur dhe i ndezur"
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr ""
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr ""
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "Ruaje Si..."
 
@@ -516,6 +516,11 @@ msgstr "_Anullo"
 msgid "_Save"
 msgstr "_Ruaje"
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "Dokumenti i Skanuar.pdf"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -526,11 +531,6 @@ msgstr "Kartela Pamje"
 msgid "All Files"
 msgstr "Të Gjithë Skedarët"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr "Zgjidh Llojin e _Skedarit"
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -546,6 +546,11 @@ msgstr "JPEG (i ngjeshur)"
 msgid "PNG (lossless)"
 msgstr "PNG (pa humbje)"
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr ""
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -658,97 +663,180 @@ msgstr "Ta ruaj dokumentin para daljes?"
 msgid "Quit without Saving"
 msgstr "Dil pa e ruajtur"
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr ""
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr ""
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr ""
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (e parazgjedhur)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (i thjeshtë)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (rezolucion i lartë)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "Ndrysho _Skanerin"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "Automatik"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr "Më e Errët"
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr "Më e lehtë"
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr "Më Pak"
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr "Më tepër"
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr "Maksimum"
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr "Ruajtje e dokumentit..."
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Ruajtja e faqes %d nga %d"
@@ -784,6 +872,9 @@ msgstr "Ruajtja e faqes %d nga %d"
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Lartësia e figurës së skanuar në pixella"
 
+#~ msgid "Select File _Type"
+#~ msgstr "Zgjidh Llojin e _Skedarit"
+
 #~ msgid "Window height in pixels"
 #~ msgstr "Lartësia e dritares në piksel"
 
@@ -798,6 +889,9 @@ msgstr "Ruajtja e faqes %d nga %d"
 #~ "Përdorimi:\n"
 #~ "  %s [DEVICE...] - Mjeti skanues"
 
+#~ msgid "Scanned Document"
+#~ msgstr "Dokumenti i Skanuar"
+
 #~ msgid "Please check your installation"
 #~ msgstr "Ju lutemi të kontrolloni instalimin tuaj"
 
diff --git a/po/sr.po b/po/sr.po
index b20a5d2..9857288 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2015-05-19 19:28+0000\n"
 "Last-Translator: Марко М. Костић <Unknown>\n"
 "Language-Team: Serbian translators\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 "Language: sr\n"
 
 #. Button to submit authorization dialog
@@ -88,7 +88,7 @@ msgstr "Слика"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr "Промени ред страница"
 
@@ -206,7 +206,7 @@ msgstr "Скенирај"
 msgid "Save document to a file"
 msgstr "Сачувајте документ у датотеку"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "Сачувај"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "Одрежи"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "Поставке"
 
@@ -304,24 +304,6 @@ msgstr "Скенирајте документе"
 msgid "scan;scanner;flatbed;adf;"
 msgstr "скенирати;скенер;flatbed;adf;"
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-"Једноставно решење за лако скенирање докумената и слика. Можете исећи лоше "
-"делове слика и ротирати скенирано. Можете штампати скенирано, одрадити извоз "
-"у ПДФ или сачувати скенирано у један од мноштва подржаних формата слика."
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-"Обично скенирање користи САНЕ радни оквир да би додатно подржао већину "
-"тренутних скенера."
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Уређај са ког ће се скенирати"
@@ -429,6 +411,24 @@ msgstr "Вредност квалитета за ЈПЕГ сажимање"
 msgid "Quality value to use for JPEG compression."
 msgstr "Вредност квалитета која ће се користити за ЈПЕГ сажимање."
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"Једноставно решење за лако скенирање докумената и слика. Можете исећи лоше "
+"делове слика и ротирати скенирано. Можете штампати скенирано, одрадити извоз "
+"у ПДФ или сачувати скенирано у један од мноштва подржаних формата слика."
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Обично скенирање користи САНЕ радни оквир да би додатно подржао већину "
+"тренутних скенера."
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -469,11 +469,6 @@ msgstr ""
 msgid "Failed to scan"
 msgstr "Нисам успео да скенирам"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "Скенирани документ"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -486,12 +481,7 @@ msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Покрените „%s --help“ за потпуни списак свих опција из командне линије."
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "Скенирани документ.pdf"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr "_Затвори"
 
@@ -511,8 +501,18 @@ msgstr "Нема откривених скенера"
 msgid "Please check your scanner is connected and powered on"
 msgstr "Проверите да ли је скенер повезан и укључен"
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr ""
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr ""
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "Сачувај као..."
 
@@ -524,6 +524,11 @@ msgstr "_Откажи"
 msgid "_Save"
 msgstr "_Сачувај"
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "Скенирани документ.pdf"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -534,11 +539,6 @@ msgstr "Датотеке слика"
 msgid "All Files"
 msgstr "Све датотеке"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr "_Изабери врсту датотеке"
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -554,6 +554,11 @@ msgstr "ЈПЕГ (сажето)"
 msgid "PNG (lossless)"
 msgstr "ПНГ (без губитака)"
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr ""
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -670,97 +675,180 @@ msgstr "Да сачувам документ пре него што изађем
 msgid "Quit without Saving"
 msgstr "Изађи без чувања"
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr ""
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr ""
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr ""
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d тпи (основно)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d тпи (нацрт)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d тпи (висока резолуција)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr "%d тпи"
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr "Нови документ"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr "Документ"
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr "Ел. пошта..."
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr "Штампај..."
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr "Помоћ"
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr "О програму"
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr "Изађи"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "Промени _скенер"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "Самостално"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr "Тамније"
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr "Светлије"
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr "Мање"
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr "Више"
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr "Најмање"
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr "Највише"
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr "Чувам документ..."
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Чувам %d. страницу од укупно %d"
@@ -783,6 +871,9 @@ msgstr "Чувам %d. страницу од укупно %d"
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "Резолуција у тачкама-по-инчу (dpi) претходно скениране слике."
 
+#~ msgid "Scanned Document"
+#~ msgstr "Скенирани документ"
+
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Висина скениране слике у тачкама"
 
@@ -883,3 +974,6 @@ msgstr "Чувам %d. страницу од укупно %d"
 #~ msgstr ""
 #~ "Висина скениране слике у тачкама. Ова вредност се аутоматски поставља на "
 #~ "величину последње скениране странице."
+
+#~ msgid "Select File _Type"
+#~ msgstr "_Изабери врсту датотеке"
diff --git a/po/sv.po b/po/sv.po
index 5435a48..714ec92 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2015-08-25 06:00+0000\n"
 "Last-Translator: Daniel Nylander <yeager@ubuntu.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "Foto"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr "Ändra sidordning"
 
@@ -206,7 +206,7 @@ msgstr "Läs in"
 msgid "Save document to a file"
 msgstr "Spara dokument till en fil"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "Spara"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "Beskär"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "Inställningar"
 
@@ -304,25 +304,6 @@ msgstr "Läs in dokument"
 msgid "scan;scanner;flatbed;adf;"
 msgstr "scan;scanner;flatbädd;adf;skan;skanner;"
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-"Ett väldigt lätt sätt att skanna både dokument och foton. Du kan beskära "
-"bort dåliga delar av ett foto, och rotera det om det är felvänt. Du kan "
-"skriva ut det du skannat in, exportera till pdf, eller spara dem i ett brett "
-"utbud av bildformat."
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-"Simple Scan använder ramverket SANE för att hantera de flesta skannrar som "
-"finns på marknaden."
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Enhet att läsa in från"
@@ -426,6 +407,25 @@ msgstr "Kvalitets värde i JPEG kompression"
 msgid "Quality value to use for JPEG compression."
 msgstr "Kvalitets värde i JPEG kompression"
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"Ett väldigt lätt sätt att skanna både dokument och foton. Du kan beskära "
+"bort dåliga delar av ett foto, och rotera det om det är felvänt. Du kan "
+"skriva ut det du skannat in, exportera till pdf, eller spara dem i ett brett "
+"utbud av bildformat."
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Simple Scan använder ramverket SANE för att hantera de flesta skannrar som "
+"finns på marknaden."
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -465,11 +465,6 @@ msgstr "Laga PDF-filer som skapades med äldre versioner av Simple Scan"
 msgid "Failed to scan"
 msgstr "Misslyckades med att läsa in"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "Inläst dokument"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -483,12 +478,7 @@ msgstr ""
 "Kör \"%s --help\" för en komplett lista över tillgängliga "
 "kommandoradsflaggor."
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "Inläst dokument.pdf"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr "_Stäng"
 
@@ -508,8 +498,18 @@ msgstr "Inga bildinläsare hittades"
 msgid "Please check your scanner is connected and powered on"
 msgstr "Kontrollera att din bildläsare är ansluten och påslagen"
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr "Ytterligare programvara behövs"
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr "Du behöver installera drivrutiner för din skanner."
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "Spara som..."
 
@@ -521,6 +521,11 @@ msgstr "_Avbryt"
 msgid "_Save"
 msgstr "_Spara"
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "Inläst dokument.pdf"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -531,11 +536,6 @@ msgstr "Bildfiler"
 msgid "All Files"
 msgstr "Alla filer"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr "Välj fil_typ"
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -551,6 +551,11 @@ msgstr "JPEG (komprimerad)"
 msgid "PNG (lossless)"
 msgstr "PNG (förlustfri)"
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr "Filformat:"
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -655,6 +660,7 @@ msgstr ""
 "  Daniel Nylander https://launchpad.net/~yeager\n"
 "  Erik Hellberg https://launchpad.net/~erik-hellberg85\n"
 "  Jens Askengren https://launchpad.net/~jens-askengren\n"
+"  Josef Andersson https://launchpad.net/~northar\n"
 "  Peter Ahlgren https://launchpad.net/~peter.ahlgren-deactivatedaccount\n"
 "  Robert Ancell https://launchpad.net/~robert-ancell\n"
 "  Simba https://launchpad.net/~the-funnyboy\n"
@@ -672,97 +678,186 @@ msgstr "Spara dokumment innan du avslutar?"
 msgid "Quit without Saving"
 msgstr "Avsluta utan att spara"
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr "Du verkar ha en skanner från Brother."
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+"Drivrutinerna finns på <a href=\"http://support.brother.com\">Brothers "
+"webbplats</a>."
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr "Du verkar ha en skanner från Samsung."
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+"Drivrutinerna finns på <a href=\"http://samsung.com/support\">Samsungs "
+"webbplats</a>."
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr "Du verkar ha en skanner från HP."
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr "Du verkar ha en skanner från Epson."
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+"Drivrutinerna finns på <a href=\"http://support.epson.com\">Epsons "
+"webbplats</a>."
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr "Installera drivrutiner"
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr "Efter installation kan du behöva starta om Simple Scan."
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr "Installerar drivrutiner..."
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr "Drivrutinerna installerades!"
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr "Kunde inte installera drivrutiner (felkod %d)."
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr "Kunde inte installera drivrutiner."
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (standard)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (utkast)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (hög upplösning)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr "Nytt dokument"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr "Dokument"
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr "E-post..."
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr "Skriv ut..."
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr "Hjälp"
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr "Om"
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr "Avsluta"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "Byt _bildinläsare"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr "_Installera drivrutiner"
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "Automatiskt"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr "Mörkare"
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr "Ljusare"
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr "Mindre"
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr "Mer"
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr "Maximum"
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr "Sparar dokument..."
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Sparar sida %d av %d"
@@ -781,6 +876,9 @@ msgstr "Sparar sida %d av %d"
 #~ "Användning:\n"
 #~ "  %s [ENHET...] - Inläsningsverktyg"
 
+#~ msgid "Select File _Type"
+#~ msgstr "Välj fil_typ"
+
 #~ msgid "Please check your installation"
 #~ msgstr "Kontrollera din installation"
 
@@ -843,6 +941,9 @@ msgstr "Sparar sida %d av %d"
 #~ "  --gtk-module=MODULER            Läs in ytterligare GTK+-moduler\n"
 #~ "  --g-fatal-warnings              Gör alla varningar ödesdigra"
 
+#~ msgid "Scanned Document"
+#~ msgstr "Inläst dokument"
+
 #~ msgid ""
 #~ "The height of scanned image in pixels. This value is updated to what the "
 #~ "last scanned page was."
diff --git a/po/ta.po b/po/ta.po
index 14989db..c61a06d 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2014-03-22 13:36+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Tamil <ta@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr ""
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr ""
 
@@ -206,7 +206,7 @@ msgstr ""
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr ""
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr ""
 
@@ -304,19 +304,6 @@ msgstr ""
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr ""
@@ -412,6 +399,19 @@ msgstr ""
 msgid "Quality value to use for JPEG compression."
 msgstr ""
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -451,11 +451,6 @@ msgstr ""
 msgid "Failed to scan"
 msgstr ""
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr ""
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -467,12 +462,7 @@ msgstr ""
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr ""
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr ""
 
@@ -492,8 +482,18 @@ msgstr ""
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr ""
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr ""
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr ""
 
@@ -505,6 +505,11 @@ msgstr ""
 msgid "_Save"
 msgstr ""
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr ""
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -515,11 +520,6 @@ msgstr ""
 msgid "All Files"
 msgstr ""
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr ""
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -535,6 +535,11 @@ msgstr ""
 msgid "PNG (lossless)"
 msgstr ""
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr ""
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -636,97 +641,180 @@ msgstr ""
 msgid "Quit without Saving"
 msgstr ""
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr ""
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr ""
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr ""
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr ""
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/te.po b/po/te.po
index 2b484d3..10246d8 100644
--- a/po/te.po
+++ b/po/te.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2012-07-23 09:08+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Telugu <te@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "ఫొటో"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr ""
 
@@ -206,7 +206,7 @@ msgstr "స్కాన్"
 msgid "Save document to a file"
 msgstr "పత్రాన్ని ఫైలులో దాచు"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "భద్రపరచు"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "అంచులుసవరించు"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "ప్రాధాన్యతలు"
 
@@ -304,19 +304,6 @@ msgstr "పత్రాలు స్కాన్ చేయు"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "స్కాన్ చేయుటకు పరికరం"
@@ -418,6 +405,19 @@ msgstr ""
 msgid "Quality value to use for JPEG compression."
 msgstr ""
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -457,11 +457,6 @@ msgstr ""
 msgid "Failed to scan"
 msgstr "స్కాన్‌చేయుటలో విఫలమైంది"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "స్కాన్‌చేయబడిన పత్రం"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -473,12 +468,7 @@ msgstr ""
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "అందుబాటులో వున్న అదేశ వరుస ఐచ్చికముల కొరకు '%s --help' నడుపు."
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "స్కాన్‌చేయబడిన పత్రం.pdf"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr ""
 
@@ -499,8 +489,18 @@ msgid "Please check your scanner is connected and powered on"
 msgstr ""
 "మీ స్కానర్ విద్యుత్తుచే చేతనమై కంప్యూటర్‌కు అనుసంధానమైనదో లేదో చూడండి."
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr ""
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr ""
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "ఇలా దాచు..."
 
@@ -512,6 +512,11 @@ msgstr ""
 msgid "_Save"
 msgstr ""
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "స్కాన్‌చేయబడిన పత్రం.pdf"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -522,11 +527,6 @@ msgstr "బొమ్మ ఫైళ్లు"
 msgid "All Files"
 msgstr "అన్ని ఫైళ్ళు"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr "ఫైల్ రకం ఎంచుకోండి( _T)"
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -542,6 +542,11 @@ msgstr "JPEG (కుదించిన)"
 msgid "PNG (lossless)"
 msgstr "PNG (నష్టంలేని)"
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr ""
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -654,97 +659,180 @@ msgstr "నిష్క్రమించేముందు పత్రాన�
 msgid "Quit without Saving"
 msgstr "దాచకుండా నిష్క్రమించు"
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr ""
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr ""
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr ""
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (అప్రమేయ)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (చిత్తు)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (ఉన్నత విభాజకత)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "స్కానర్‌ను మార్చు(_S)"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "స్వయంచాలక"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
@@ -806,6 +894,9 @@ msgstr ""
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "స్కాన్‌చేయబడిన బొమ్మ వెడల్పు(పిక్సెళ్ళలో)"
 
+#~ msgid "Select File _Type"
+#~ msgstr "ఫైల్ రకం ఎంచుకోండి( _T)"
+
 #~ msgid "Files missing"
 #~ msgstr "కనబడని ఫైళ్లు"
 
@@ -858,5 +949,8 @@ msgstr ""
 #~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
 #~ "  --g-fatal-warnings              Make all warnings fatal"
 
+#~ msgid "Scanned Document"
+#~ msgstr "స్కాన్‌చేయబడిన పత్రం"
+
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
diff --git a/po/th.po b/po/th.po
index 32110fa..fe3cd02 100644
--- a/po/th.po
+++ b/po/th.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2012-07-23 09:09+0000\n"
 "Last-Translator: AnuchitChalothorn <anoochit@gmail.com>\n"
 "Language-Team: Thai <th@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "ภาพถ่าย"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr ""
 
@@ -206,7 +206,7 @@ msgstr "สแกน"
 msgid "Save document to a file"
 msgstr "บันทึกเอกสารเป็นแฟ้ม"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "บันทึก"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "ตัด"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "คุณสมบัติ"
 
@@ -304,19 +304,6 @@ msgstr "สแกนเอกสาร"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "เครื่องสแกนจาก"
@@ -417,6 +404,19 @@ msgstr ""
 msgid "Quality value to use for JPEG compression."
 msgstr ""
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -456,11 +456,6 @@ msgstr "ซ่อมแฟ้ม PDF ที่ถูกสร้างด้ว�
 msgid "Failed to scan"
 msgstr "การสแกนล้มเหลว"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "เอกสารที่สแกนแล้ว"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -472,12 +467,7 @@ msgstr "[DEVICE...] - เครื่องมือกำลังสแกน"
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "เรียก '%s --help' เพื่อดูตัวเลือกทั้งหมดที่มีของบรรทัดคำสั่ง"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "สแกน Document.pdf แล้ว"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr ""
 
@@ -497,8 +487,18 @@ msgstr "ไม่พบเครื่องสแกน"
 msgid "Please check your scanner is connected and powered on"
 msgstr "กรุณาตรวจสอบการเชื่อมต่อเครื่องสแกนของคุณและเปิดเครื่อง"
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr ""
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr ""
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "บันทึกเป็น..."
 
@@ -510,6 +510,11 @@ msgstr ""
 msgid "_Save"
 msgstr ""
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "สแกน Document.pdf แล้ว"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -520,11 +525,6 @@ msgstr "แฟ้มภาพ"
 msgid "All Files"
 msgstr "แฟ้มทั้งหมด"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr "เลือก_ประเภทแฟ้ม"
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -540,6 +540,11 @@ msgstr "JPEG (บีบอัดแล้ว)"
 msgid "PNG (lossless)"
 msgstr "PNG (lossless)"
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr ""
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -656,97 +661,180 @@ msgstr "บันทึกเอกสารก่อนปิดหรือไ
 msgid "Quit without Saving"
 msgstr "ปิดโดยไม่บันทึก"
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr ""
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr ""
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr ""
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (ค่าปริยาย)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (ภาพร่าง)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (ความละเอียดสูง)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "เ_ปลี่ยนเครื่องสแกน"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "อัตโนมัติ"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
@@ -809,6 +897,9 @@ msgstr ""
 #~ msgid "Window width in pixels"
 #~ msgstr "ความกว้างของหน้าต่างเป็นพิกเซล"
 
+#~ msgid "Scanned Document"
+#~ msgstr "เอกสารที่สแกนแล้ว"
+
 #, c-format
 #~ msgid ""
 #~ "Usage:\n"
@@ -857,6 +948,9 @@ msgstr ""
 #~ "  --g-fatal-warnings              ถือว่าคำเตือนต่างๆ "
 #~ "ที่เกิดขึ้นเป็นความผิดพลาดร้ายแรง"
 
+#~ msgid "Select File _Type"
+#~ msgstr "เลือก_ประเภทแฟ้ม"
+
 #~ msgid "Files missing"
 #~ msgstr "ไม่พบแฟ้ม"
 
diff --git a/po/tr.po b/po/tr.po
index d811670..f9e9c39 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2012-07-23 09:09+0000\n"
 "Last-Translator: Robert Ancell <robert.ancell@canonical.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "Fotoğraf"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr "Sayfaları Yeniden Sırala"
 
@@ -206,7 +206,7 @@ msgstr "Tara"
 msgid "Save document to a file"
 msgstr "Belgeyi bir dosyaya kaydet"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "Kaydet"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "Kırp"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "Tercihler"
 
@@ -304,19 +304,6 @@ msgstr "Belgeleri Tara"
 msgid "scan;scanner;flatbed;adf;"
 msgstr "tara;tarayıcı;flatbed;adf;"
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Tarama yapılacak aygıt"
@@ -423,6 +410,19 @@ msgstr "JPEG sıkıştırması için kalite değeri"
 msgid "Quality value to use for JPEG compression."
 msgstr "JPEG sıkıştırması için kalite değeri"
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -462,11 +462,6 @@ msgstr "Basit Tarama'nın eski sürümlerince üretilen PDF dosyalarını düzel
 msgid "Failed to scan"
 msgstr "Tarama başarısız oldu"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "Taranmış Belge"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -480,12 +475,7 @@ msgstr ""
 "Kullanılabilir komut satırı seçeneklerinin tam listesini görmek için '%s --"
 "help' komutunu çalıştırın."
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "Taranan Belge.pdf"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr "_Kapat"
 
@@ -505,8 +495,18 @@ msgstr "Tarayıcı bulunamadı"
 msgid "Please check your scanner is connected and powered on"
 msgstr "Lütfen tarayıcınızın bağlı ve açık olduğundan emin olun"
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr ""
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr ""
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "Farklı Kaydet..."
 
@@ -518,6 +518,11 @@ msgstr "_Vazgeç"
 msgid "_Save"
 msgstr "_Kaydet"
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "Taranan Belge.pdf"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -528,11 +533,6 @@ msgstr "Resim Dosyaları"
 msgid "All Files"
 msgstr "Tüm Dosyalar"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr "Dosya _Türünü Seç"
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -548,6 +548,11 @@ msgstr "JPEG (sıkıştırılmış)"
 msgid "PNG (lossless)"
 msgstr "PNG (kayıpsız)"
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr ""
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -656,6 +661,7 @@ msgstr ""
 "  Mesut Muhammet Şahin https://launchpad.net/~messah\n"
 "  Murat Bişkin https://launchpad.net/~muratbiskin\n"
 "  Mustafa Yılmaz https://launchpad.net/~apshalasha\n"
+"  Nurullah Isırgan https://launchpad.net/~nurullahrt\n"
 "  Robert Ancell https://launchpad.net/~robert-ancell\n"
 "  Volkan Gezer https://launchpad.net/~volkangezer\n"
 "  Yalçın Can https://launchpad.net/~yalcin.can\n"
@@ -675,97 +681,180 @@ msgstr "Çıkmadan önce belgeyi kaydet?"
 msgid "Quit without Saving"
 msgstr "Kaydetmeden Çık"
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr ""
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr ""
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr ""
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (varsayılan)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (taslak)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (yüksek çözünürlük)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr "Yeni Belge"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr "Belge"
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr "E-Posta..."
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr "Yazdır..."
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr "Yardım"
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr "Hakkında"
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr "Çık"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "_Tarayıcı Değiştir"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "Otomatik"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr "Daha Koyu"
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr "Daha Açık"
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr "Daha Az"
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr "Daha Fazla"
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr "En Az"
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr "En Çok"
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr "Belge kaydediliyor..."
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Kaydedilen sayfa: %d / %d"
@@ -877,6 +966,12 @@ msgstr "Kaydedilen sayfa: %d / %d"
 #~ "'fotoğraf'. Bu ayar tarama çözünürlüğünü, renkleri ve  tarama sonrası "
 #~ "işlemleri belirler."
 
+#~ msgid "Scanned Document"
+#~ msgstr "Taranmış Belge"
+
+#~ msgid "Select File _Type"
+#~ msgstr "Dosya _Türünü Seç"
+
 #~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
diff --git a/po/ug.po b/po/ug.po
index 63d253e..b083820 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2012-08-07 01:17+0000\n"
 "Last-Translator: Sahran <Unknown>\n"
 "Language-Team: Uyghur Computer Science Association <ubuntu-l10n-"
@@ -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: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 "X-Poedit-Language: Uighur\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
@@ -91,7 +91,7 @@ msgstr "سۈرەت"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr "بەتلەرنى قايتا تىزىش"
 
@@ -209,7 +209,7 @@ msgstr "شويلىلاش"
 msgid "Save document to a file"
 msgstr "پۈتۈكنى ھۆججەتكە ساقلايدۇ"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "ساقلا"
 
@@ -251,7 +251,7 @@ msgid "Crop"
 msgstr "قىرقى"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "مايىللىق"
 
@@ -307,19 +307,6 @@ msgstr "پۈتۈك شويلىلاش"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "شويلىلايدىغان ئۈسكۈنە"
@@ -423,6 +410,19 @@ msgstr "JPEG پرېسىنىڭ سۈپىتىنى بەلگىلەيدىغان قىم
 msgid "Quality value to use for JPEG compression."
 msgstr "JPEG پرېسىنىڭ سۈپىتىنى بەلگىلەيدىغان قىممىتى."
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -463,11 +463,6 @@ msgstr ""
 msgid "Failed to scan"
 msgstr "شويلىلاش مەغلۇپ بولدى"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "شويلىلانغان ھۆججەت"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -480,12 +475,7 @@ msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "'%s --help' ئىجرا قىلىنسا بۇيرۇق قۇرى تاللانمىسىنىڭ تولۇق تىزىمى كۆرۈنىدۇ."
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "شويلىلانغان Document.pdf"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr "ياپ(_C)"
 
@@ -505,8 +495,18 @@ msgstr "شويلىلىغۇچ تېپىلمىدى"
 msgid "Please check your scanner is connected and powered on"
 msgstr "شويلىلىغۇچ چېتىلغانمۇ توكى ئۇلانغانمۇ تەكشۈرۈڭ"
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr ""
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr ""
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "باشقا ئاتتا ساقلا…"
 
@@ -518,6 +518,11 @@ msgstr "ئەمەلدىن قالدۇر(_C)"
 msgid "_Save"
 msgstr "ساقلا(_S)"
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "شويلىلانغان Document.pdf"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -528,11 +533,6 @@ msgstr "سۈرەت ھۆججەتلىرى"
 msgid "All Files"
 msgstr "بارلىق ھۆججەتلەر"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr "ھۆججەت تىپىنى تاللا(_T)"
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -548,6 +548,11 @@ msgstr "JPEG (پرېسلانغان)"
 msgid "PNG (lossless)"
 msgstr "PNG (خورىماس)"
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr ""
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -667,97 +672,180 @@ msgstr "ئاخىرلاشتۇرۇشتىن ئاۋۋال ھازىرقى پۈتۈك�
 msgid "Quit without Saving"
 msgstr "ساقلىماي ئاخىرلاشتۇر"
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr ""
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr ""
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr ""
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (كۆڭۈلدىكى)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (دەسلەپكى نۇسخا)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (يۇقىرى ئېنىقلىق)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr "يېڭى پۈتۈك"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr "پۈتۈك"
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr "ئېلخەت…"
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr "باس…"
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr "ياردەم"
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr "ھەققىدە"
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr "ئاخىرلاشتۇر"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "شويلىلىغۇچنى ئالماشتۇرۇڭ(_S)"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "ئاپتوماتىك"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr "قارىراق"
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr "يورۇقراق"
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr "كىچىك"
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr "تېخىمۇ كۆپ"
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr "ئەڭ كىچىك"
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr "ئەڭ چوڭ"
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr "پۈتۈكنى ساقلاۋاتىدۇ…"
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "ساقلاۋاتقىنى %d/%d - بەت"
@@ -870,5 +958,11 @@ msgstr "ساقلاۋاتقىنى %d/%d - بەت"
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "ئاخىرقى قېتىم تەسۋىر يايغان رەسىمنىڭ ئېنىقلىقى"
 
+#~ msgid "Scanned Document"
+#~ msgstr "شويلىلانغان ھۆججەت"
+
+#~ msgid "Select File _Type"
+#~ msgstr "ھۆججەت تىپىنى تاللا(_T)"
+
 #~ msgid "Please check your installation"
 #~ msgstr "ئورنىتىشنى تەكشۈرۈپ بېقىڭ"
diff --git a/po/uk.po b/po/uk.po
index 20c6c14..9285b77 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2012-07-23 11:28+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@gmail.com>\n"
 "Language-Team: Ukrainian <translation@linux.org.ua>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "Фотографія"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr "Перевпорядкувати сторінки"
 
@@ -206,7 +206,7 @@ msgstr "Сканувати"
 msgid "Save document to a file"
 msgstr "Зберегти документ до файла"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "Зберегти"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "Обрізати"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "Налаштування"
 
@@ -305,26 +305,6 @@ msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 "scan;scanner;flatbed;adf;сканування;сканер;планшет;двобічне;автоматичне;"
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-"Програма для спрощення сканування документів та фотографій. За її допомогою "
-"ви зможете обрізати непотрібні частини сканованої фотографії та обернути її "
-"так, як потрібно. Передбачено можливості друку сканованих зображень, "
-"експортування даних до PDF та зберігання даних у файлах зображень "
-"різноманітних форматів."
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-"Для роботи із більшістю сканерів у Simple Scan використовуються бібліотеки "
-"SANE."
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Пристрій сканування"
@@ -426,6 +406,26 @@ msgstr "Значення якості, яке буде використано п
 msgid "Quality value to use for JPEG compression."
 msgstr "Значення якості, яке буде використано під час стискання JPEG."
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"Програма для спрощення сканування документів та фотографій. За її допомогою "
+"ви зможете обрізати непотрібні частини сканованої фотографії та обернути її "
+"так, як потрібно. Передбачено можливості друку сканованих зображень, "
+"експортування даних до PDF та зберігання даних у файлах зображень "
+"різноманітних форматів."
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Для роботи із більшістю сканерів у Simple Scan використовуються бібліотеки "
+"SANE."
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -468,11 +468,6 @@ msgstr ""
 msgid "Failed to scan"
 msgstr "Помилка сканування"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "Сканований документ"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -486,12 +481,7 @@ msgstr ""
 "Виконайте « %s --help», щоб побачити повний перелік доступних параметрів "
 "командного рядка."
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "Сканований документ.pdf"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr "За_крити"
 
@@ -511,8 +501,18 @@ msgstr "Сканерів не виявлено"
 msgid "Please check your scanner is connected and powered on"
 msgstr "Будь ласка, перевірте, чи з’єднано ваш сканер і чи увімкнено його"
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr "Потрібне додаткове програмне забезпечення"
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr "Вам слід встановити драйвер до вашого сканера."
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "Зберегти як..."
 
@@ -524,6 +524,11 @@ msgstr "_Скасувати"
 msgid "_Save"
 msgstr "З_берегти"
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "Сканований документ.pdf"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -534,11 +539,6 @@ msgstr "Файли зображень"
 msgid "All Files"
 msgstr "Всі файли"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr "Вибрати _тип файла"
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -554,6 +554,11 @@ msgstr "JPEG (стиснений)"
 msgid "PNG (lossless)"
 msgstr "PNG (без втрат)"
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr "Формат файлів:"
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -667,97 +672,186 @@ msgstr "Зберегти документ перед виходом?"
 msgid "Quit without Saving"
 msgstr "Вийти без збереження"
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr "Здається, у вас сканер Brother."
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+"Драйвери можна отримати на <a href=\"http://support.brother.com\">сайті "
+"Brother</a>."
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr "Здається, у вас сканер Samsung."
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+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>."
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr "Здається, у вас сканер HP."
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr "Здається, у вас сканер Epson."
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+"Драйвери до таких сканерів можна отримати з <a "
+"href=\"http://support.epsom.com\">сайта Epson</a>."
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr "Встановлення драйверів"
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr "Після встановлення драйверів, вам слід перезапустити Simple Scan."
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr "Встановлюємо драйвери…"
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr "Драйвери успішно встановлено!"
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr "Не вдалося встановити драйвери (код помилки %d)."
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr "Не вдалося встановити драйвери."
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d т/д (типова)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d т/д (чернетка)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d т/д (висока роздільність)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr "%d т/д"
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr "Новий документ"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr "Документ"
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr "Надіслати ел. поштою…"
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr "Надрукувати…"
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr "Довідка"
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr "Про програму"
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr "Вийти"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "З_мінити сканер"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr "_Встановити драйвери"
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "Автоматично"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr "темніше"
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr "світліше"
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr "менше"
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr "більше"
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr "Мінімальна"
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr "Максимальна"
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr "Збереження документа…"
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Зберігаємо сторінку %d з %d"
@@ -873,6 +967,12 @@ msgstr "Зберігаємо сторінку %d з %d"
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Роздільна здатність попереднього сканованого зображення"
 
+#~ msgid "Scanned Document"
+#~ msgstr "Сканований документ"
+
+#~ msgid "Select File _Type"
+#~ msgstr "Вибрати _тип файла"
+
 #~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
diff --git a/po/ur.po b/po/ur.po
index cfc96e1..644a8bb 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Urdu <ur@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "تصویر"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr ""
 
@@ -206,7 +206,7 @@ msgstr ""
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "محفوظ کریں"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "ترجیحات"
 
@@ -304,19 +304,6 @@ msgstr ""
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr ""
@@ -412,6 +399,19 @@ msgstr ""
 msgid "Quality value to use for JPEG compression."
 msgstr ""
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -451,11 +451,6 @@ msgstr ""
 msgid "Failed to scan"
 msgstr ""
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr ""
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -467,12 +462,7 @@ msgstr ""
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr ""
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr ""
 
@@ -492,8 +482,18 @@ msgstr ""
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr ""
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr ""
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr ""
 
@@ -505,6 +505,11 @@ msgstr ""
 msgid "_Save"
 msgstr ""
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr ""
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -515,11 +520,6 @@ msgstr ""
 msgid "All Files"
 msgstr ""
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr ""
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -535,6 +535,11 @@ msgstr ""
 msgid "PNG (lossless)"
 msgstr ""
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr ""
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -635,97 +640,180 @@ msgstr ""
 msgid "Quit without Saving"
 msgstr ""
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr ""
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr ""
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr ""
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr ""
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/uz.po b/po/uz.po
index a85e6ed..5235d37 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Uzbek <uz@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "Rasm"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr ""
 
@@ -206,7 +206,7 @@ msgstr "Skan qilish"
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "Saqlash"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "Kesish"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "Мослашлар"
 
@@ -304,19 +304,6 @@ msgstr ""
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr ""
@@ -412,6 +399,19 @@ msgstr ""
 msgid "Quality value to use for JPEG compression."
 msgstr ""
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -451,11 +451,6 @@ msgstr ""
 msgid "Failed to scan"
 msgstr ""
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr ""
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -469,12 +464,7 @@ msgstr ""
 "Мавжуд буйруқлар ва мосламаларнинг тўлиқ рўйхатини кўриш учун '%s --help''ни "
 "ишга туширинг."
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr ""
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr ""
 
@@ -494,8 +484,18 @@ msgstr ""
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr ""
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr ""
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr ""
 
@@ -507,6 +507,11 @@ msgstr ""
 msgid "_Save"
 msgstr ""
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr ""
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -517,11 +522,6 @@ msgstr ""
 msgid "All Files"
 msgstr "Hamma fayllar"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr ""
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -537,6 +537,11 @@ msgstr ""
 msgid "PNG (lossless)"
 msgstr ""
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr ""
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -635,97 +640,180 @@ msgstr ""
 msgid "Quit without Saving"
 msgstr "Saqlamasdan chiqib ketish"
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr ""
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr ""
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr ""
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (default)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "_Skaner almashrirish"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "Avtomatik"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/vi.po b/po/vi.po
index 4ee87df..4765934 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2012-07-23 09:09+0000\n"
 "Last-Translator: Robert Ancell <robert.ancell@canonical.com>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "Ảnh chụp"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr ""
 
@@ -206,7 +206,7 @@ msgstr ""
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr ""
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "Tùy thích"
 
@@ -304,19 +304,6 @@ msgstr ""
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr ""
@@ -414,6 +401,19 @@ msgstr "Xác định chất lượng khi nén ảnh dạng JPEG"
 msgid "Quality value to use for JPEG compression."
 msgstr "Xác định chất lượng khi nén ảnh dạng JPEG."
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -454,11 +454,6 @@ msgstr ""
 msgid "Failed to scan"
 msgstr "Quét hình thất bại"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr ""
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -471,12 +466,7 @@ 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."
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "Tài liệu quét.pdf"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr ""
 
@@ -496,8 +486,18 @@ msgstr "Không phát hiện máy quét hình nào hết"
 msgid "Please check your scanner is connected and powered on"
 msgstr "Vui lòng kiểm tra đã cắm và bật máy quét hình chưa"
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr ""
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr ""
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "Lưu thành..."
 
@@ -509,6 +509,11 @@ msgstr ""
 msgid "_Save"
 msgstr ""
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "Tài liệu quét.pdf"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -519,11 +524,6 @@ msgstr ""
 msgid "All Files"
 msgstr ""
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr ""
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -539,6 +539,11 @@ msgstr ""
 msgid "PNG (lossless)"
 msgstr ""
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr ""
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -651,97 +656,180 @@ msgstr ""
 msgid "Quit without Saving"
 msgstr ""
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr ""
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr ""
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr ""
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr ""
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr "Tối hơn"
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a28c2fb..2ec7b10 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2012-09-20 08:05+0000\n"
 "Last-Translator: Dennis Kuang <Unknown>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "照片"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr ""
 
@@ -206,7 +206,7 @@ msgstr "扫描"
 msgid "Save document to a file"
 msgstr "将文档保存为文件"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "保存"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "剪裁"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "首选项"
 
@@ -304,19 +304,6 @@ msgstr "扫描文档"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "扫描设备"
@@ -412,6 +399,19 @@ msgstr "JPEG 压缩质量"
 msgid "Quality value to use for JPEG compression."
 msgstr "JPEG 压缩质量"
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -451,11 +451,6 @@ msgstr "修复旧版扫描易生成的 PDF 文件"
 msgid "Failed to scan"
 msgstr "扫描失败"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "扫描的文档"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -467,12 +462,7 @@ msgstr "[设备...] - 扫描工具"
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "运行“%s --help”来查看可用命令行选项的完整列表。"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "扫描的文件.pdf"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr "关闭(_C)"
 
@@ -492,8 +482,18 @@ msgstr "没有发现扫描仪"
 msgid "Please check your scanner is connected and powered on"
 msgstr "请检查您的扫描仪已经连接并且打开"
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr ""
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr ""
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "保存为..."
 
@@ -505,6 +505,11 @@ msgstr "取消(_C)"
 msgid "_Save"
 msgstr "保存(_S)"
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "扫描的文件.pdf"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -515,11 +520,6 @@ msgstr "图像文件"
 msgid "All Files"
 msgstr "所有文件"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr "选择文件类型(_T)"
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -535,6 +535,11 @@ msgstr "JPEG (压缩)"
 msgid "PNG (lossless)"
 msgstr "PNG (无损)"
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr ""
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -656,97 +661,180 @@ msgstr "退出前保存文档？"
 msgid "Quit without Saving"
 msgstr "退出且不保存"
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr ""
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr ""
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr ""
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (默认)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (草稿)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (高分辨率)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "更换扫描仪(_S)"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "自动"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr "较深"
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr "稍浅"
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr "较少"
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr "更多"
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr "最小值"
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr "最大值"
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr "正在保存文档..."
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "正在保存 %d/%d 页"
@@ -821,6 +909,9 @@ msgstr "正在保存 %d/%d 页"
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "TRUE 如果应用程序窗口是最大化的"
 
+#~ msgid "Select File _Type"
+#~ msgstr "选择文件类型(_T)"
+
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "上次扫描图片的分辨率 (点/英寸)。"
 
@@ -849,6 +940,9 @@ msgstr "正在保存 %d/%d 页"
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "所扫描图像的宽度 (以像素计)。"
 
+#~ msgid "Scanned Document"
+#~ msgstr "扫描的文档"
+
 #~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr "扫描纸张的哪面。可以是以下值：“正面” “背面” “均扫描”"
diff --git a/po/zh_HK.po b/po/zh_HK.po
new file mode 100644
index 0000000..7b970f5
--- /dev/null
+++ b/po/zh_HK.po
@@ -0,0 +1,839 @@
+# Chinese (Hong Kong) translation for simple-scan
+# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
+# This file is distributed under the same license as the simple-scan package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: simple-scan\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
+"PO-Revision-Date: 2015-10-03 17:18+0000\n"
+"Last-Translator: Roy Chan <roy.chan@linux.org.hk>\n"
+"Language-Team: Chinese (Hong Kong) <zh_HK@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: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "授權(_A)"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "資源的使用者名稱(_U)："
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "密碼(_P)："
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:8
+msgid "Front and Back"
+msgstr "正面與背面"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:10
+msgid "Front"
+msgstr "正面"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Back"
+msgstr "背面"
+
+#. Title of scan window
+#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+msgid "Simple Scan"
+msgstr "簡易掃描"
+
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: ../data/simple-scan.ui.h:16
+msgid "_Document"
+msgstr "文件(_D)"
+
+#. Scan menu item
+#: ../data/simple-scan.ui.h:18
+msgid "Sc_an"
+msgstr "掃描(_A)"
+
+#. Toolbar scan menu item to scan a single page from the scanner
+#: ../data/simple-scan.ui.h:20
+msgid "Single _Page"
+msgstr "單一頁面(_P)"
+
+#. Toolbar scan menu item to scan all pages from a document feeder
+#: ../data/simple-scan.ui.h:22
+msgid "All Pages From _Feeder"
+msgstr "來自進紙匣的所有頁面(_F)"
+
+#. Menu entry to stop current scan
+#: ../data/simple-scan.ui.h:24
+msgid "_Stop Scan"
+msgstr "停止掃描(_S)"
+
+#: ../data/simple-scan.ui.h:25
+msgid "Text"
+msgstr "文字"
+
+#: ../data/simple-scan.ui.h:26
+msgid "Photo"
+msgstr "相片"
+
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
+msgid "Reorder Pages"
+msgstr "重新排列頁面"
+
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:30
+msgid "_Email"
+msgstr "電子郵件(_E)"
+
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:32
+msgid "_Page"
+msgstr "頁面(_P)"
+
+#. Menu item to rotate page to left (anti-clockwise)
+#: ../data/simple-scan.ui.h:34
+msgid "Rotate _Left"
+msgstr "向左旋轉(_L)"
+
+#. Menu item to rotate page to right (clockwise)
+#: ../data/simple-scan.ui.h:36
+msgid "Rotate _Right"
+msgstr "向右旋轉(_R)"
+
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:38
+msgid "_Crop"
+msgstr "裁切(_C)"
+
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:40
+msgid "_None"
+msgstr "無(_N)"
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:42
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:44
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:46
+msgid "A_6"
+msgstr "A_6"
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:48
+msgid "_Letter"
+msgstr "美規信紙(_Letter)"
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:50
+msgid "Le_gal"
+msgstr "美規長信紙(Le_gal)"
+
+#. Radio button for cropping page to 4x6 inch
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr "4×6"
+
+#. Radio button for cropping to custom page size
+#: ../data/simple-scan.ui.h:54
+msgid "_Custom"
+msgstr "自訂(_C)"
+
+#. Menu item to rotate the crop area
+#: ../data/simple-scan.ui.h:56
+msgid "_Rotate Crop"
+msgstr "旋轉裁切區域(_R)"
+
+#. Menu item to move the selected page to the left
+#: ../data/simple-scan.ui.h:58
+msgid "Move Left"
+msgstr "左移"
+
+#. Menu item to move the selected page to the right
+#: ../data/simple-scan.ui.h:60
+msgid "Move Right"
+msgstr "右移"
+
+#. Label on help menu
+#: ../data/simple-scan.ui.h:62
+msgid "_Help"
+msgstr "求助(_H)"
+
+#. Help|Contents menu
+#: ../data/simple-scan.ui.h:64
+msgid "_Contents"
+msgstr "內容(_C)"
+
+#. Tooltip for new document button
+#: ../data/simple-scan.ui.h:66
+msgid "Start a new document"
+msgstr "起始一份新文件"
+
+#: ../data/simple-scan.ui.h:67
+msgid "New"
+msgstr "新增"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:69
+msgid "Scan a single page from the scanner"
+msgstr "從掃描器掃描單一頁面"
+
+#. Label on scan toolbar item
+#: ../data/simple-scan.ui.h:71
+msgid "Scan"
+msgstr "掃描"
+
+#. Tooltip for save toolbar button
+#: ../data/simple-scan.ui.h:73
+msgid "Save document to a file"
+msgstr "將文件儲存到檔案"
+
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
+msgid "Save"
+msgstr "儲存"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:76
+msgid "Stop the current scan"
+msgstr "停止目前的掃描"
+
+#: ../data/simple-scan.ui.h:77
+msgid "Stop"
+msgstr "停止"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: ../data/simple-scan.ui.h:79
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "將頁面向左旋轉 (逆時針方向)"
+
+#. Label on rotate page left (anti-clockwise) item
+#: ../data/simple-scan.ui.h:81
+msgid "Rotate Left"
+msgstr "向左旋轉"
+
+#. Tooltip for rotate right (clockwise) button
+#: ../data/simple-scan.ui.h:83
+msgid "Rotate the page to the right (clockwise)"
+msgstr "將頁面向右旋轉 (順時針方向)"
+
+#. Label on rotate page right (clockwise) item
+#: ../data/simple-scan.ui.h:85
+msgid "Rotate Right"
+msgstr "向右旋轉"
+
+#: ../data/simple-scan.ui.h:86
+msgid "Crop the selected page"
+msgstr "裁切所選的頁面"
+
+#: ../data/simple-scan.ui.h:87
+msgid "Crop"
+msgstr "裁切"
+
+#. Title of preferences dialog
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
+msgid "Preferences"
+msgstr "偏好設定"
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:91
+msgid "Scan S_ource:"
+msgstr "掃描來源(_O)："
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:93
+msgid "_Text Resolution:"
+msgstr "文字解像度(_T)："
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:95
+msgid "_Photo Resolution:"
+msgstr "相片解像度(_P)："
+
+#. Label beside scan side combo box
+#: ../data/simple-scan.ui.h:97
+msgid "Scan Side:"
+msgstr "掃描面："
+
+#. Label beside page size combo box
+#: ../data/simple-scan.ui.h:99
+msgid "Page Size:"
+msgstr ""
+
+#. Label beside brightness scale
+#: ../data/simple-scan.ui.h:101
+msgid "Brightness:"
+msgstr "亮度："
+
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:103
+msgid "Contrast:"
+msgstr "對比度："
+
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:105
+msgid "Quality:"
+msgstr "品質："
+
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr "文件掃描器"
+
+#: ../data/simple-scan.desktop.in.h:3
+msgid "Scan Documents"
+msgstr "掃描文件"
+
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr "scan;scanner;flatbed;adf;"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Device to scan from"
+msgstr "要從哪個裝置掃描"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "SANE device to acquire images from."
+msgstr "取得影像用的 SANE 裝置。"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "Type of document being scanned"
+msgstr "掃描中文件的類型"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr "掃描中文件的類型。這個設定值決定掃描的解像度、色彩和後製處理。"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+msgid "Width of paper in tenths of a mm"
+msgstr "以 10 mm 為單位的紙張寬度"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr "以 10 mm 為單位的紙張寬度 (或 0 以作為自動紙張偵測)。"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+msgid "Height of paper in tenths of a mm"
+msgstr "以 10 mm 為單位的紙張高度"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr "以 10 mm 為單位的紙張高度 (或 0 以作為自動紙張偵測)。"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "Brightness of scan"
+msgstr "掃描亮度"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "調整亮度，由 -100 至 100 (0 代表無)。"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
+msgid "Contrast of scan"
+msgstr "掃描對比度"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "調整對比度，由 -100 至 100 (0 代表無)。"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
+msgid "Resolution for text scans"
+msgstr "文字掃描的解像度"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "當掃描文字時使用的解像度，單位為 dpi。"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+msgid "Resolution for photo scans"
+msgstr "相片掃描的解像度"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "當掃描相片時使用的解像度，單位為 dpi。"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+msgid "Page side to scan"
+msgstr "要掃描的頁面"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "The page side to scan."
+msgstr "要掃描的頁面。"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "Directory to save files to"
+msgstr "儲存檔案的目錄"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr "儲存檔案到何目錄。如果沒有預設值的話，設值會是「文件」目錄。"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "Quality value to use for JPEG compression"
+msgstr "JPEG 壓縮品質值"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Quality value to use for JPEG compression."
+msgstr "JPEG 壓縮品質值。"
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"你能輕易地掃描文件和相片。你可以裁剪相片的不良部分並將之旋轉至正確角度。你可以列印你的掃描檔，將掃描檔匯出成 pdf，或儲存為多種圖像檔案格式。"
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr "簡易掃描使用 SANE 框架以支援大部分現存掃描器。"
+
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:840
+msgid "No scanners available.  Please connect a scanner."
+msgstr "沒有可用的掃描器。請連接一部掃描器。"
+
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:870
+msgid "Unable to connect to scanner"
+msgstr "無法連接到掃描器"
+
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1222
+msgid "Unable to start scan"
+msgstr "無法起始掃描"
+
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1235 ../src/scanner.vala:1332
+msgid "Error communicating with scanner"
+msgstr "與掃描器溝通時發生錯誤"
+
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "顯示發行版本"
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "打印除錯訊息"
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr "修正由舊版本簡易掃描產生的 PDF 檔案"
+
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
+msgid "Failed to scan"
+msgstr "掃描失敗"
+
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
+msgid "[DEVICE...] - Scanning utility"
+msgstr "[裝置...] - 掃描公用程式"
+
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:632
+#, c-format
+msgid "Run '%s --help' to see a full list of available command line options."
+msgstr "執行「%s --help」來查看所有命令列可用選項的完整清單。"
+
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
+msgid "_Close"
+msgstr "關閉(_C)"
+
+#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
+#: ../src/ui.vala:326
+#, c-format
+msgid "Username and password required to access '%s'"
+msgstr ""
+
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:374
+msgid "No scanners detected"
+msgstr "未偵測到掃描器"
+
+#. Hint to user on why there are no scanners detected
+#: ../src/ui.vala:376
+msgid "Please check your scanner is connected and powered on"
+msgstr "請檢查並確認你的掃描器已連接，並已開啟電源"
+
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr "需要額外軟件"
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr "你需要為你的掃描器安裝驅動程式。"
+
+#. Save dialog: Dialog title
+#: ../src/ui.vala:505 ../src/ui.vala:1834
+msgid "Save As..."
+msgstr "另存為..."
+
+#: ../src/ui.vala:508 ../src/ui.vala:674
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#: ../src/ui.vala:509 ../src/ui.vala:675
+msgid "_Save"
+msgstr "儲存(_S)"
+
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "已掃描的文件.pdf"
+
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:520
+msgid "Image Files"
+msgstr "影像檔案"
+
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:526
+msgid "All Files"
+msgstr "所有檔案"
+
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:535
+msgid "PDF (multi-page document)"
+msgstr "PDF (多頁文件)"
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:541
+msgid "JPEG (compressed)"
+msgstr "JPEG (壓縮)"
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:547
+msgid "PNG (lossless)"
+msgstr "PNG (無損)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr "檔案格式："
+
+#. Title of error dialog when save failed
+#: ../src/ui.vala:649
+msgid "Failed to save file"
+msgstr ""
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:672
+msgid "If you don't save, changes will be permanently lost."
+msgstr "如果不儲存，變更將會永久消失。"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:707
+msgid "Save current document?"
+msgstr "是否儲存至目前文件？"
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:709
+msgid "Discard Changes"
+msgstr "放棄變更"
+
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:991
+msgid "Unable to save image for preview"
+msgstr "無法儲存影像以供預覽"
+
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1003
+msgid "Unable to open image preview application"
+msgstr "無法開啟影像預覽應用程式"
+
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1205
+msgid "Combine sides"
+msgstr "合併邊緣"
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1215
+msgid "Combine sides (reverse)"
+msgstr "合併邊緣 (反轉)"
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1225
+msgid "Reverse"
+msgstr "反轉"
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1235
+msgid "Keep unchanged"
+msgstr "維持不變"
+
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1450
+msgid "Unable to open help file"
+msgstr "無法開啟求助檔案。"
+
+#. The license this software is under (GPL3+)
+#: ../src/ui.vala:1471
+msgid ""
+"This program is free software: you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation, either version 3 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program.  If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+"本程式為自由軟件；你可根據自由軟件基金會所發表的GNU通用公共授權條款，對本程式再次發佈和/或修改；無論你根據的是本授權的第三版，或（你可選的）任一日後發"
+"行的版本。\n"
+"\n"
+"本程式是基於使用目的而加以發佈，然而不負任何擔保責任；亦無對適售性或特定目的適用性所為的默示性擔保。詳情請參照GNU通用公共授權。\n"
+"\n"
+"你應已收到附隨於本程式的GNU通用公共授權的副本；如果沒有，請參照 <http://www.gnu.org/licenses/>。"
+
+#. Title of about dialog
+#: ../src/ui.vala:1474
+msgid "About Simple Scan"
+msgstr "關於簡易掃描"
+
+#. Description of program
+#: ../src/ui.vala:1477
+msgid "Simple document scanning tool"
+msgstr "簡易文件掃描工具"
+
+#: ../src/ui.vala:1486
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Johnny Tong https://launchpad.net/~boredscripter\n"
+"  Roy Chan https://launchpad.net/~roy-chan-linux\n"
+"  Walter Cheuk https://launchpad.net/~wwycheuk\n"
+"  tomoe_musashi https://launchpad.net/~musashi"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1508
+msgid "Save document before quitting?"
+msgstr "在結束前要儲存文件嗎？"
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1510
+msgid "Quit without Saving"
+msgstr "直接退出而不儲存"
+
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr "你似乎有一部 Brother 掃描器。"
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+"你可以在這裏找到這部掃描器的驅動程式：<a href=\"http://support.brother.com\">Brother 網站</a>。"
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr "你似乎有一部 Samsung 掃描器。"
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+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>。"
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr "你似乎有一部 HP 掃描器。"
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr "你似乎有一部 Epson 掃描器。"
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+"你可以在這裏找到這部掃描器的驅動程式：<a href=\"http://support.epsom.com\">Epson 網站</a>。"
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr "安裝驅動程式"
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr "一旦安裝，你將需要重新啟動簡易掃描。"
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr "正在安裝驅動程式..."
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr "成功安裝驅動程式！"
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr "驅動程式安裝失敗 (錯誤碼 %d)。"
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr "驅動程式安裝失敗。"
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr "你需要安裝 %s 套件。"
+
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1775
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (預設)"
+
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1778
+#, c-format
+msgid "%d dpi (draft)"
+msgstr "%d dpi (草稿)"
+
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1781
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr "%d dpi (高解像度)"
+
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1784
+#, c-format
+msgid "%d dpi"
+msgstr "%d dpi"
+
+#: ../src/ui.vala:1826
+msgid "New Document"
+msgstr "新文件"
+
+#: ../src/ui.vala:1831
+msgid "Document"
+msgstr "文件"
+
+#: ../src/ui.vala:1835
+msgid "Email..."
+msgstr "電子郵件..."
+
+#: ../src/ui.vala:1836
+msgid "Print..."
+msgstr "列印..."
+
+#: ../src/ui.vala:1844
+msgid "Help"
+msgstr "協助"
+
+#: ../src/ui.vala:1845
+msgid "About"
+msgstr "關於"
+
+#: ../src/ui.vala:1846
+msgid "Quit"
+msgstr "退出"
+
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1880
+msgid "Change _Scanner"
+msgstr "變更掃描器(_S)"
+
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr "安裝驅動程式(_I)"
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
+msgid "Automatic"
+msgstr "自動"
+
+#: ../src/ui.vala:1938
+msgid "Darker"
+msgstr "較暗"
+
+#: ../src/ui.vala:1940
+msgid "Lighter"
+msgstr "較光"
+
+#: ../src/ui.vala:1948
+msgid "Less"
+msgstr "少"
+
+#: ../src/ui.vala:1950
+msgid "More"
+msgstr "多"
+
+#: ../src/ui.vala:1958
+msgid "Minimum"
+msgstr "最小"
+
+#: ../src/ui.vala:1960
+msgid "Maximum"
+msgstr "最大"
+
+#: ../src/ui.vala:1994
+msgid "Saving document..."
+msgstr "儲存文件中..."
+
+#: ../src/ui.vala:2157
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr "正在儲存 %d / %d"
+
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "掃描器跨越掃描頁面的方向。"
+
+#~ msgid "Resolution of last scanned image"
+#~ msgstr "上次掃描影像的解像度"
+
+#~ msgid "The resolution in dots-per-inch of the previously scanned image."
+#~ msgstr "之前掃描影像的解像度，單位為 dpi。"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 243ef9c..9d9c59a 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-09-29 11:41+1300\n"
 "PO-Revision-Date: 2012-10-25 09:21+0000\n"
 "Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
+"X-Generator: Launchpad (build 17812)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,7 +88,7 @@ msgstr "相片"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr "重新排列頁面"
 
@@ -206,7 +206,7 @@ msgstr "掃描"
 msgid "Save document to a file"
 msgstr "將文件儲存至檔案"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr "儲存"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "裁切"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr "偏好設定"
 
@@ -304,19 +304,6 @@ msgstr "掃描文件"
 msgid "scan;scanner;flatbed;adf;"
 msgstr "scan;scanner;flatbed;adf;"
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "要從哪個裝置掃描"
@@ -412,6 +399,20 @@ msgstr "JPEG 壓縮品質"
 msgid "Quality value to use for JPEG compression."
 msgstr "JPEG 壓縮品質。"
 
+#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"您能輕易地掃描文件和相片。您可以裁剪相片的不良部分並將之旋轉至正確角度。您可以列印您的掃描檔，將掃描檔匯出成 pdf，或儲存為多種圖像檔案格式。"
+
+#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr "簡易掃描使用 SANE 框架以支援大部分現存掃描器。"
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -451,11 +452,6 @@ msgstr "修正由舊版本「簡易掃描」產生的 PDF 檔案"
 msgid "Failed to scan"
 msgstr "掃描失敗"
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr "掃描的文件"
-
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
@@ -467,12 +463,7 @@ msgstr "[裝置...] - 掃描公用程式"
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "執行「%s --help」來查看所有命令列可用選項的完整清單。"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:515
-msgid "Scanned Document.pdf"
-msgstr "掃描的文件.pdf"
-
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr "關閉(_C)"
 
@@ -492,8 +483,18 @@ msgstr "沒有偵測到掃描器"
 msgid "Please check your scanner is connected and powered on"
 msgstr "請檢查您的掃描器是否連接，並且是否開啟電源"
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr "需要額外軟體"
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr "您需要為您的掃描器安裝驅動程式。"
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1828
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr "另存為..."
 
@@ -505,6 +506,11 @@ msgstr "取消(_C)"
 msgid "_Save"
 msgstr "儲存(_S)"
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr "掃描的文件.pdf"
+
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:520
 msgid "Image Files"
@@ -515,11 +521,6 @@ msgstr "影像檔"
 msgid "All Files"
 msgstr "所有檔案"
 
-#. 
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr "選取檔案類型(_T)"
-
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
@@ -535,6 +536,11 @@ msgstr "JPEG (壓縮)"
 msgid "PNG (lossless)"
 msgstr "PNG (無損)"
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr "檔案格式："
+
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
 msgid "Failed to save file"
@@ -646,97 +652,183 @@ msgstr "在結束前要儲存文件嗎？"
 msgid "Quit without Saving"
 msgstr "直接退出而不儲存"
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr "您似乎有一台 Brother 掃描器。"
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+"您可以在這裡找到這台掃描器的驅動程式：<a href=\"http://support.brother.com\">Brother 網站</a>。"
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr "您似乎有一台 Samsung 掃描器。"
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+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>。"
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr "您似乎有一台 HP 掃描器。"
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr "您似乎有一台 Epson 掃描器。"
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epsom.com\">Epson website</a>."
+msgstr ""
+"您可以在這裡找到這台掃描器的驅動程式：<a href=\"http://support.epsom.com\">Epson 網站</a>。"
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr "安裝驅動程式"
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr "一旦安裝，您將需要重新啟動簡易掃描。"
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr "正在安裝驅動程式..."
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr "成功安裝驅動程式！"
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr "驅動程式安裝失敗 (錯誤碼 %d)。"
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr "驅動程式安裝失敗。"
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1769
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (預設)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1772
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (草稿)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (高解析度)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1820
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr "新文件"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr "文件"
 
-#: ../src/ui.vala:1829
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr "電子郵件..."
 
-#: ../src/ui.vala:1830
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr "列印..."
 
-#: ../src/ui.vala:1838
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr "求助"
 
-#: ../src/ui.vala:1839
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr "關於"
 
-#: ../src/ui.vala:1840
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr "結束"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1874
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr "變更掃描器(_S)"
 
-#. Combo box value for automatic paper size
+#. Button in error infobar to prompt user to install drivers
 #: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr "安裝驅動程式(_I)"
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr "自動"
 
-#: ../src/ui.vala:1932
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr "較深"
 
-#: ../src/ui.vala:1934
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr "較淺"
 
-#: ../src/ui.vala:1942
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr "少"
 
-#: ../src/ui.vala:1944
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr "多"
 
-#: ../src/ui.vala:1952
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr "最小"
 
-#: ../src/ui.vala:1954
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr "最大"
 
-#: ../src/ui.vala:1988
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr "正在儲存文件..."
 
-#: ../src/ui.vala:2151
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "正在儲存 %2$d 頁中的第 %1$d 頁"
@@ -756,6 +848,12 @@ msgstr "正在儲存 %2$d 頁中的第 %1$d 頁"
 #~ msgid "Window width in pixels"
 #~ msgstr "視窗寬度，單位為像素"
 
+#~ msgid "Scanned Document"
+#~ msgstr "掃描的文件"
+
+#~ msgid "Select File _Type"
+#~ msgstr "選取檔案類型(_T)"
+
 #~ msgid "Please check your installation"
 #~ msgstr "請檢查您的安裝是否完整"
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 8bfb480..569f739 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -33,10 +33,15 @@ if HAVE_COLORD
 simple_scan_VALAFLAGS += -D HAVE_COLORD
 endif
 
+if HAVE_PACKAGEKIT
+simple_scan_VALAFLAGS += -D HAVE_PACKAGEKIT
+endif
+
 simple_scan_CFLAGS = \
 	-w \
 	$(SIMPLE_SCAN_CFLAGS) \
 	$(COLORD_CFLAGS) \
+	$(PACKAGEKIT_CFLAGS) \    
 	$(WARN_CFLAGS) \
 	-DVERSION=\"$(VERSION)\" \
 	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
@@ -50,6 +55,7 @@ simple_scan_CFLAGS = \
 simple_scan_LDADD = \
 	$(SIMPLE_SCAN_LIBS) \
 	$(COLORD_LIBS) \
+	$(PACKAGEKIT_LIBS) \    
 	-lsane \
 	-lm
 
diff --git a/src/Makefile.in b/src/Makefile.in
index f8e3ab5..cf77ad8 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -88,6 +88,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 bin_PROGRAMS = simple-scan$(EXEEXT)
 @HAVE_COLORD_TRUE@am__append_1 = -D HAVE_COLORD
+@HAVE_PACKAGEKIT_TRUE@am__append_2 = -D HAVE_PACKAGEKIT
 subdir = src
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gsettings.m4 \
@@ -111,7 +112,8 @@ am_simple_scan_OBJECTS = simple_scan-book.$(OBJEXT) \
 	simple_scan-resources.$(OBJEXT)
 simple_scan_OBJECTS = $(am_simple_scan_OBJECTS)
 am__DEPENDENCIES_1 =
-simple_scan_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+simple_scan_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 simple_scan_LINK = $(CCLD) $(simple_scan_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_P = $(am__v_P_@AM_V@)
@@ -238,6 +240,8 @@ MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
+PACKAGEKIT_CFLAGS = @PACKAGEKIT_CFLAGS@
+PACKAGEKIT_LIBS = @PACKAGEKIT_LIBS@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
@@ -324,11 +328,12 @@ simple_scan_SOURCES = \
 simple_scan_VALAFLAGS = --pkg=posix --pkg=zlib --pkg=gusb \
 	--pkg=gio-2.0 --pkg=gtk+-3.0 \
 	--gresources=$(top_srcdir)/data/simple-scan.gresource.xml \
-	--debug --target-glib 2.38 $(am__append_1)
+	--debug --target-glib 2.38 $(am__append_1) $(am__append_2)
 simple_scan_CFLAGS = \
 	-w \
 	$(SIMPLE_SCAN_CFLAGS) \
 	$(COLORD_CFLAGS) \
+	$(PACKAGEKIT_CFLAGS) \
 	$(WARN_CFLAGS) \
 	-DVERSION=\"$(VERSION)\" \
 	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
@@ -342,6 +347,7 @@ simple_scan_CFLAGS = \
 simple_scan_LDADD = \
 	$(SIMPLE_SCAN_LIBS) \
 	$(COLORD_LIBS) \
+	$(PACKAGEKIT_LIBS) \
 	-lsane \
 	-lm
 
diff --git a/src/autosave-manager.c b/src/autosave-manager.c
index 2536d49..6542f8c 100644
--- a/src/autosave-manager.c
+++ b/src/autosave-manager.c
@@ -277,11 +277,11 @@ void autosave_manager_load (AutosaveManager* self) {
 #line 72 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 280 "autosave-manager.c"
-			goto __catch29_g_error;
+			goto __catch28_g_error;
 		}
 	}
-	goto __finally29;
-	__catch29_g_error:
+	goto __finally28;
+	__catch28_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp6_ = NULL;
@@ -313,7 +313,7 @@ void autosave_manager_load (AutosaveManager* self) {
 		return;
 #line 314 "autosave-manager.c"
 	}
-	__finally29:
+	__finally28:
 #line 70 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 70 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
@@ -721,11 +721,11 @@ void autosave_manager_load (AutosaveManager* self) {
 #line 128 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 723 "autosave-manager.c"
-							goto __catch30_g_error;
+							goto __catch29_g_error;
 						}
 					}
-					goto __finally30;
-					__catch30_g_error:
+					goto __finally29;
+					__catch29_g_error:
 					{
 						GError* e = NULL;
 #line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
@@ -756,7 +756,7 @@ void autosave_manager_load (AutosaveManager* self) {
 						continue;
 #line 757 "autosave-manager.c"
 					}
-					__finally30:
+					__finally29:
 #line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
@@ -914,7 +914,7 @@ static gchar* autosave_manager_get_value (AutosaveManager* self, GKeyFile* file,
 #line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 916 "autosave-manager.c"
-			goto __catch31_g_error;
+			goto __catch30_g_error;
 		}
 #line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp5_ = _tmp0_;
@@ -928,8 +928,8 @@ static gchar* autosave_manager_get_value (AutosaveManager* self, GKeyFile* file,
 		return result;
 #line 929 "autosave-manager.c"
 	}
-	goto __finally31;
-	__catch31_g_error:
+	goto __finally30;
+	__catch30_g_error:
 	{
 		GError* e = NULL;
 		const gchar* _tmp6_ = NULL;
@@ -950,7 +950,7 @@ static gchar* autosave_manager_get_value (AutosaveManager* self, GKeyFile* file,
 		return result;
 #line 951 "autosave-manager.c"
 	}
-	__finally31:
+	__finally30:
 #line 159 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 159 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
@@ -992,7 +992,7 @@ static gint autosave_manager_get_integer (AutosaveManager* self, GKeyFile* file,
 #line 173 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 994 "autosave-manager.c"
-			goto __catch32_g_error;
+			goto __catch31_g_error;
 		}
 #line 173 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		result = _tmp0_;
@@ -1000,8 +1000,8 @@ static gint autosave_manager_get_integer (AutosaveManager* self, GKeyFile* file,
 		return result;
 #line 1001 "autosave-manager.c"
 	}
-	goto __finally32;
-	__catch32_g_error:
+	goto __finally31;
+	__catch31_g_error:
 	{
 		GError* e = NULL;
 		gint _tmp5_ = 0;
@@ -1019,7 +1019,7 @@ static gint autosave_manager_get_integer (AutosaveManager* self, GKeyFile* file,
 		return result;
 #line 1020 "autosave-manager.c"
 	}
-	__finally32:
+	__finally31:
 #line 171 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 171 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
@@ -1061,7 +1061,7 @@ static gboolean autosave_manager_get_boolean (AutosaveManager* self, GKeyFile* f
 #line 185 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1063 "autosave-manager.c"
-			goto __catch33_g_error;
+			goto __catch32_g_error;
 		}
 #line 185 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		result = _tmp0_;
@@ -1069,8 +1069,8 @@ static gboolean autosave_manager_get_boolean (AutosaveManager* self, GKeyFile* f
 		return result;
 #line 1070 "autosave-manager.c"
 	}
-	goto __finally33;
-	__catch33_g_error:
+	goto __finally32;
+	__catch32_g_error:
 	{
 		GError* e = NULL;
 		gboolean _tmp5_ = FALSE;
@@ -1088,7 +1088,7 @@ static gboolean autosave_manager_get_boolean (AutosaveManager* self, GKeyFile* f
 		return result;
 #line 1089 "autosave-manager.c"
 	}
-	__finally33:
+	__finally32:
 #line 183 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 183 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
@@ -1136,7 +1136,7 @@ void autosave_manager_cleanup (AutosaveManager* self) {
 #line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1138 "autosave-manager.c"
-			goto __catch34_g_error;
+			goto __catch33_g_error;
 		}
 #line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp5_ = _tmp2_;
@@ -1150,8 +1150,8 @@ void autosave_manager_cleanup (AutosaveManager* self) {
 		_g_dir_close0 (_tmp2_);
 #line 1151 "autosave-manager.c"
 	}
-	goto __finally34;
-	__catch34_g_error:
+	goto __finally33;
+	__catch33_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp6_ = NULL;
@@ -1174,7 +1174,7 @@ void autosave_manager_cleanup (AutosaveManager* self) {
 		return;
 #line 1175 "autosave-manager.c"
 	}
-	__finally34:
+	__finally33:
 #line 202 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 202 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
@@ -1990,11 +1990,11 @@ static void autosave_manager_real_save (AutosaveManager* self) {
 #line 335 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1992 "autosave-manager.c"
-			goto __catch35_g_error;
+			goto __catch34_g_error;
 		}
 	}
-	goto __finally35;
-	__catch35_g_error:
+	goto __finally34;
+	__catch34_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp116_ = NULL;
@@ -2013,7 +2013,7 @@ static void autosave_manager_real_save (AutosaveManager* self) {
 		_g_error_free0 (e);
 #line 2014 "autosave-manager.c"
 	}
-	__finally35:
+	__finally34:
 #line 332 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 332 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
@@ -2102,11 +2102,11 @@ static void autosave_manager_save_pixels (AutosaveManager* self, Page* page) {
 #line 354 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2104 "autosave-manager.c"
-			goto __catch36_g_error;
+			goto __catch35_g_error;
 		}
 	}
-	goto __finally36;
-	__catch36_g_error:
+	goto __finally35;
+	__catch35_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp14_ = NULL;
@@ -2125,7 +2125,7 @@ static void autosave_manager_save_pixels (AutosaveManager* self, Page* page) {
 		_g_error_free0 (e);
 #line 2126 "autosave-manager.c"
 	}
-	__finally36:
+	__finally35:
 #line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
diff --git a/src/scanner.c b/src/scanner.c
index 227976f..740d99f 100644
--- a/src/scanner.c
+++ b/src/scanner.c
@@ -6760,9 +6760,9 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 	SANE_Option_Descriptor* _tmp149_ = NULL;
 	SANE_Int _tmp150_ = {0};
 	SANE_Int _tmp151_ = {0};
-	const gchar* _tmp212_ = NULL;
-	SANE_Option_Descriptor* _tmp213_ = NULL;
-	const gchar* _tmp214_ = NULL;
+	const gchar* _tmp216_ = NULL;
+	SANE_Option_Descriptor* _tmp217_ = NULL;
+	const gchar* _tmp218_ = NULL;
 #line 573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
 #line 573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -7602,375 +7602,395 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 #line 673 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp151_ != ((SANE_Int) 0)) {
 #line 7598 "scanner.c"
-		const gchar* _tmp152_ = NULL;
-		gchar* _tmp153_ = NULL;
-		SANE_Int _tmp154_ = {0};
-		SANE_Int _tmp161_ = {0};
-		SANE_Int _tmp168_ = {0};
-		SANE_Int _tmp175_ = {0};
-		SANE_Int _tmp182_ = {0};
-		SANE_Int _tmp189_ = {0};
-		SANE_Int _tmp196_ = {0};
-		SANE_Int _tmp203_ = {0};
+		gchar* caps = NULL;
+		gchar* _tmp152_ = NULL;
+		SANE_Int _tmp153_ = {0};
+		SANE_Int _tmp160_ = {0};
+		SANE_Int _tmp167_ = {0};
+		SANE_Int _tmp174_ = {0};
+		SANE_Int _tmp181_ = {0};
+		SANE_Int _tmp188_ = {0};
+		SANE_Int _tmp195_ = {0};
+		SANE_Int _tmp202_ = {0};
+		const gchar* _tmp211_ = NULL;
+		const gchar* _tmp212_ = NULL;
+		gchar* _tmp213_ = NULL;
+		gchar* _tmp214_ = NULL;
+		gchar* _tmp215_ = NULL;
 #line 675 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp152_ = s;
+		_tmp152_ = g_strdup ("");
 #line 675 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp153_ = g_strconcat (_tmp152_, " cap=", NULL);
-#line 675 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_g_free0 (s);
-#line 675 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		s = _tmp153_;
+		caps = _tmp152_;
 #line 676 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp154_ = cap;
+		_tmp153_ = cap;
 #line 676 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if ((_tmp154_ & SANE_CAP_SOFT_SELECT) != ((SANE_Int) 0)) {
-#line 7621 "scanner.c"
-			const gchar* _tmp155_ = NULL;
-			const gchar* _tmp158_ = NULL;
-			gchar* _tmp159_ = NULL;
-			SANE_Int _tmp160_ = {0};
+		if ((_tmp153_ & SANE_CAP_SOFT_SELECT) != ((SANE_Int) 0)) {
+#line 7622 "scanner.c"
+			const gchar* _tmp154_ = NULL;
+			const gchar* _tmp157_ = NULL;
+			gchar* _tmp158_ = NULL;
+			SANE_Int _tmp159_ = {0};
 #line 678 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp155_ = s;
+			_tmp154_ = caps;
 #line 678 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (g_strcmp0 (_tmp155_, "") != 0) {
-#line 7630 "scanner.c"
-				const gchar* _tmp156_ = NULL;
-				gchar* _tmp157_ = NULL;
+			if (g_strcmp0 (_tmp154_, "") != 0) {
+#line 7631 "scanner.c"
+				const gchar* _tmp155_ = NULL;
+				gchar* _tmp156_ = NULL;
 #line 679 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp156_ = s;
+				_tmp155_ = caps;
 #line 679 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp157_ = g_strconcat (_tmp156_, ",", NULL);
+				_tmp156_ = g_strconcat (_tmp155_, ",", NULL);
 #line 679 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_g_free0 (s);
+				_g_free0 (caps);
 #line 679 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				s = _tmp157_;
-#line 7641 "scanner.c"
+				caps = _tmp156_;
+#line 7642 "scanner.c"
 			}
 #line 680 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp158_ = s;
+			_tmp157_ = caps;
 #line 680 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp159_ = g_strconcat (_tmp158_, "soft-select", NULL);
+			_tmp158_ = g_strconcat (_tmp157_, "soft-select", NULL);
 #line 680 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_g_free0 (s);
+			_g_free0 (caps);
 #line 680 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			s = _tmp159_;
+			caps = _tmp158_;
 #line 681 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp160_ = cap;
+			_tmp159_ = cap;
 #line 681 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			cap = _tmp160_ & (~SANE_CAP_SOFT_SELECT);
-#line 7655 "scanner.c"
+			cap = _tmp159_ & (~SANE_CAP_SOFT_SELECT);
+#line 7656 "scanner.c"
 		}
 #line 683 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp161_ = cap;
+		_tmp160_ = cap;
 #line 683 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if ((_tmp161_ & SANE_CAP_HARD_SELECT) != ((SANE_Int) 0)) {
-#line 7661 "scanner.c"
-			const gchar* _tmp162_ = NULL;
-			const gchar* _tmp165_ = NULL;
-			gchar* _tmp166_ = NULL;
-			SANE_Int _tmp167_ = {0};
+		if ((_tmp160_ & SANE_CAP_HARD_SELECT) != ((SANE_Int) 0)) {
+#line 7662 "scanner.c"
+			const gchar* _tmp161_ = NULL;
+			const gchar* _tmp164_ = NULL;
+			gchar* _tmp165_ = NULL;
+			SANE_Int _tmp166_ = {0};
 #line 685 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp162_ = s;
+			_tmp161_ = caps;
 #line 685 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (g_strcmp0 (_tmp162_, "") != 0) {
-#line 7670 "scanner.c"
-				const gchar* _tmp163_ = NULL;
-				gchar* _tmp164_ = NULL;
+			if (g_strcmp0 (_tmp161_, "") != 0) {
+#line 7671 "scanner.c"
+				const gchar* _tmp162_ = NULL;
+				gchar* _tmp163_ = NULL;
 #line 686 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp163_ = s;
+				_tmp162_ = caps;
 #line 686 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp164_ = g_strconcat (_tmp163_, ",", NULL);
+				_tmp163_ = g_strconcat (_tmp162_, ",", NULL);
 #line 686 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_g_free0 (s);
+				_g_free0 (caps);
 #line 686 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				s = _tmp164_;
-#line 7681 "scanner.c"
+				caps = _tmp163_;
+#line 7682 "scanner.c"
 			}
 #line 687 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp165_ = s;
+			_tmp164_ = caps;
 #line 687 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp166_ = g_strconcat (_tmp165_, "hard-select", NULL);
+			_tmp165_ = g_strconcat (_tmp164_, "hard-select", NULL);
 #line 687 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_g_free0 (s);
+			_g_free0 (caps);
 #line 687 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			s = _tmp166_;
+			caps = _tmp165_;
 #line 688 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp167_ = cap;
+			_tmp166_ = cap;
 #line 688 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			cap = _tmp167_ & (~SANE_CAP_HARD_SELECT);
-#line 7695 "scanner.c"
+			cap = _tmp166_ & (~SANE_CAP_HARD_SELECT);
+#line 7696 "scanner.c"
 		}
 #line 690 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp168_ = cap;
+		_tmp167_ = cap;
 #line 690 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if ((_tmp168_ & SANE_CAP_SOFT_DETECT) != ((SANE_Int) 0)) {
-#line 7701 "scanner.c"
-			const gchar* _tmp169_ = NULL;
-			const gchar* _tmp172_ = NULL;
-			gchar* _tmp173_ = NULL;
-			SANE_Int _tmp174_ = {0};
+		if ((_tmp167_ & SANE_CAP_SOFT_DETECT) != ((SANE_Int) 0)) {
+#line 7702 "scanner.c"
+			const gchar* _tmp168_ = NULL;
+			const gchar* _tmp171_ = NULL;
+			gchar* _tmp172_ = NULL;
+			SANE_Int _tmp173_ = {0};
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp169_ = s;
+			_tmp168_ = caps;
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (g_strcmp0 (_tmp169_, "") != 0) {
-#line 7710 "scanner.c"
-				const gchar* _tmp170_ = NULL;
-				gchar* _tmp171_ = NULL;
+			if (g_strcmp0 (_tmp168_, "") != 0) {
+#line 7711 "scanner.c"
+				const gchar* _tmp169_ = NULL;
+				gchar* _tmp170_ = NULL;
 #line 693 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp170_ = s;
+				_tmp169_ = caps;
 #line 693 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp171_ = g_strconcat (_tmp170_, ",", NULL);
+				_tmp170_ = g_strconcat (_tmp169_, ",", NULL);
 #line 693 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_g_free0 (s);
+				_g_free0 (caps);
 #line 693 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				s = _tmp171_;
-#line 7721 "scanner.c"
+				caps = _tmp170_;
+#line 7722 "scanner.c"
 			}
 #line 694 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp172_ = s;
+			_tmp171_ = caps;
 #line 694 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp173_ = g_strconcat (_tmp172_, "soft-detect", NULL);
+			_tmp172_ = g_strconcat (_tmp171_, "soft-detect", NULL);
 #line 694 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_g_free0 (s);
+			_g_free0 (caps);
 #line 694 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			s = _tmp173_;
+			caps = _tmp172_;
 #line 695 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp174_ = cap;
+			_tmp173_ = cap;
 #line 695 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			cap = _tmp174_ & (~SANE_CAP_SOFT_DETECT);
-#line 7735 "scanner.c"
+			cap = _tmp173_ & (~SANE_CAP_SOFT_DETECT);
+#line 7736 "scanner.c"
 		}
 #line 697 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp175_ = cap;
+		_tmp174_ = cap;
 #line 697 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if ((_tmp175_ & SANE_CAP_EMULATED) != ((SANE_Int) 0)) {
-#line 7741 "scanner.c"
-			const gchar* _tmp176_ = NULL;
-			const gchar* _tmp179_ = NULL;
-			gchar* _tmp180_ = NULL;
-			SANE_Int _tmp181_ = {0};
+		if ((_tmp174_ & SANE_CAP_EMULATED) != ((SANE_Int) 0)) {
+#line 7742 "scanner.c"
+			const gchar* _tmp175_ = NULL;
+			const gchar* _tmp178_ = NULL;
+			gchar* _tmp179_ = NULL;
+			SANE_Int _tmp180_ = {0};
 #line 699 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp176_ = s;
+			_tmp175_ = caps;
 #line 699 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (g_strcmp0 (_tmp176_, "") != 0) {
-#line 7750 "scanner.c"
-				const gchar* _tmp177_ = NULL;
-				gchar* _tmp178_ = NULL;
+			if (g_strcmp0 (_tmp175_, "") != 0) {
+#line 7751 "scanner.c"
+				const gchar* _tmp176_ = NULL;
+				gchar* _tmp177_ = NULL;
 #line 700 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp177_ = s;
+				_tmp176_ = caps;
 #line 700 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp178_ = g_strconcat (_tmp177_, ",", NULL);
+				_tmp177_ = g_strconcat (_tmp176_, ",", NULL);
 #line 700 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_g_free0 (s);
+				_g_free0 (caps);
 #line 700 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				s = _tmp178_;
-#line 7761 "scanner.c"
+				caps = _tmp177_;
+#line 7762 "scanner.c"
 			}
 #line 701 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp179_ = s;
+			_tmp178_ = caps;
 #line 701 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp180_ = g_strconcat (_tmp179_, "emulated", NULL);
+			_tmp179_ = g_strconcat (_tmp178_, "emulated", NULL);
 #line 701 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_g_free0 (s);
+			_g_free0 (caps);
 #line 701 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			s = _tmp180_;
+			caps = _tmp179_;
 #line 702 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp181_ = cap;
+			_tmp180_ = cap;
 #line 702 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			cap = _tmp181_ & (~SANE_CAP_EMULATED);
-#line 7775 "scanner.c"
+			cap = _tmp180_ & (~SANE_CAP_EMULATED);
+#line 7776 "scanner.c"
 		}
 #line 704 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp182_ = cap;
+		_tmp181_ = cap;
 #line 704 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if ((_tmp182_ & SANE_CAP_AUTOMATIC) != ((SANE_Int) 0)) {
-#line 7781 "scanner.c"
-			const gchar* _tmp183_ = NULL;
-			const gchar* _tmp186_ = NULL;
-			gchar* _tmp187_ = NULL;
-			SANE_Int _tmp188_ = {0};
+		if ((_tmp181_ & SANE_CAP_AUTOMATIC) != ((SANE_Int) 0)) {
+#line 7782 "scanner.c"
+			const gchar* _tmp182_ = NULL;
+			const gchar* _tmp185_ = NULL;
+			gchar* _tmp186_ = NULL;
+			SANE_Int _tmp187_ = {0};
 #line 706 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp183_ = s;
+			_tmp182_ = caps;
 #line 706 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (g_strcmp0 (_tmp183_, "") != 0) {
-#line 7790 "scanner.c"
-				const gchar* _tmp184_ = NULL;
-				gchar* _tmp185_ = NULL;
+			if (g_strcmp0 (_tmp182_, "") != 0) {
+#line 7791 "scanner.c"
+				const gchar* _tmp183_ = NULL;
+				gchar* _tmp184_ = NULL;
 #line 707 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp184_ = s;
+				_tmp183_ = caps;
 #line 707 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp185_ = g_strconcat (_tmp184_, ",", NULL);
+				_tmp184_ = g_strconcat (_tmp183_, ",", NULL);
 #line 707 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_g_free0 (s);
+				_g_free0 (caps);
 #line 707 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				s = _tmp185_;
-#line 7801 "scanner.c"
+				caps = _tmp184_;
+#line 7802 "scanner.c"
 			}
 #line 708 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp186_ = s;
+			_tmp185_ = caps;
 #line 708 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp187_ = g_strconcat (_tmp186_, "automatic", NULL);
+			_tmp186_ = g_strconcat (_tmp185_, "automatic", NULL);
 #line 708 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_g_free0 (s);
+			_g_free0 (caps);
 #line 708 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			s = _tmp187_;
+			caps = _tmp186_;
 #line 709 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp188_ = cap;
+			_tmp187_ = cap;
 #line 709 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			cap = _tmp188_ & (~SANE_CAP_AUTOMATIC);
-#line 7815 "scanner.c"
+			cap = _tmp187_ & (~SANE_CAP_AUTOMATIC);
+#line 7816 "scanner.c"
 		}
 #line 711 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp189_ = cap;
+		_tmp188_ = cap;
 #line 711 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if ((_tmp189_ & SANE_CAP_INACTIVE) != ((SANE_Int) 0)) {
-#line 7821 "scanner.c"
-			const gchar* _tmp190_ = NULL;
-			const gchar* _tmp193_ = NULL;
-			gchar* _tmp194_ = NULL;
-			SANE_Int _tmp195_ = {0};
+		if ((_tmp188_ & SANE_CAP_INACTIVE) != ((SANE_Int) 0)) {
+#line 7822 "scanner.c"
+			const gchar* _tmp189_ = NULL;
+			const gchar* _tmp192_ = NULL;
+			gchar* _tmp193_ = NULL;
+			SANE_Int _tmp194_ = {0};
 #line 713 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp190_ = s;
+			_tmp189_ = caps;
 #line 713 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (g_strcmp0 (_tmp190_, "") != 0) {
-#line 7830 "scanner.c"
-				const gchar* _tmp191_ = NULL;
-				gchar* _tmp192_ = NULL;
+			if (g_strcmp0 (_tmp189_, "") != 0) {
+#line 7831 "scanner.c"
+				const gchar* _tmp190_ = NULL;
+				gchar* _tmp191_ = NULL;
 #line 714 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp191_ = s;
+				_tmp190_ = caps;
 #line 714 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp192_ = g_strconcat (_tmp191_, ",", NULL);
+				_tmp191_ = g_strconcat (_tmp190_, ",", NULL);
 #line 714 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_g_free0 (s);
+				_g_free0 (caps);
 #line 714 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				s = _tmp192_;
-#line 7841 "scanner.c"
+				caps = _tmp191_;
+#line 7842 "scanner.c"
 			}
 #line 715 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp193_ = s;
+			_tmp192_ = caps;
 #line 715 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp194_ = g_strconcat (_tmp193_, "inactive", NULL);
+			_tmp193_ = g_strconcat (_tmp192_, "inactive", NULL);
 #line 715 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_g_free0 (s);
+			_g_free0 (caps);
 #line 715 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			s = _tmp194_;
+			caps = _tmp193_;
 #line 716 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp195_ = cap;
+			_tmp194_ = cap;
 #line 716 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			cap = _tmp195_ & (~SANE_CAP_INACTIVE);
-#line 7855 "scanner.c"
+			cap = _tmp194_ & (~SANE_CAP_INACTIVE);
+#line 7856 "scanner.c"
 		}
 #line 718 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp196_ = cap;
+		_tmp195_ = cap;
 #line 718 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if ((_tmp196_ & SANE_CAP_ADVANCED) != ((SANE_Int) 0)) {
-#line 7861 "scanner.c"
-			const gchar* _tmp197_ = NULL;
-			const gchar* _tmp200_ = NULL;
-			gchar* _tmp201_ = NULL;
-			SANE_Int _tmp202_ = {0};
+		if ((_tmp195_ & SANE_CAP_ADVANCED) != ((SANE_Int) 0)) {
+#line 7862 "scanner.c"
+			const gchar* _tmp196_ = NULL;
+			const gchar* _tmp199_ = NULL;
+			gchar* _tmp200_ = NULL;
+			SANE_Int _tmp201_ = {0};
 #line 720 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp197_ = s;
+			_tmp196_ = caps;
 #line 720 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (g_strcmp0 (_tmp197_, "") != 0) {
-#line 7870 "scanner.c"
-				const gchar* _tmp198_ = NULL;
-				gchar* _tmp199_ = NULL;
+			if (g_strcmp0 (_tmp196_, "") != 0) {
+#line 7871 "scanner.c"
+				const gchar* _tmp197_ = NULL;
+				gchar* _tmp198_ = NULL;
 #line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp198_ = s;
+				_tmp197_ = caps;
 #line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp199_ = g_strconcat (_tmp198_, ",", NULL);
+				_tmp198_ = g_strconcat (_tmp197_, ",", NULL);
 #line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_g_free0 (s);
+				_g_free0 (caps);
 #line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				s = _tmp199_;
-#line 7881 "scanner.c"
+				caps = _tmp198_;
+#line 7882 "scanner.c"
 			}
 #line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp200_ = s;
+			_tmp199_ = caps;
 #line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp201_ = g_strconcat (_tmp200_, "advanced", NULL);
+			_tmp200_ = g_strconcat (_tmp199_, "advanced", NULL);
 #line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_g_free0 (s);
+			_g_free0 (caps);
 #line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			s = _tmp201_;
+			caps = _tmp200_;
 #line 723 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp202_ = cap;
+			_tmp201_ = cap;
 #line 723 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			cap = _tmp202_ & (~SANE_CAP_ADVANCED);
-#line 7895 "scanner.c"
+			cap = _tmp201_ & (~SANE_CAP_ADVANCED);
+#line 7896 "scanner.c"
 		}
 #line 726 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp203_ = cap;
+		_tmp202_ = cap;
 #line 726 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp203_ != ((SANE_Int) 0)) {
-#line 7901 "scanner.c"
-			const gchar* _tmp204_ = NULL;
-			const gchar* _tmp207_ = NULL;
-			SANE_Int _tmp208_ = {0};
+		if (_tmp202_ != ((SANE_Int) 0)) {
+#line 7902 "scanner.c"
+			const gchar* _tmp203_ = NULL;
+			const gchar* _tmp206_ = NULL;
+			SANE_Int _tmp207_ = {0};
+			gchar* _tmp208_ = NULL;
 			gchar* _tmp209_ = NULL;
 			gchar* _tmp210_ = NULL;
-			gchar* _tmp211_ = NULL;
 #line 728 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp204_ = s;
+			_tmp203_ = caps;
 #line 728 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (g_strcmp0 (_tmp204_, "") != 0) {
-#line 7912 "scanner.c"
-				const gchar* _tmp205_ = NULL;
-				gchar* _tmp206_ = NULL;
+			if (g_strcmp0 (_tmp203_, "") != 0) {
+#line 7913 "scanner.c"
+				const gchar* _tmp204_ = NULL;
+				gchar* _tmp205_ = NULL;
 #line 729 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp205_ = s;
+				_tmp204_ = caps;
 #line 729 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp206_ = g_strconcat (_tmp205_, ",", NULL);
+				_tmp205_ = g_strconcat (_tmp204_, ",", NULL);
 #line 729 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_g_free0 (s);
+				_g_free0 (caps);
 #line 729 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				s = _tmp206_;
-#line 7923 "scanner.c"
+				caps = _tmp205_;
+#line 7924 "scanner.c"
 			}
 #line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp207_ = s;
+			_tmp206_ = caps;
 #line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp208_ = cap;
+			_tmp207_ = cap;
 #line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp209_ = g_strdup_printf ("%x", (guint) ((gint) _tmp208_));
+			_tmp208_ = g_strdup_printf ("%x", (guint) ((gint) _tmp207_));
 #line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp210_ = _tmp209_;
+			_tmp209_ = _tmp208_;
 #line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp211_ = g_strconcat (_tmp207_, _tmp210_, NULL);
+			_tmp210_ = g_strconcat (_tmp206_, _tmp209_, NULL);
 #line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_g_free0 (s);
+			_g_free0 (caps);
 #line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			s = _tmp211_;
+			caps = _tmp210_;
 #line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_g_free0 (_tmp210_);
-#line 7941 "scanner.c"
+			_g_free0 (_tmp209_);
+#line 7942 "scanner.c"
 		}
+#line 732 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp211_ = s;
+#line 732 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp212_ = caps;
+#line 732 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp213_ = g_strconcat (" cap=", _tmp212_, NULL);
+#line 732 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp214_ = _tmp213_;
+#line 732 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp215_ = g_strconcat (_tmp211_, _tmp214_, NULL);
+#line 732 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_g_free0 (s);
+#line 732 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		s = _tmp215_;
+#line 732 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_g_free0 (_tmp214_);
+#line 673 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_g_free0 (caps);
+#line 7962 "scanner.c"
 	}
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp212_ = s;
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:734: %s", _tmp212_);
-#line 736 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp213_ = option;
-#line 736 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp214_ = _tmp213_->desc;
-#line 736 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp214_ != NULL) {
-#line 7954 "scanner.c"
-		SANE_Option_Descriptor* _tmp215_ = NULL;
-		const gchar* _tmp216_ = NULL;
+#line 735 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp216_ = s;
+#line 735 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:735: %s", _tmp216_);
 #line 737 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp215_ = option;
+	_tmp217_ = option;
 #line 737 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp216_ = _tmp215_->desc;
+	_tmp218_ = _tmp217_->desc;
 #line 737 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_debug ("scanner.vala:737:   Description: %s", _tmp216_);
-#line 7963 "scanner.c"
+	if (_tmp218_ != NULL) {
+#line 7974 "scanner.c"
+		SANE_Option_Descriptor* _tmp219_ = NULL;
+		const gchar* _tmp220_ = NULL;
+#line 738 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp219_ = option;
+#line 738 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp220_ = _tmp219_->desc;
+#line 738 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		g_debug ("scanner.vala:738:   Description: %s", _tmp220_);
+#line 7983 "scanner.c"
 	}
 #line 573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (s);
-#line 7967 "scanner.c"
+#line 7987 "scanner.c"
 }
 
 
@@ -7983,41 +8003,41 @@ static void scanner_authorization_cb (const gchar* resource, gchar* username, in
 	Scanner* _tmp4_ = NULL;
 	GAsyncQueue* _tmp5_ = NULL;
 	gpointer _tmp6_ = NULL;
-#line 740 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 741 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (resource != NULL);
-#line 742 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 743 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = scanner_scanner_object;
-#line 742 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 743 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = resource;
-#line 742 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 743 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = notify_request_authorization_new (_tmp1_);
-#line 742 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 743 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = _tmp2_;
-#line 742 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 743 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_notify (_tmp0_, (Notify*) _tmp3_);
-#line 742 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 743 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_notify_unref0 (_tmp3_);
-#line 744 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = scanner_scanner_object;
-#line 744 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = _tmp4_->priv->authorize_queue;
-#line 744 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = g_async_queue_pop (_tmp5_);
-#line 744 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	credentials = (Credentials*) _tmp6_;
-#line 8002 "scanner.c"
+#line 8022 "scanner.c"
 	{
 		gint i = 0;
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		i = 0;
-#line 8007 "scanner.c"
+#line 8027 "scanner.c"
 		{
 			gboolean _tmp7_ = FALSE;
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp7_ = TRUE;
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			while (TRUE) {
-#line 8014 "scanner.c"
+#line 8034 "scanner.c"
 				gboolean _tmp9_ = FALSE;
 				Credentials* _tmp10_ = NULL;
 				const gchar* _tmp11_ = NULL;
@@ -8031,83 +8051,83 @@ static void scanner_authorization_cb (const gchar* resource, gchar* username, in
 				gint _tmp20_ = 0;
 				gchar _tmp21_ = '\0';
 				gchar _tmp22_ = '\0';
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!_tmp7_) {
-#line 8030 "scanner.c"
+#line 8050 "scanner.c"
 					gint _tmp8_ = 0;
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp8_ = i;
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					i = _tmp8_ + 1;
-#line 8036 "scanner.c"
+#line 8056 "scanner.c"
 				}
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp7_ = FALSE;
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp10_ = credentials;
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp11_ = _tmp10_->username;
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp12_ = i;
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp13_ = string_get (_tmp11_, (glong) _tmp12_);
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (_tmp13_ != '\0') {
-#line 8050 "scanner.c"
+#line 8070 "scanner.c"
 					gint _tmp14_ = 0;
 					gint _tmp15_ = 0;
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp14_ = i;
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp15_ = SANE_MAX_USERNAME_LEN;
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp9_ = _tmp14_ < _tmp15_;
-#line 8059 "scanner.c"
+#line 8079 "scanner.c"
 				} else {
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp9_ = FALSE;
-#line 8063 "scanner.c"
+#line 8083 "scanner.c"
 				}
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!_tmp9_) {
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 8069 "scanner.c"
+#line 8089 "scanner.c"
 				}
-#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp16_ = username;
-#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp16__length1 = username_length1;
-#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp17_ = i;
-#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp18_ = credentials;
-#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp19_ = _tmp18_->username;
-#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp20_ = i;
-#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp21_ = string_get (_tmp19_, (glong) _tmp20_);
-#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp16_[_tmp17_] = _tmp21_;
-#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp22_ = _tmp16_[_tmp17_];
-#line 8089 "scanner.c"
+#line 8109 "scanner.c"
 			}
 		}
 	}
 	{
 		gint i = 0;
-#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		i = 0;
-#line 8097 "scanner.c"
+#line 8117 "scanner.c"
 		{
 			gboolean _tmp23_ = FALSE;
-#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp23_ = TRUE;
-#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			while (TRUE) {
-#line 8104 "scanner.c"
+#line 8124 "scanner.c"
 				gboolean _tmp25_ = FALSE;
 				Credentials* _tmp26_ = NULL;
 				const gchar* _tmp27_ = NULL;
@@ -8121,81 +8141,81 @@ static void scanner_authorization_cb (const gchar* resource, gchar* username, in
 				gint _tmp36_ = 0;
 				gchar _tmp37_ = '\0';
 				gchar _tmp38_ = '\0';
-#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!_tmp23_) {
-#line 8120 "scanner.c"
+#line 8140 "scanner.c"
 					gint _tmp24_ = 0;
-#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp24_ = i;
-#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					i = _tmp24_ + 1;
-#line 8126 "scanner.c"
+#line 8146 "scanner.c"
 				}
-#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp23_ = FALSE;
-#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp26_ = credentials;
-#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp27_ = _tmp26_->password;
-#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp28_ = i;
-#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp29_ = string_get (_tmp27_, (glong) _tmp28_);
-#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (_tmp29_ != '\0') {
-#line 8140 "scanner.c"
+#line 8160 "scanner.c"
 					gint _tmp30_ = 0;
 					gint _tmp31_ = 0;
-#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp30_ = i;
-#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp31_ = SANE_MAX_USERNAME_LEN;
-#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp25_ = _tmp30_ < _tmp31_;
-#line 8149 "scanner.c"
+#line 8169 "scanner.c"
 				} else {
-#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp25_ = FALSE;
-#line 8153 "scanner.c"
+#line 8173 "scanner.c"
 				}
-#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!_tmp25_) {
-#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 8159 "scanner.c"
+#line 8179 "scanner.c"
 				}
-#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 749 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp32_ = password;
-#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 749 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp32__length1 = password_length1;
-#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 749 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp33_ = i;
-#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 749 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp34_ = credentials;
-#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 749 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp35_ = _tmp34_->password;
-#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 749 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp36_ = i;
-#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 749 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp37_ = string_get (_tmp35_, (glong) _tmp36_);
-#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 749 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp32_[_tmp33_] = _tmp37_;
-#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 749 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp38_ = _tmp32_[_tmp33_];
-#line 8179 "scanner.c"
+#line 8199 "scanner.c"
 			}
 		}
 	}
-#line 740 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 741 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_credentials_unref0 (credentials);
-#line 8185 "scanner.c"
+#line 8205 "scanner.c"
 }
 
 
 static gpointer _credentials_ref0 (gpointer self) {
-#line 756 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 757 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? credentials_ref (self) : NULL;
-#line 8192 "scanner.c"
+#line 8212 "scanner.c"
 }
 
 
@@ -8208,90 +8228,90 @@ void scanner_authorize (Scanner* self, const gchar* username, const gchar* passw
 	gchar* _tmp4_ = NULL;
 	GAsyncQueue* _tmp5_ = NULL;
 	Credentials* _tmp6_ = NULL;
-#line 751 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 752 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 751 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 752 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (username != NULL);
-#line 751 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 752 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (password != NULL);
-#line 753 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 754 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = credentials_new ();
-#line 753 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	credentials = _tmp0_;
 #line 754 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	credentials = _tmp0_;
+#line 755 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = username;
-#line 754 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 755 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 754 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 755 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (credentials->username);
-#line 754 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	credentials->username = _tmp2_;
 #line 755 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	credentials->username = _tmp2_;
+#line 756 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = password;
-#line 755 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 756 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = g_strdup (_tmp3_);
-#line 755 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 756 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (credentials->password);
-#line 755 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	credentials->password = _tmp4_;
 #line 756 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	credentials->password = _tmp4_;
+#line 757 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = self->priv->authorize_queue;
-#line 756 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 757 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = _credentials_ref0 (credentials);
-#line 756 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 757 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_async_queue_push (_tmp5_, _tmp6_);
-#line 751 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 752 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_credentials_unref0 (credentials);
-#line 8239 "scanner.c"
+#line 8259 "scanner.c"
 }
 
 
 static void scanner_close_device (Scanner* self) {
 	gboolean _tmp0_ = FALSE;
-#line 759 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 760 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 761 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 762 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->have_handle;
-#line 761 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 762 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp0_) {
-#line 8251 "scanner.c"
+#line 8271 "scanner.c"
 		SANE_Handle _tmp1_ = {0};
 		SANE_Handle _tmp2_ = {0};
-#line 763 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 764 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp1_ = self->priv->handle;
-#line 763 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		sane_cancel (_tmp1_);
 #line 764 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_debug ("scanner.vala:764: sane_cancel ()");
-#line 766 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		sane_cancel (_tmp1_);
+#line 765 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		g_debug ("scanner.vala:765: sane_cancel ()");
+#line 767 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp2_ = self->priv->handle;
-#line 766 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		sane_close (_tmp2_);
 #line 767 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_debug ("scanner.vala:767: sane_close ()");
+		sane_close (_tmp2_);
 #line 768 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		self->priv->have_handle = FALSE;
+		g_debug ("scanner.vala:768: sane_close ()");
 #line 769 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		self->priv->have_handle = FALSE;
+#line 770 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_hash_table_unref0 (self->priv->options);
-#line 769 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 770 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->options = NULL;
-#line 8272 "scanner.c"
+#line 8292 "scanner.c"
 	}
-#line 772 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 773 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->buffer = (g_free (self->priv->buffer), NULL);
-#line 772 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 773 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->buffer = NULL;
-#line 772 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 773 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->buffer_length1 = 0;
-#line 772 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->priv->_buffer_size_ = self->priv->buffer_length1;
 #line 773 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	self->priv->_buffer_size_ = self->priv->buffer_length1;
+#line 774 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	__g_list_free__scan_job_unref0_0 (self->priv->job_queue);
-#line 773 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 774 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->job_queue = NULL;
-#line 775 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 776 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_set_scanning (self, FALSE);
-#line 8288 "scanner.c"
+#line 8308 "scanner.c"
 }
 
 
@@ -8300,41 +8320,41 @@ static void scanner_fail_scan (Scanner* self, gint error_code, const gchar* erro
 	const gchar* _tmp1_ = NULL;
 	NotifyScanFailed* _tmp2_ = NULL;
 	NotifyScanFailed* _tmp3_ = NULL;
-#line 778 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 779 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 778 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 779 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (error_string != NULL);
-#line 780 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	scanner_close_device (self);
 #line 781 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->priv->state = SCAN_STATE_IDLE;
+	scanner_close_device (self);
 #line 782 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	self->priv->state = SCAN_STATE_IDLE;
+#line 783 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = error_code;
-#line 782 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 783 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = error_string;
-#line 782 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 783 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = notify_scan_failed_new (_tmp0_, _tmp1_);
-#line 782 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 783 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = _tmp2_;
-#line 782 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 783 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_notify (self, (Notify*) _tmp3_);
-#line 782 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 783 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_notify_unref0 (_tmp3_);
-#line 8317 "scanner.c"
+#line 8337 "scanner.c"
 }
 
 
 static gpointer _request_ref0 (gpointer self) {
-#line 807 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 808 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? request_ref (self) : NULL;
-#line 8324 "scanner.c"
+#line 8344 "scanner.c"
 }
 
 
 static gpointer _scan_job_ref0 (gpointer self) {
-#line 808 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 809 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? scan_job_ref (self) : NULL;
-#line 8331 "scanner.c"
+#line 8351 "scanner.c"
 }
 
 
@@ -8343,168 +8363,168 @@ static gboolean scanner_handle_requests (Scanner* self) {
 	gboolean _tmp0_ = FALSE;
 	ScanState _tmp1_ = 0;
 	gint request_count = 0;
-#line 785 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 786 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 789 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = self->priv->state;
-#line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 789 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ == SCAN_STATE_IDLE) {
-#line 8346 "scanner.c"
+#line 8366 "scanner.c"
 		gboolean _tmp2_ = FALSE;
-#line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 789 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp2_ = self->priv->need_redetect;
-#line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 789 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp2_;
-#line 8352 "scanner.c"
+#line 8372 "scanner.c"
 	} else {
-#line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 789 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = FALSE;
-#line 8356 "scanner.c"
+#line 8376 "scanner.c"
 	}
-#line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp0_) {
 #line 789 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	if (_tmp0_) {
+#line 790 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->state = SCAN_STATE_REDETECT;
-#line 8362 "scanner.c"
+#line 8382 "scanner.c"
 	}
-#line 792 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	request_count = 0;
 #line 793 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	request_count = 0;
+#line 794 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	while (TRUE) {
-#line 8368 "scanner.c"
+#line 8388 "scanner.c"
 		Request* request = NULL;
 		gboolean _tmp3_ = FALSE;
 		gboolean _tmp4_ = FALSE;
 		ScanState _tmp5_ = 0;
 		gint _tmp11_ = 0;
 		Request* _tmp12_ = NULL;
-#line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 797 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp5_ = self->priv->state;
-#line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 797 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp5_ == SCAN_STATE_IDLE) {
-#line 8379 "scanner.c"
+#line 8399 "scanner.c"
 			gint _tmp6_ = 0;
-#line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 797 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp6_ = request_count;
-#line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 797 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp4_ = _tmp6_ == 0;
-#line 8385 "scanner.c"
+#line 8405 "scanner.c"
 		} else {
-#line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 797 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp4_ = FALSE;
-#line 8389 "scanner.c"
+#line 8409 "scanner.c"
 		}
-#line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 797 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp4_) {
-#line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 797 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp3_ = TRUE;
-#line 8395 "scanner.c"
+#line 8415 "scanner.c"
 		} else {
 			GAsyncQueue* _tmp7_ = NULL;
 			gint _tmp8_ = 0;
-#line 797 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 798 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp7_ = self->priv->request_queue;
-#line 797 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 798 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp8_ = g_async_queue_length (_tmp7_);
-#line 797 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 798 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp3_ = _tmp8_ > 0;
-#line 8405 "scanner.c"
+#line 8425 "scanner.c"
 		}
-#line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 797 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp3_) {
-#line 8409 "scanner.c"
+#line 8429 "scanner.c"
 			GAsyncQueue* _tmp9_ = NULL;
 			gpointer _tmp10_ = NULL;
-#line 798 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 799 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp9_ = self->priv->request_queue;
-#line 798 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 799 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp10_ = g_async_queue_pop (_tmp9_);
-#line 798 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 799 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_request_unref0 (request);
-#line 798 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 799 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			request = (Request*) _tmp10_;
-#line 8420 "scanner.c"
+#line 8440 "scanner.c"
 		} else {
-#line 800 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 801 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = TRUE;
-#line 800 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 801 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_request_unref0 (request);
-#line 800 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 801 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 8428 "scanner.c"
+#line 8448 "scanner.c"
 		}
-#line 802 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_debug ("scanner.vala:802: Processing request");
 #line 803 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		g_debug ("scanner.vala:803: Processing request");
+#line 804 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp11_ = request_count;
-#line 803 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 804 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		request_count = _tmp11_ + 1;
-#line 805 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 806 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp12_ = request;
-#line 805 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 806 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, TYPE_REQUEST_START_SCAN)) {
-#line 8440 "scanner.c"
+#line 8460 "scanner.c"
 			RequestStartScan* r = NULL;
 			Request* _tmp13_ = NULL;
 			RequestStartScan* _tmp14_ = NULL;
 			RequestStartScan* _tmp15_ = NULL;
 			ScanJob* _tmp16_ = NULL;
 			ScanJob* _tmp17_ = NULL;
-#line 807 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 808 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp13_ = request;
-#line 807 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 808 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp14_ = _request_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_REQUEST_START_SCAN, RequestStartScan));
-#line 807 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			r = _tmp14_;
 #line 808 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			r = _tmp14_;
+#line 809 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp15_ = r;
-#line 808 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 809 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp16_ = _tmp15_->job;
-#line 808 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 809 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp17_ = _scan_job_ref0 (_tmp16_);
-#line 808 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 809 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			self->priv->job_queue = g_list_append (self->priv->job_queue, _tmp17_);
-#line 805 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 806 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_request_unref0 (r);
-#line 8463 "scanner.c"
+#line 8483 "scanner.c"
 		} else {
 			Request* _tmp18_ = NULL;
-#line 810 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 811 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp18_ = request;
-#line 810 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 811 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, TYPE_REQUEST_CANCEL)) {
-#line 812 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 813 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_fail_scan (self, (gint) SANE_STATUS_CANCELLED, "Scan cancelled - do not report this error");
-#line 8472 "scanner.c"
+#line 8492 "scanner.c"
 			} else {
 				Request* _tmp19_ = NULL;
-#line 814 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 815 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp19_ = request;
-#line 814 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 815 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_REQUEST_QUIT)) {
-#line 816 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					scanner_close_device (self);
 #line 817 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					scanner_close_device (self);
+#line 818 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					result = FALSE;
-#line 817 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 818 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_request_unref0 (request);
-#line 817 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 818 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					return result;
-#line 8487 "scanner.c"
+#line 8507 "scanner.c"
 				}
 			}
 		}
-#line 793 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 794 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_request_unref0 (request);
-#line 8493 "scanner.c"
+#line 8513 "scanner.c"
 	}
 }
 
 
 static void _g_free0_ (gpointer var) {
-#line 861 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 862 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	var = (g_free (var), NULL);
-#line 8501 "scanner.c"
+#line 8521 "scanner.c"
 }
 
 
@@ -8536,201 +8556,201 @@ static void scanner_do_open (Scanner* self) {
 	ScanJob* _tmp35_ = NULL;
 	const gchar* _tmp36_ = NULL;
 	gchar* _tmp37_ = NULL;
-#line 822 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 823 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 824 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 825 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->job_queue;
-#line 824 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 825 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_->data;
-#line 824 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 825 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = _scan_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST ((ScanJob*) _tmp1_, TYPE_SCAN_JOB, ScanJob));
-#line 824 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 825 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	job = _tmp2_;
-#line 826 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->priv->line_count = 0;
 #line 827 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->priv->pass_number = 0;
+	self->priv->line_count = 0;
 #line 828 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->priv->page_number = 0;
+	self->priv->pass_number = 0;
 #line 829 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->priv->notified_page = -1;
+	self->priv->page_number = 0;
 #line 830 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	self->priv->notified_page = -1;
+#line 831 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->option_index = (SANE_Int) 0;
-#line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 833 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = job;
-#line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 833 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = _tmp4_->device;
-#line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 833 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp5_ == NULL) {
-#line 8559 "scanner.c"
+#line 8579 "scanner.c"
 		const gchar* _tmp6_ = NULL;
-#line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 833 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = self->priv->default_device;
-#line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 833 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp3_ = _tmp6_ != NULL;
-#line 8565 "scanner.c"
+#line 8585 "scanner.c"
 	} else {
-#line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 833 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp3_ = FALSE;
-#line 8569 "scanner.c"
+#line 8589 "scanner.c"
 	}
-#line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 833 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp3_) {
-#line 8573 "scanner.c"
+#line 8593 "scanner.c"
 		ScanJob* _tmp7_ = NULL;
 		const gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 833 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 834 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = job;
-#line 833 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 834 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_ = self->priv->default_device;
-#line 833 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 834 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = g_strdup (_tmp8_);
-#line 833 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 834 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (_tmp7_->device);
-#line 833 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 834 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_->device = _tmp9_;
-#line 8587 "scanner.c"
+#line 8607 "scanner.c"
 	}
-#line 835 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 836 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = job;
-#line 835 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 836 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = _tmp10_->device;
-#line 835 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 836 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp11_ == NULL) {
-#line 8595 "scanner.c"
+#line 8615 "scanner.c"
 		const gchar* _tmp12_ = NULL;
-#line 837 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_warning ("scanner.vala:837: No scan device available");
 #line 838 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		g_warning ("scanner.vala:838: No scan device available");
+#line 839 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp12_ = _ ("No scanners available.  Please connect a scanner.");
-#line 838 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 839 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_fail_scan (self, 0, _tmp12_);
-#line 841 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 842 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
-#line 841 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 842 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 8607 "scanner.c"
+#line 8627 "scanner.c"
 	}
-#line 845 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 846 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp13_ = self->priv->have_handle;
-#line 845 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 846 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp13_) {
-#line 8613 "scanner.c"
+#line 8633 "scanner.c"
 		const gchar* _tmp14_ = NULL;
 		ScanJob* _tmp15_ = NULL;
 		const gchar* _tmp16_ = NULL;
 		SANE_Handle _tmp17_ = {0};
-#line 847 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 848 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = self->priv->current_device;
-#line 847 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 848 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp15_ = job;
-#line 847 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 848 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp16_ = _tmp15_->device;
-#line 847 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 848 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (g_strcmp0 (_tmp14_, _tmp16_) == 0) {
-#line 849 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			self->priv->state = SCAN_STATE_GET_OPTION;
 #line 850 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			self->priv->state = SCAN_STATE_GET_OPTION;
+#line 851 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_scan_job_unref0 (job);
-#line 850 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 851 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return;
-#line 8632 "scanner.c"
+#line 8652 "scanner.c"
 		}
-#line 853 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 854 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp17_ = self->priv->handle;
-#line 853 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		sane_close (_tmp17_);
 #line 854 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_debug ("scanner.vala:854: sane_close ()");
+		sane_close (_tmp17_);
 #line 855 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		g_debug ("scanner.vala:855: sane_close ()");
+#line 856 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->have_handle = FALSE;
-#line 8642 "scanner.c"
+#line 8662 "scanner.c"
 	}
-#line 858 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 859 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->priv->current_device);
-#line 858 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 859 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->current_device = NULL;
-#line 860 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->priv->have_handle = FALSE;
 #line 861 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	self->priv->have_handle = FALSE;
+#line 862 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp18_ = g_str_hash;
-#line 861 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 862 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp19_ = g_str_equal;
-#line 861 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 862 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp20_ = g_hash_table_new_full (_tmp18_, _tmp19_, _g_free0_, NULL);
-#line 861 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 862 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_hash_table_unref0 (self->priv->options);
-#line 861 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->priv->options = _tmp20_;
 #line 862 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	self->priv->options = _tmp20_;
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp21_ = job;
-#line 862 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp22_ = _tmp21_->device;
-#line 862 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp24_ = sane_open (_tmp22_, &_tmp23_);
-#line 862 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->handle = _tmp23_;
-#line 862 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	status = _tmp24_;
 #line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	status = _tmp24_;
+#line 864 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp25_ = job;
-#line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 864 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp26_ = _tmp25_->device;
-#line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 864 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp27_ = status;
-#line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 864 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp28_ = sane_status_to_string (_tmp27_);
-#line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 864 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp29_ = _tmp28_;
-#line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:863: sane_open (\"%s\") -> %s", _tmp26_, _tmp29_);
-#line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 864 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:864: sane_open (\"%s\") -> %s", _tmp26_, _tmp29_);
+#line 864 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp29_);
-#line 865 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 866 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp30_ = status;
-#line 865 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 866 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp30_ != SANE_STATUS_GOOD) {
-#line 8688 "scanner.c"
+#line 8708 "scanner.c"
 		SANE_Status _tmp31_ = 0;
 		const gchar* _tmp32_ = NULL;
 		SANE_Status _tmp33_ = 0;
 		const gchar* _tmp34_ = NULL;
-#line 867 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 868 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp31_ = status;
-#line 867 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 868 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp32_ = sane_strstatus (_tmp31_);
-#line 867 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_warning ("scanner.vala:867: Unable to get open device: %s", _tmp32_);
 #line 868 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		g_warning ("scanner.vala:868: Unable to get open device: %s", _tmp32_);
+#line 869 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp33_ = status;
-#line 868 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 869 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp34_ = _ ("Unable to connect to scanner");
-#line 868 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 869 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_fail_scan (self, (gint) _tmp33_, _tmp34_);
-#line 871 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 872 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
-#line 871 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 872 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 8709 "scanner.c"
+#line 8729 "scanner.c"
 	}
-#line 873 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->have_handle = TRUE;
-#line 875 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 876 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp35_ = job;
-#line 875 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 876 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp36_ = _tmp35_->device;
-#line 875 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 876 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp37_ = g_strdup (_tmp36_);
-#line 875 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 876 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->priv->current_device);
-#line 875 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->priv->current_device = _tmp37_;
 #line 876 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	self->priv->current_device = _tmp37_;
+#line 877 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->state = SCAN_STATE_GET_OPTION;
-#line 822 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 823 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (job);
-#line 8727 "scanner.c"
+#line 8747 "scanner.c"
 }
 
 
@@ -8761,41 +8781,41 @@ static void scanner_do_get_option (Scanner* self) {
 	const gchar* _tmp366_ = NULL;
 	gchar* _tmp367_ = NULL;
 	SANE_Int _tmp368_ = {0};
-#line 879 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 880 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 881 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 882 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->job_queue;
-#line 881 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 882 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_->data;
-#line 881 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 882 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = _scan_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST ((ScanJob*) _tmp1_, TYPE_SCAN_JOB, ScanJob));
-#line 881 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 882 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	job = _tmp2_;
-#line 883 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 884 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = self->priv->handle;
-#line 883 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 884 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = self->priv->option_index;
-#line 883 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 884 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = sane_get_option_descriptor (_tmp3_, _tmp4_);
-#line 883 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	option = _tmp5_;
 #line 884 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	option = _tmp5_;
+#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = self->priv->option_index;
-#line 884 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:884: sane_get_option_descriptor (%d)", (gint) _tmp6_);
 #line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:885: sane_get_option_descriptor (%d)", (gint) _tmp6_);
+#line 886 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp7_ = self->priv->option_index;
-#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	index = _tmp7_;
 #line 886 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	index = _tmp7_;
+#line 887 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp8_ = self->priv->option_index;
-#line 886 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 887 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->option_index = _tmp8_ + 1;
-#line 889 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 890 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp9_ = option;
-#line 889 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 890 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp9_ == NULL) {
-#line 8792 "scanner.c"
+#line 8812 "scanner.c"
 		SANE_Handle _tmp10_ = {0};
 		const gchar* _tmp11_ = NULL;
 		gint _tmp12_ = 0;
@@ -8857,42 +8877,42 @@ static void scanner_do_get_option (Scanner* self) {
 		SANE_Option_Descriptor* _tmp308_ = NULL;
 		SANE_Option_Descriptor* _tmp309_ = NULL;
 		const gchar* _tmp320_ = NULL;
-#line 892 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 893 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp10_ = self->priv->handle;
-#line 892 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 893 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp11_ = SANE_NAME_SCAN_SOURCE;
-#line 892 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 893 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp13_ = scanner_get_option_by_name (self, _tmp10_, _tmp11_, &_tmp12_);
-#line 892 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 893 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		index = (SANE_Int) _tmp12_;
-#line 892 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		option = _tmp13_;
 #line 893 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		option = _tmp13_;
+#line 894 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = option;
-#line 893 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 894 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp14_ == NULL) {
-#line 8868 "scanner.c"
+#line 8888 "scanner.c"
 			SANE_Handle _tmp15_ = {0};
 			gint _tmp16_ = 0;
 			SANE_Option_Descriptor* _tmp17_ = NULL;
-#line 895 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			g_debug ("scanner.vala:895: SCAN_SOURCE not available, trying alternative \"doc-" \
-"source\"");
 #line 896 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			g_debug ("scanner.vala:896: SCAN_SOURCE not available, trying alternative \"doc-" \
+"source\"");
+#line 897 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp15_ = self->priv->handle;
-#line 896 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 897 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp17_ = scanner_get_option_by_name (self, _tmp15_, "doc-source", &_tmp16_);
-#line 896 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 897 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			index = (SANE_Int) _tmp16_;
-#line 896 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 897 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			option = _tmp17_;
-#line 8882 "scanner.c"
+#line 8902 "scanner.c"
 		}
-#line 898 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 899 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp18_ = option;
-#line 898 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 899 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp18_ != NULL) {
-#line 8888 "scanner.c"
+#line 8908 "scanner.c"
 			gchar** flatbed_sources = NULL;
 			gchar* _tmp19_ = NULL;
 			const gchar* _tmp20_ = NULL;
@@ -8946,213 +8966,213 @@ static void scanner_do_get_option (Scanner* self) {
 			gint _adf_duplex_sources_size_ = 0;
 			ScanJob* _tmp55_ = NULL;
 			ScanType _tmp56_ = 0;
-#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp19_ = g_strdup ("Auto");
-#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp20_ = SANE_I18N ("Auto");
-#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp21_ = g_strdup (_tmp20_);
-#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp22_ = g_strdup ("Flatbed");
-#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp23_ = SANE_I18N ("Flatbed");
-#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp24_ = g_strdup (_tmp23_);
-#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp25_ = g_strdup ("FlatBed");
-#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp26_ = g_strdup ("Normal");
-#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp27_ = SANE_I18N ("Normal");
-#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp28_ = g_strdup (_tmp27_);
-#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp29_ = g_new0 (gchar*, 7 + 1);
-#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp29_[0] = _tmp19_;
-#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp29_[1] = _tmp21_;
-#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp29_[2] = _tmp22_;
-#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp29_[3] = _tmp24_;
-#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp29_[4] = _tmp25_;
-#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp29_[5] = _tmp26_;
-#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp29_[6] = _tmp28_;
-#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			flatbed_sources = _tmp29_;
-#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			flatbed_sources_length1 = 7;
-#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_flatbed_sources_size_ = flatbed_sources_length1;
-#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 912 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp30_ = g_strdup ("Automatic Document Feeder");
-#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 912 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp31_ = SANE_I18N ("Automatic Document Feeder");
-#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 912 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp32_ = g_strdup (_tmp31_);
-#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 912 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp33_ = g_strdup ("ADF");
-#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 912 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp34_ = g_strdup ("Automatic Document Feeder(left aligned)");
-#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 912 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp35_ = g_strdup ("Automatic Document Feeder(centrally aligned)");
-#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 912 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp36_ = g_strdup ("ADF Simplex");
-#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 912 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp37_ = g_new0 (gchar*, 6 + 1);
-#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 912 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp37_[0] = _tmp30_;
-#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 912 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp37_[1] = _tmp32_;
-#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 912 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp37_[2] = _tmp33_;
-#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 912 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp37_[3] = _tmp34_;
-#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 912 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp37_[4] = _tmp35_;
-#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 912 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp37_[5] = _tmp36_;
-#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 912 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_sources = _tmp37_;
-#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 912 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_sources_length1 = 6;
-#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 912 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_adf_sources_size_ = adf_sources_length1;
-#line 921 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 922 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp38_ = g_strdup ("ADF Front");
-#line 921 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 922 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp39_ = SANE_I18N ("ADF Front");
-#line 921 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 922 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp40_ = g_strdup (_tmp39_);
-#line 921 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 922 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp41_ = g_new0 (gchar*, 2 + 1);
-#line 921 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 922 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp41_[0] = _tmp38_;
-#line 921 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 922 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp41_[1] = _tmp40_;
-#line 921 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 922 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_front_sources = _tmp41_;
-#line 921 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 922 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_front_sources_length1 = 2;
-#line 921 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 922 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_adf_front_sources_size_ = adf_front_sources_length1;
-#line 927 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 928 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp42_ = g_strdup ("ADF Back");
-#line 927 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 928 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp43_ = SANE_I18N ("ADF Back");
-#line 927 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 928 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp44_ = g_strdup (_tmp43_);
-#line 927 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 928 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp45_ = g_new0 (gchar*, 2 + 1);
-#line 927 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 928 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp45_[0] = _tmp42_;
-#line 927 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 928 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp45_[1] = _tmp44_;
-#line 927 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 928 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_back_sources = _tmp45_;
-#line 927 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 928 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_back_sources_length1 = 2;
-#line 927 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 928 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_adf_back_sources_size_ = adf_back_sources_length1;
-#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp46_ = g_strdup ("ADF Duplex");
-#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp47_ = SANE_I18N ("ADF Duplex");
-#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp48_ = g_strdup (_tmp47_);
-#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp49_ = g_strdup ("ADF Duplex - Long-Edge Binding");
-#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp50_ = g_strdup ("ADF Duplex - Short-Edge Binding");
-#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp51_ = g_strdup ("Duplex");
-#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp52_ = g_strdup ("Automatic Document Feeder(centrally aligned,Duplex)");
-#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp53_ = g_strdup ("Automatic Document Feeder(left aligned,Duplex)");
-#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp54_ = g_new0 (gchar*, 7 + 1);
-#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp54_[0] = _tmp46_;
-#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp54_[1] = _tmp48_;
-#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp54_[2] = _tmp49_;
-#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp54_[3] = _tmp50_;
-#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp54_[4] = _tmp51_;
-#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp54_[5] = _tmp52_;
-#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp54_[6] = _tmp53_;
-#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_duplex_sources = _tmp54_;
-#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_duplex_sources_length1 = 7;
-#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_adf_duplex_sources_size_ = adf_duplex_sources_length1;
-#line 944 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp55_ = job;
-#line 944 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp56_ = _tmp55_->type;
-#line 944 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			switch (_tmp56_) {
-#line 944 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_TYPE_SINGLE:
-#line 9100 "scanner.c"
+#line 9120 "scanner.c"
 				{
 					SANE_Handle _tmp57_ = {0};
 					SANE_Option_Descriptor* _tmp58_ = NULL;
 					SANE_Int _tmp59_ = {0};
 					gboolean _tmp60_ = FALSE;
-#line 947 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 948 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp57_ = self->priv->handle;
-#line 947 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 948 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp58_ = option;
-#line 947 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 948 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp59_ = index;
-#line 947 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 948 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp60_ = scanner_set_default_option (self, _tmp57_, _tmp58_, _tmp59_);
-#line 947 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 948 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp60_) {
-#line 9116 "scanner.c"
+#line 9136 "scanner.c"
 						SANE_Handle _tmp61_ = {0};
 						SANE_Option_Descriptor* _tmp62_ = NULL;
 						SANE_Int _tmp63_ = {0};
 						gchar** _tmp64_ = NULL;
 						gint _tmp64__length1 = 0;
 						gboolean _tmp65_ = FALSE;
-#line 948 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 949 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp61_ = self->priv->handle;
-#line 948 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 949 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp62_ = option;
-#line 948 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 949 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp63_ = index;
-#line 948 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 949 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp64_ = flatbed_sources;
-#line 948 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 949 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp64__length1 = flatbed_sources_length1;
-#line 948 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 949 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp65_ = scanner_set_constrained_string_option (self, _tmp61_, _tmp62_, _tmp63_, _tmp64_, _tmp64__length1, NULL);
-#line 948 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (!_tmp65_) {
 #line 949 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							g_warning ("scanner.vala:949: Unable to set single page source, please file a bug");
-#line 9139 "scanner.c"
+						if (!_tmp65_) {
+#line 950 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+							g_warning ("scanner.vala:950: Unable to set single page source, please file a bug");
+#line 9159 "scanner.c"
 						}
 					}
-#line 950 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 951 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9144 "scanner.c"
+#line 9164 "scanner.c"
 				}
-#line 944 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_TYPE_ADF_FRONT:
-#line 9148 "scanner.c"
+#line 9168 "scanner.c"
 				{
 					SANE_Handle _tmp66_ = {0};
 					SANE_Option_Descriptor* _tmp67_ = NULL;
@@ -9160,53 +9180,53 @@ static void scanner_do_get_option (Scanner* self) {
 					gchar** _tmp69_ = NULL;
 					gint _tmp69__length1 = 0;
 					gboolean _tmp70_ = FALSE;
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 953 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp66_ = self->priv->handle;
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 953 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp67_ = option;
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 953 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp68_ = index;
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 953 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp69_ = adf_front_sources;
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 953 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp69__length1 = adf_front_sources_length1;
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 953 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp70_ = scanner_set_constrained_string_option (self, _tmp66_, _tmp67_, _tmp68_, _tmp69_, _tmp69__length1, NULL);
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 953 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp70_) {
-#line 9170 "scanner.c"
+#line 9190 "scanner.c"
 						SANE_Handle _tmp71_ = {0};
 						SANE_Option_Descriptor* _tmp72_ = NULL;
 						SANE_Int _tmp73_ = {0};
 						gchar** _tmp74_ = NULL;
 						gint _tmp74__length1 = 0;
 						gboolean _tmp75_ = FALSE;
-#line 953 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp71_ = self->priv->handle;
-#line 953 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp72_ = option;
-#line 953 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp73_ = index;
-#line 953 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp74_ = adf_sources;
-#line 953 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp74__length1 = adf_sources_length1;
-#line 953 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp75_ = scanner_set_constrained_string_option (self, _tmp71_, _tmp72_, _tmp73_, _tmp74_, _tmp74__length1, NULL);
-#line 953 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (!_tmp75_) {
 #line 954 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							g_warning ("scanner.vala:954: Unable to set front ADF source, please file a bug");
-#line 9193 "scanner.c"
+						if (!_tmp75_) {
+#line 955 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+							g_warning ("scanner.vala:955: Unable to set front ADF source, please file a bug");
+#line 9213 "scanner.c"
 						}
 					}
-#line 955 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 956 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9198 "scanner.c"
+#line 9218 "scanner.c"
 				}
-#line 944 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_TYPE_ADF_BACK:
-#line 9202 "scanner.c"
+#line 9222 "scanner.c"
 				{
 					SANE_Handle _tmp76_ = {0};
 					SANE_Option_Descriptor* _tmp77_ = NULL;
@@ -9214,53 +9234,53 @@ static void scanner_do_get_option (Scanner* self) {
 					gchar** _tmp79_ = NULL;
 					gint _tmp79__length1 = 0;
 					gboolean _tmp80_ = FALSE;
-#line 957 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp76_ = self->priv->handle;
-#line 957 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp77_ = option;
-#line 957 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp78_ = index;
-#line 957 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp79_ = adf_back_sources;
-#line 957 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp79__length1 = adf_back_sources_length1;
-#line 957 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp80_ = scanner_set_constrained_string_option (self, _tmp76_, _tmp77_, _tmp78_, _tmp79_, _tmp79__length1, NULL);
-#line 957 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp80_) {
-#line 9224 "scanner.c"
+#line 9244 "scanner.c"
 						SANE_Handle _tmp81_ = {0};
 						SANE_Option_Descriptor* _tmp82_ = NULL;
 						SANE_Int _tmp83_ = {0};
 						gchar** _tmp84_ = NULL;
 						gint _tmp84__length1 = 0;
 						gboolean _tmp85_ = FALSE;
-#line 958 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp81_ = self->priv->handle;
-#line 958 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp82_ = option;
-#line 958 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp83_ = index;
-#line 958 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp84_ = adf_sources;
-#line 958 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp84__length1 = adf_sources_length1;
-#line 958 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp85_ = scanner_set_constrained_string_option (self, _tmp81_, _tmp82_, _tmp83_, _tmp84_, _tmp84__length1, NULL);
-#line 958 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (!_tmp85_) {
 #line 959 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							g_warning ("scanner.vala:959: Unable to set back ADF source, please file a bug");
-#line 9247 "scanner.c"
+						if (!_tmp85_) {
+#line 960 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+							g_warning ("scanner.vala:960: Unable to set back ADF source, please file a bug");
+#line 9267 "scanner.c"
 						}
 					}
-#line 960 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9252 "scanner.c"
+#line 9272 "scanner.c"
 				}
-#line 944 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_TYPE_ADF_BOTH:
-#line 9256 "scanner.c"
+#line 9276 "scanner.c"
 				{
 					SANE_Handle _tmp86_ = {0};
 					SANE_Option_Descriptor* _tmp87_ = NULL;
@@ -9268,82 +9288,82 @@ static void scanner_do_get_option (Scanner* self) {
 					gchar** _tmp89_ = NULL;
 					gint _tmp89__length1 = 0;
 					gboolean _tmp90_ = FALSE;
-#line 962 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 963 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp86_ = self->priv->handle;
-#line 962 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 963 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp87_ = option;
-#line 962 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 963 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp88_ = index;
-#line 962 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 963 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp89_ = adf_duplex_sources;
-#line 962 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 963 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp89__length1 = adf_duplex_sources_length1;
-#line 962 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 963 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp90_ = scanner_set_constrained_string_option (self, _tmp86_, _tmp87_, _tmp88_, _tmp89_, _tmp89__length1, NULL);
-#line 962 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 963 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp90_) {
-#line 9278 "scanner.c"
+#line 9298 "scanner.c"
 						SANE_Handle _tmp91_ = {0};
 						SANE_Option_Descriptor* _tmp92_ = NULL;
 						SANE_Int _tmp93_ = {0};
 						gchar** _tmp94_ = NULL;
 						gint _tmp94__length1 = 0;
 						gboolean _tmp95_ = FALSE;
-#line 963 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 964 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp91_ = self->priv->handle;
-#line 963 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 964 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp92_ = option;
-#line 963 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 964 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp93_ = index;
-#line 963 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 964 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp94_ = adf_sources;
-#line 963 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 964 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp94__length1 = adf_sources_length1;
-#line 963 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 964 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp95_ = scanner_set_constrained_string_option (self, _tmp91_, _tmp92_, _tmp93_, _tmp94_, _tmp94__length1, NULL);
-#line 963 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (!_tmp95_) {
 #line 964 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							g_warning ("scanner.vala:964: Unable to set duplex ADF source, please file a bug");
-#line 9301 "scanner.c"
+						if (!_tmp95_) {
+#line 965 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+							g_warning ("scanner.vala:965: Unable to set duplex ADF source, please file a bug");
+#line 9321 "scanner.c"
 						}
 					}
-#line 965 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 966 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9306 "scanner.c"
+#line 9326 "scanner.c"
 				}
 				default:
-#line 944 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 9311 "scanner.c"
+#line 9331 "scanner.c"
 			}
-#line 898 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 899 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_duplex_sources = (_vala_array_free (adf_duplex_sources, adf_duplex_sources_length1, (GDestroyNotify) g_free), NULL);
-#line 898 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 899 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_back_sources = (_vala_array_free (adf_back_sources, adf_back_sources_length1, (GDestroyNotify) g_free), NULL);
-#line 898 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 899 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_front_sources = (_vala_array_free (adf_front_sources, adf_front_sources_length1, (GDestroyNotify) g_free), NULL);
-#line 898 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 899 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_sources = (_vala_array_free (adf_sources, adf_sources_length1, (GDestroyNotify) g_free), NULL);
-#line 898 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 899 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			flatbed_sources = (_vala_array_free (flatbed_sources, flatbed_sources_length1, (GDestroyNotify) g_free), NULL);
-#line 9323 "scanner.c"
+#line 9343 "scanner.c"
 		}
-#line 970 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp96_ = self->priv->handle;
-#line 970 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp97_ = SANE_NAME_SCAN_MODE;
-#line 970 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp99_ = scanner_get_option_by_name (self, _tmp96_, _tmp97_, &_tmp98_);
-#line 970 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		index = (SANE_Int) _tmp98_;
-#line 970 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		option = _tmp99_;
 #line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		option = _tmp99_;
+#line 972 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp100_ = option;
-#line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 972 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp100_ != NULL) {
-#line 9339 "scanner.c"
+#line 9359 "scanner.c"
 			gchar** color_scan_modes = NULL;
 			const gchar* _tmp101_ = NULL;
 			gchar* _tmp102_ = NULL;
@@ -9393,161 +9413,161 @@ static void scanner_do_get_option (Scanner* self) {
 			gint _lineart_scan_modes_size_ = 0;
 			ScanJob* _tmp139_ = NULL;
 			ScanMode _tmp140_ = 0;
-#line 974 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 975 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp101_ = SANE_VALUE_SCAN_MODE_COLOR;
-#line 974 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 975 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp102_ = g_strdup (_tmp101_);
-#line 974 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 975 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp103_ = g_strdup ("Color");
-#line 974 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 975 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp104_ = g_strdup ("24bit Color");
-#line 974 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 975 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp105_ = g_strdup ("Color - 16 Million Colors");
-#line 974 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 975 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp106_ = g_new0 (gchar*, 4 + 1);
-#line 974 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 975 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp106_[0] = _tmp102_;
-#line 974 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 975 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp106_[1] = _tmp103_;
-#line 974 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 975 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp106_[2] = _tmp104_;
-#line 974 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 975 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp106_[3] = _tmp105_;
-#line 974 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 975 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			color_scan_modes = _tmp106_;
-#line 974 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 975 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			color_scan_modes_length1 = 4;
-#line 974 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 975 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_color_scan_modes_size_ = color_scan_modes_length1;
-#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 982 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp107_ = SANE_VALUE_SCAN_MODE_GRAY;
-#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 982 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp108_ = g_strdup (_tmp107_);
-#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 982 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp109_ = g_strdup ("Gray");
-#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 982 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp110_ = g_strdup ("Grayscale");
-#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 982 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp111_ = SANE_I18N ("Grayscale");
-#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 982 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp112_ = g_strdup (_tmp111_);
-#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 982 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp113_ = g_strdup ("True Gray");
-#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 982 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp114_ = g_strdup ("Grayscale - 256 Levels");
-#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 982 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp115_ = g_new0 (gchar*, 6 + 1);
-#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 982 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp115_[0] = _tmp108_;
-#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 982 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp115_[1] = _tmp109_;
-#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 982 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp115_[2] = _tmp110_;
-#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 982 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp115_[3] = _tmp112_;
-#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 982 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp115_[4] = _tmp113_;
-#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 982 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp115_[5] = _tmp114_;
-#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 982 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			gray_scan_modes = _tmp115_;
-#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 982 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			gray_scan_modes_length1 = 6;
-#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 982 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_gray_scan_modes_size_ = gray_scan_modes_length1;
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp116_ = SANE_VALUE_SCAN_MODE_LINEART;
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp117_ = g_strdup (_tmp116_);
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp118_ = g_strdup ("Lineart");
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp119_ = g_strdup ("LineArt");
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp120_ = SANE_I18N ("LineArt");
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp121_ = g_strdup (_tmp120_);
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp122_ = g_strdup ("Black & White");
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp123_ = SANE_I18N ("Black & White");
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp124_ = g_strdup (_tmp123_);
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp125_ = g_strdup ("Binary");
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp126_ = SANE_I18N ("Binary");
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp127_ = g_strdup (_tmp126_);
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp128_ = g_strdup ("Thresholded");
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp129_ = SANE_VALUE_SCAN_MODE_GRAY;
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp130_ = g_strdup (_tmp129_);
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp131_ = g_strdup ("Gray");
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp132_ = g_strdup ("Grayscale");
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp133_ = SANE_I18N ("Grayscale");
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp134_ = g_strdup (_tmp133_);
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp135_ = g_strdup ("True Gray");
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp136_ = g_strdup ("Black and White - Line Art");
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp137_ = g_strdup ("Black and White - Halftone");
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp138_ = g_new0 (gchar*, 16 + 1);
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp138_[0] = _tmp117_;
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp138_[1] = _tmp118_;
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp138_[2] = _tmp119_;
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp138_[3] = _tmp121_;
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp138_[4] = _tmp122_;
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp138_[5] = _tmp124_;
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp138_[6] = _tmp125_;
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp138_[7] = _tmp127_;
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp138_[8] = _tmp128_;
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp138_[9] = _tmp130_;
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp138_[10] = _tmp131_;
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp138_[11] = _tmp132_;
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp138_[12] = _tmp134_;
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp138_[13] = _tmp135_;
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp138_[14] = _tmp136_;
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp138_[15] = _tmp137_;
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			lineart_scan_modes = _tmp138_;
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			lineart_scan_modes_length1 = 16;
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_lineart_scan_modes_size_ = lineart_scan_modes_length1;
-#line 1010 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1011 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp139_ = job;
-#line 1010 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1011 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp140_ = _tmp139_->scan_mode;
-#line 1010 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1011 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			switch (_tmp140_) {
-#line 1010 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1011 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_MODE_COLOR:
-#line 9543 "scanner.c"
+#line 9563 "scanner.c"
 				{
 					SANE_Handle _tmp141_ = {0};
 					SANE_Option_Descriptor* _tmp142_ = NULL;
@@ -9555,31 +9575,31 @@ static void scanner_do_get_option (Scanner* self) {
 					gchar** _tmp144_ = NULL;
 					gint _tmp144__length1 = 0;
 					gboolean _tmp145_ = FALSE;
-#line 1013 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1014 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp141_ = self->priv->handle;
-#line 1013 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1014 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp142_ = option;
-#line 1013 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1014 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp143_ = index;
-#line 1013 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1014 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp144_ = color_scan_modes;
-#line 1013 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1014 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp144__length1 = color_scan_modes_length1;
-#line 1013 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1014 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp145_ = scanner_set_constrained_string_option (self, _tmp141_, _tmp142_, _tmp143_, _tmp144_, _tmp144__length1, NULL);
-#line 1013 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					if (!_tmp145_) {
 #line 1014 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						g_warning ("scanner.vala:1014: Unable to set Color mode, please file a bug");
-#line 9567 "scanner.c"
-					}
+					if (!_tmp145_) {
 #line 1015 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+						g_warning ("scanner.vala:1015: Unable to set Color mode, please file a bug");
+#line 9587 "scanner.c"
+					}
+#line 1016 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9571 "scanner.c"
+#line 9591 "scanner.c"
 				}
-#line 1010 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1011 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_MODE_GRAY:
-#line 9575 "scanner.c"
+#line 9595 "scanner.c"
 				{
 					SANE_Handle _tmp146_ = {0};
 					SANE_Option_Descriptor* _tmp147_ = NULL;
@@ -9587,31 +9607,31 @@ static void scanner_do_get_option (Scanner* self) {
 					gchar** _tmp149_ = NULL;
 					gint _tmp149__length1 = 0;
 					gboolean _tmp150_ = FALSE;
-#line 1017 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1018 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp146_ = self->priv->handle;
-#line 1017 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1018 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp147_ = option;
-#line 1017 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1018 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp148_ = index;
-#line 1017 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1018 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp149_ = gray_scan_modes;
-#line 1017 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1018 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp149__length1 = gray_scan_modes_length1;
-#line 1017 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1018 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp150_ = scanner_set_constrained_string_option (self, _tmp146_, _tmp147_, _tmp148_, _tmp149_, _tmp149__length1, NULL);
-#line 1017 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					if (!_tmp150_) {
 #line 1018 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						g_warning ("scanner.vala:1018: Unable to set Gray mode, please file a bug");
-#line 9599 "scanner.c"
-					}
+					if (!_tmp150_) {
 #line 1019 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+						g_warning ("scanner.vala:1019: Unable to set Gray mode, please file a bug");
+#line 9619 "scanner.c"
+					}
+#line 1020 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9603 "scanner.c"
+#line 9623 "scanner.c"
 				}
-#line 1010 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1011 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_MODE_LINEART:
-#line 9607 "scanner.c"
+#line 9627 "scanner.c"
 				{
 					SANE_Handle _tmp151_ = {0};
 					SANE_Option_Descriptor* _tmp152_ = NULL;
@@ -9619,140 +9639,140 @@ static void scanner_do_get_option (Scanner* self) {
 					gchar** _tmp154_ = NULL;
 					gint _tmp154__length1 = 0;
 					gboolean _tmp155_ = FALSE;
-#line 1021 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1022 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp151_ = self->priv->handle;
-#line 1021 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1022 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp152_ = option;
-#line 1021 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1022 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp153_ = index;
-#line 1021 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1022 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp154_ = lineart_scan_modes;
-#line 1021 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1022 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp154__length1 = lineart_scan_modes_length1;
-#line 1021 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1022 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp155_ = scanner_set_constrained_string_option (self, _tmp151_, _tmp152_, _tmp153_, _tmp154_, _tmp154__length1, NULL);
-#line 1021 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					if (!_tmp155_) {
 #line 1022 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						g_warning ("scanner.vala:1022: Unable to set Lineart mode, please file a bug");
-#line 9631 "scanner.c"
-					}
+					if (!_tmp155_) {
 #line 1023 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+						g_warning ("scanner.vala:1023: Unable to set Lineart mode, please file a bug");
+#line 9651 "scanner.c"
+					}
+#line 1024 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9635 "scanner.c"
+#line 9655 "scanner.c"
 				}
 				default:
 				{
-#line 1025 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1026 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9641 "scanner.c"
+#line 9661 "scanner.c"
 				}
 			}
-#line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 972 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			lineart_scan_modes = (_vala_array_free (lineart_scan_modes, lineart_scan_modes_length1, (GDestroyNotify) g_free), NULL);
-#line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 972 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			gray_scan_modes = (_vala_array_free (gray_scan_modes, gray_scan_modes_length1, (GDestroyNotify) g_free), NULL);
-#line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 972 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			color_scan_modes = (_vala_array_free (color_scan_modes, color_scan_modes_length1, (GDestroyNotify) g_free), NULL);
-#line 9650 "scanner.c"
+#line 9670 "scanner.c"
 		}
-#line 1030 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1031 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp156_ = self->priv->handle;
-#line 1030 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1031 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp158_ = scanner_get_option_by_name (self, _tmp156_, "duplex", &_tmp157_);
-#line 1030 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1031 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		index = (SANE_Int) _tmp157_;
-#line 1030 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		option = _tmp158_;
 #line 1031 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		option = _tmp158_;
+#line 1032 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp159_ = option;
-#line 1031 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1032 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp159_ != NULL) {
-#line 9664 "scanner.c"
+#line 9684 "scanner.c"
 			SANE_Option_Descriptor* _tmp160_ = NULL;
 			SANE_Value_Type _tmp161_ = 0;
-#line 1033 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1034 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp160_ = option;
-#line 1033 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1034 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp161_ = _tmp160_->type;
-#line 1033 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1034 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp161_ == SANE_TYPE_BOOL) {
-#line 9673 "scanner.c"
+#line 9693 "scanner.c"
 				SANE_Handle _tmp162_ = {0};
 				SANE_Option_Descriptor* _tmp163_ = NULL;
 				SANE_Int _tmp164_ = {0};
 				ScanJob* _tmp165_ = NULL;
 				ScanType _tmp166_ = 0;
-#line 1034 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1035 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp162_ = self->priv->handle;
-#line 1034 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1035 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp163_ = option;
-#line 1034 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1035 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp164_ = index;
-#line 1034 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1035 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp165_ = job;
-#line 1034 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1035 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp166_ = _tmp165_->type;
-#line 1034 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1035 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_bool_option (self, _tmp162_, _tmp163_, _tmp164_, _tmp166_ == SCAN_TYPE_ADF_BOTH, NULL);
-#line 9691 "scanner.c"
+#line 9711 "scanner.c"
 			}
 		}
-#line 1038 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1039 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp167_ = self->priv->handle;
-#line 1038 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1039 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp169_ = scanner_get_option_by_name (self, _tmp167_, "batch-scan", &_tmp168_);
-#line 1038 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1039 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		index = (SANE_Int) _tmp168_;
-#line 1038 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		option = _tmp169_;
 #line 1039 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		option = _tmp169_;
+#line 1040 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp170_ = option;
-#line 1039 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1040 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp170_ != NULL) {
-#line 9706 "scanner.c"
+#line 9726 "scanner.c"
 			SANE_Option_Descriptor* _tmp171_ = NULL;
 			SANE_Value_Type _tmp172_ = 0;
-#line 1041 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1042 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp171_ = option;
-#line 1041 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1042 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp172_ = _tmp171_->type;
-#line 1041 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1042 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp172_ == SANE_TYPE_BOOL) {
-#line 9715 "scanner.c"
+#line 9735 "scanner.c"
 				SANE_Handle _tmp173_ = {0};
 				SANE_Option_Descriptor* _tmp174_ = NULL;
 				SANE_Int _tmp175_ = {0};
 				ScanJob* _tmp176_ = NULL;
 				ScanType _tmp177_ = 0;
-#line 1042 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1043 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp173_ = self->priv->handle;
-#line 1042 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1043 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp174_ = option;
-#line 1042 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1043 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp175_ = index;
-#line 1042 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1043 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp176_ = job;
-#line 1042 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1043 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp177_ = _tmp176_->type;
-#line 1042 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1043 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_bool_option (self, _tmp173_, _tmp174_, _tmp175_, _tmp177_ != SCAN_TYPE_SINGLE, NULL);
-#line 9733 "scanner.c"
+#line 9753 "scanner.c"
 			}
 		}
-#line 1046 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1047 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp178_ = self->priv->handle;
-#line 1046 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1047 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp180_ = scanner_get_option_by_name (self, _tmp178_, "compression", &_tmp179_);
-#line 1046 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1047 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		index = (SANE_Int) _tmp179_;
-#line 1046 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		option = _tmp180_;
 #line 1047 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		option = _tmp180_;
+#line 1048 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp181_ = option;
-#line 1047 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1048 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp181_ != NULL) {
-#line 9748 "scanner.c"
+#line 9768 "scanner.c"
 			gchar** disable_compression_names = NULL;
 			const gchar* _tmp182_ = NULL;
 			gchar* _tmp183_ = NULL;
@@ -9769,71 +9789,71 @@ static void scanner_do_get_option (Scanner* self) {
 			gchar** _tmp192_ = NULL;
 			gint _tmp192__length1 = 0;
 			gboolean _tmp193_ = FALSE;
-#line 1049 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1050 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp182_ = SANE_I18N ("None");
-#line 1049 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1050 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp183_ = g_strdup (_tmp182_);
-#line 1049 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1050 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp184_ = SANE_I18N ("none");
-#line 1049 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1050 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp185_ = g_strdup (_tmp184_);
-#line 1049 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1050 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp186_ = g_strdup ("None");
-#line 1049 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1050 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp187_ = g_strdup ("none");
-#line 1049 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1050 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp188_ = g_new0 (gchar*, 4 + 1);
-#line 1049 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1050 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp188_[0] = _tmp183_;
-#line 1049 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1050 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp188_[1] = _tmp185_;
-#line 1049 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1050 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp188_[2] = _tmp186_;
-#line 1049 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1050 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp188_[3] = _tmp187_;
-#line 1049 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1050 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			disable_compression_names = _tmp188_;
-#line 1049 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1050 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			disable_compression_names_length1 = 4;
-#line 1049 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1050 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_disable_compression_names_size_ = disable_compression_names_length1;
-#line 1057 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1058 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp189_ = self->priv->handle;
-#line 1057 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1058 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp190_ = option;
-#line 1057 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1058 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp191_ = index;
-#line 1057 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1058 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp192_ = disable_compression_names;
-#line 1057 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1058 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp192__length1 = disable_compression_names_length1;
-#line 1057 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1058 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp193_ = scanner_set_constrained_string_option (self, _tmp189_, _tmp190_, _tmp191_, _tmp192_, _tmp192__length1, NULL);
-#line 1057 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (!_tmp193_) {
 #line 1058 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				g_warning ("scanner.vala:1058: Unable to disable compression, please file a bug");
-#line 9809 "scanner.c"
+			if (!_tmp193_) {
+#line 1059 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				g_warning ("scanner.vala:1059: Unable to disable compression, please file a bug");
+#line 9829 "scanner.c"
 			}
-#line 1047 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1048 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			disable_compression_names = (_vala_array_free (disable_compression_names, disable_compression_names_length1, (GDestroyNotify) g_free), NULL);
-#line 9813 "scanner.c"
+#line 9833 "scanner.c"
 		}
-#line 1062 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1063 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp194_ = self->priv->handle;
-#line 1062 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1063 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp195_ = SANE_NAME_SCAN_RESOLUTION;
-#line 1062 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1063 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp197_ = scanner_get_option_by_name (self, _tmp194_, _tmp195_, &_tmp196_);
-#line 1062 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1063 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		index = (SANE_Int) _tmp196_;
-#line 1062 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		option = _tmp197_;
 #line 1063 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		option = _tmp197_;
+#line 1064 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp198_ = option;
-#line 1063 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1064 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp198_ != NULL) {
-#line 9829 "scanner.c"
+#line 9849 "scanner.c"
 			SANE_Handle _tmp199_ = {0};
 			SANE_Option_Descriptor* _tmp200_ = NULL;
 			SANE_Int _tmp201_ = {0};
@@ -9846,91 +9866,91 @@ static void scanner_do_get_option (Scanner* self) {
 			gint _tmp208_ = 0;
 			SANE_Option_Descriptor* _tmp209_ = NULL;
 			SANE_Option_Descriptor* _tmp210_ = NULL;
-#line 1065 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1066 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp199_ = self->priv->handle;
-#line 1065 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1066 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp200_ = option;
-#line 1065 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1066 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp201_ = index;
-#line 1065 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1066 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp202_ = job;
-#line 1065 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1066 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp203_ = _tmp202_->dpi;
-#line 1065 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1066 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp204_ = job;
-#line 1065 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1066 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			scanner_set_fixed_or_int_option (self, _tmp199_, _tmp200_, _tmp201_, _tmp203_, &_tmp205_);
-#line 1065 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp204_->dpi = _tmp205_;
 #line 1066 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp204_->dpi = _tmp205_;
+#line 1067 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp206_ = self->priv->handle;
-#line 1066 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1067 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp207_ = SANE_NAME_BIT_DEPTH;
-#line 1066 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1067 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp209_ = scanner_get_option_by_name (self, _tmp206_, _tmp207_, &_tmp208_);
-#line 1066 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1067 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			index = (SANE_Int) _tmp208_;
-#line 1066 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			option = _tmp209_;
 #line 1067 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			option = _tmp209_;
+#line 1068 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp210_ = option;
-#line 1067 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1068 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp210_ != NULL) {
-#line 9872 "scanner.c"
+#line 9892 "scanner.c"
 				ScanJob* _tmp211_ = NULL;
 				gint _tmp212_ = 0;
-#line 1069 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1070 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp211_ = job;
-#line 1069 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1070 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp212_ = _tmp211_->depth;
-#line 1069 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1070 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (_tmp212_ > 0) {
-#line 9881 "scanner.c"
+#line 9901 "scanner.c"
 					SANE_Handle _tmp213_ = {0};
 					SANE_Option_Descriptor* _tmp214_ = NULL;
 					SANE_Int _tmp215_ = {0};
 					ScanJob* _tmp216_ = NULL;
 					gint _tmp217_ = 0;
-#line 1070 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1071 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp213_ = self->priv->handle;
-#line 1070 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1071 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp214_ = option;
-#line 1070 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1071 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp215_ = index;
-#line 1070 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1071 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp216_ = job;
-#line 1070 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1071 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp217_ = _tmp216_->depth;
-#line 1070 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1071 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					scanner_set_int_option (self, _tmp213_, _tmp214_, _tmp215_, _tmp217_, NULL);
-#line 9899 "scanner.c"
+#line 9919 "scanner.c"
 				}
 			}
 		}
-#line 1075 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1076 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp218_ = self->priv->handle;
-#line 1075 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1076 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp219_ = SANE_NAME_SCAN_BR_X;
-#line 1075 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1076 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp221_ = scanner_get_option_by_name (self, _tmp218_, _tmp219_, &_tmp220_);
-#line 1075 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1076 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		index = (SANE_Int) _tmp220_;
-#line 1075 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		option = _tmp221_;
 #line 1076 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		option = _tmp221_;
+#line 1077 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp222_ = option;
-#line 1076 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1077 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp222_ != NULL) {
-#line 9917 "scanner.c"
+#line 9937 "scanner.c"
 			ScanJob* _tmp223_ = NULL;
 			gint _tmp224_ = 0;
-#line 1078 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1079 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp223_ = job;
-#line 1078 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1079 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp224_ = _tmp223_->page_width;
-#line 1078 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1079 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp224_ > 0) {
-#line 9926 "scanner.c"
+#line 9946 "scanner.c"
 				SANE_Handle _tmp225_ = {0};
 				SANE_Option_Descriptor* _tmp226_ = NULL;
 				SANE_Int _tmp227_ = {0};
@@ -9940,66 +9960,66 @@ static void scanner_do_get_option (Scanner* self) {
 				ScanJob* _tmp231_ = NULL;
 				gdouble _tmp232_ = 0.0;
 				gdouble _tmp233_ = 0.0;
-#line 1079 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1080 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp225_ = self->priv->handle;
-#line 1079 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1080 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp226_ = option;
-#line 1079 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1080 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp227_ = index;
-#line 1079 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1080 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp228_ = option;
-#line 1079 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1080 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp229_ = job;
-#line 1079 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1080 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp230_ = _tmp229_->page_width;
-#line 1079 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1080 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp231_ = job;
-#line 1079 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1080 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp232_ = _tmp231_->dpi;
-#line 1079 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1080 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp233_ = scanner_convert_page_size (self, _tmp228_, (gdouble) _tmp230_, _tmp232_);
-#line 1079 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1080 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_fixed_or_int_option (self, _tmp225_, _tmp226_, _tmp227_, _tmp233_, NULL);
-#line 9956 "scanner.c"
+#line 9976 "scanner.c"
 			} else {
 				SANE_Handle _tmp234_ = {0};
 				SANE_Option_Descriptor* _tmp235_ = NULL;
 				SANE_Int _tmp236_ = {0};
-#line 1081 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1082 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp234_ = self->priv->handle;
-#line 1081 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1082 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp235_ = option;
-#line 1081 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1082 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp236_ = index;
-#line 1081 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1082 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_option_to_max (self, _tmp234_, _tmp235_, _tmp236_);
-#line 9969 "scanner.c"
+#line 9989 "scanner.c"
 			}
 		}
-#line 1083 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1084 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp237_ = self->priv->handle;
-#line 1083 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1084 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp238_ = SANE_NAME_SCAN_BR_Y;
-#line 1083 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1084 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp240_ = scanner_get_option_by_name (self, _tmp237_, _tmp238_, &_tmp239_);
-#line 1083 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1084 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		index = (SANE_Int) _tmp239_;
-#line 1083 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		option = _tmp240_;
 #line 1084 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		option = _tmp240_;
+#line 1085 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp241_ = option;
-#line 1084 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1085 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp241_ != NULL) {
-#line 9986 "scanner.c"
+#line 10006 "scanner.c"
 			ScanJob* _tmp242_ = NULL;
 			gint _tmp243_ = 0;
-#line 1086 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp242_ = job;
-#line 1086 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp243_ = _tmp242_->page_height;
-#line 1086 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp243_ > 0) {
-#line 9995 "scanner.c"
+#line 10015 "scanner.c"
 				SANE_Handle _tmp244_ = {0};
 				SANE_Option_Descriptor* _tmp245_ = NULL;
 				SANE_Int _tmp246_ = {0};
@@ -10009,74 +10029,74 @@ static void scanner_do_get_option (Scanner* self) {
 				ScanJob* _tmp250_ = NULL;
 				gdouble _tmp251_ = 0.0;
 				gdouble _tmp252_ = 0.0;
-#line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1088 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp244_ = self->priv->handle;
-#line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1088 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp245_ = option;
-#line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1088 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp246_ = index;
-#line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1088 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp247_ = option;
-#line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1088 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp248_ = job;
-#line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1088 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp249_ = _tmp248_->page_height;
-#line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1088 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp250_ = job;
-#line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1088 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp251_ = _tmp250_->dpi;
-#line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1088 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp252_ = scanner_convert_page_size (self, _tmp247_, (gdouble) _tmp249_, _tmp251_);
-#line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1088 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_fixed_or_int_option (self, _tmp244_, _tmp245_, _tmp246_, _tmp252_, NULL);
-#line 10025 "scanner.c"
+#line 10045 "scanner.c"
 			} else {
 				SANE_Handle _tmp253_ = {0};
 				SANE_Option_Descriptor* _tmp254_ = NULL;
 				SANE_Int _tmp255_ = {0};
-#line 1089 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1090 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp253_ = self->priv->handle;
-#line 1089 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1090 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp254_ = option;
-#line 1089 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1090 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp255_ = index;
-#line 1089 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1090 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_option_to_max (self, _tmp253_, _tmp254_, _tmp255_);
-#line 10038 "scanner.c"
+#line 10058 "scanner.c"
 			}
 		}
-#line 1093 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp256_ = self->priv->handle;
-#line 1093 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp257_ = SANE_NAME_PAGE_WIDTH;
-#line 1093 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp259_ = scanner_get_option_by_name (self, _tmp256_, _tmp257_, &_tmp258_);
-#line 1093 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		index = (SANE_Int) _tmp258_;
-#line 1093 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		option = _tmp259_;
 #line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		option = _tmp259_;
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp261_ = option;
-#line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp261_ != NULL) {
-#line 10055 "scanner.c"
+#line 10075 "scanner.c"
 			ScanJob* _tmp262_ = NULL;
 			gint _tmp263_ = 0;
-#line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp262_ = job;
-#line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp263_ = _tmp262_->page_width;
-#line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp260_ = ((gdouble) _tmp263_) > 0.0;
-#line 10064 "scanner.c"
+#line 10084 "scanner.c"
 		} else {
-#line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp260_ = FALSE;
-#line 10068 "scanner.c"
+#line 10088 "scanner.c"
 		}
-#line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp260_) {
-#line 10072 "scanner.c"
+#line 10092 "scanner.c"
 			SANE_Handle _tmp264_ = {0};
 			SANE_Option_Descriptor* _tmp265_ = NULL;
 			SANE_Int _tmp266_ = {0};
@@ -10086,60 +10106,60 @@ static void scanner_do_get_option (Scanner* self) {
 			ScanJob* _tmp270_ = NULL;
 			gdouble _tmp271_ = 0.0;
 			gdouble _tmp272_ = 0.0;
-#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1096 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp264_ = self->priv->handle;
-#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1096 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp265_ = option;
-#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1096 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp266_ = index;
-#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1096 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp267_ = option;
-#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1096 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp268_ = job;
-#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1096 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp269_ = _tmp268_->page_width;
-#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1096 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp270_ = job;
-#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1096 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp271_ = _tmp270_->dpi;
-#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1096 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp272_ = scanner_convert_page_size (self, _tmp267_, (gdouble) _tmp269_, _tmp271_);
-#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1096 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			scanner_set_fixed_or_int_option (self, _tmp264_, _tmp265_, _tmp266_, _tmp272_, NULL);
-#line 10102 "scanner.c"
+#line 10122 "scanner.c"
 		}
-#line 1096 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp273_ = self->priv->handle;
-#line 1096 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp274_ = SANE_NAME_PAGE_HEIGHT;
-#line 1096 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp276_ = scanner_get_option_by_name (self, _tmp273_, _tmp274_, &_tmp275_);
-#line 1096 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		index = (SANE_Int) _tmp275_;
-#line 1096 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		option = _tmp276_;
 #line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		option = _tmp276_;
+#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp278_ = option;
-#line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp278_ != NULL) {
-#line 10118 "scanner.c"
+#line 10138 "scanner.c"
 			ScanJob* _tmp279_ = NULL;
 			gint _tmp280_ = 0;
-#line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp279_ = job;
-#line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp280_ = _tmp279_->page_height;
-#line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp277_ = ((gdouble) _tmp280_) > 0.0;
-#line 10127 "scanner.c"
+#line 10147 "scanner.c"
 		} else {
-#line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp277_ = FALSE;
-#line 10131 "scanner.c"
+#line 10151 "scanner.c"
 		}
-#line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp277_) {
-#line 10135 "scanner.c"
+#line 10155 "scanner.c"
 			SANE_Handle _tmp281_ = {0};
 			SANE_Option_Descriptor* _tmp282_ = NULL;
 			SANE_Int _tmp283_ = {0};
@@ -10149,52 +10169,52 @@ static void scanner_do_get_option (Scanner* self) {
 			ScanJob* _tmp287_ = NULL;
 			gdouble _tmp288_ = 0.0;
 			gdouble _tmp289_ = 0.0;
-#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1099 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp281_ = self->priv->handle;
-#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1099 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp282_ = option;
-#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1099 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp283_ = index;
-#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1099 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp284_ = option;
-#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1099 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp285_ = job;
-#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1099 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp286_ = _tmp285_->page_height;
-#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1099 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp287_ = job;
-#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1099 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp288_ = _tmp287_->dpi;
-#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1099 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp289_ = scanner_convert_page_size (self, _tmp284_, (gdouble) _tmp286_, _tmp288_);
-#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1099 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			scanner_set_fixed_or_int_option (self, _tmp281_, _tmp282_, _tmp283_, _tmp289_, NULL);
-#line 10165 "scanner.c"
+#line 10185 "scanner.c"
 		}
-#line 1100 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp290_ = self->priv->handle;
-#line 1100 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp291_ = SANE_NAME_BRIGHTNESS;
-#line 1100 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp293_ = scanner_get_option_by_name (self, _tmp290_, _tmp291_, &_tmp292_);
-#line 1100 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		index = (SANE_Int) _tmp292_;
-#line 1100 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		option = _tmp293_;
 #line 1101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		option = _tmp293_;
+#line 1102 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp294_ = option;
-#line 1101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1102 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp294_ != NULL) {
-#line 10181 "scanner.c"
+#line 10201 "scanner.c"
 			ScanJob* _tmp295_ = NULL;
 			gint _tmp296_ = 0;
-#line 1103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1104 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp295_ = job;
-#line 1103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1104 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp296_ = _tmp295_->brightness;
-#line 1103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1104 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp296_ != 0) {
-#line 10190 "scanner.c"
+#line 10210 "scanner.c"
 				gint brightness = 0;
 				SANE_Option_Descriptor* _tmp297_ = NULL;
 				ScanJob* _tmp298_ = NULL;
@@ -10204,53 +10224,53 @@ static void scanner_do_get_option (Scanner* self) {
 				SANE_Option_Descriptor* _tmp302_ = NULL;
 				SANE_Int _tmp303_ = {0};
 				gint _tmp304_ = 0;
-#line 1105 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1106 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp297_ = option;
-#line 1105 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1106 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp298_ = job;
-#line 1105 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1106 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp299_ = _tmp298_->brightness;
-#line 1105 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1106 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp300_ = scanner_scale_int (self, -100, 100, _tmp297_, _tmp299_);
-#line 1105 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				brightness = _tmp300_;
 #line 1106 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				brightness = _tmp300_;
+#line 1107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp301_ = self->priv->handle;
-#line 1106 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp302_ = option;
-#line 1106 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp303_ = index;
-#line 1106 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp304_ = brightness;
-#line 1106 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_int_option (self, _tmp301_, _tmp302_, _tmp303_, _tmp304_, NULL);
-#line 10220 "scanner.c"
+#line 10240 "scanner.c"
 			}
 		}
-#line 1109 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1110 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp305_ = self->priv->handle;
-#line 1109 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1110 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp306_ = SANE_NAME_CONTRAST;
-#line 1109 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1110 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp308_ = scanner_get_option_by_name (self, _tmp305_, _tmp306_, &_tmp307_);
-#line 1109 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1110 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		index = (SANE_Int) _tmp307_;
-#line 1109 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		option = _tmp308_;
 #line 1110 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		option = _tmp308_;
+#line 1111 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp309_ = option;
-#line 1110 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1111 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp309_ != NULL) {
-#line 10237 "scanner.c"
+#line 10257 "scanner.c"
 			ScanJob* _tmp310_ = NULL;
 			gint _tmp311_ = 0;
-#line 1112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1113 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp310_ = job;
-#line 1112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1113 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp311_ = _tmp310_->contrast;
-#line 1112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1113 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp311_ != 0) {
-#line 10246 "scanner.c"
+#line 10266 "scanner.c"
 				gint contrast = 0;
 				SANE_Option_Descriptor* _tmp312_ = NULL;
 				ScanJob* _tmp313_ = NULL;
@@ -10260,34 +10280,34 @@ static void scanner_do_get_option (Scanner* self) {
 				SANE_Option_Descriptor* _tmp317_ = NULL;
 				SANE_Int _tmp318_ = {0};
 				gint _tmp319_ = 0;
-#line 1114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1115 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp312_ = option;
-#line 1114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1115 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp313_ = job;
-#line 1114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1115 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp314_ = _tmp313_->contrast;
-#line 1114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1115 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp315_ = scanner_scale_int (self, -100, 100, _tmp312_, _tmp314_);
-#line 1114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				contrast = _tmp315_;
 #line 1115 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				contrast = _tmp315_;
+#line 1116 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp316_ = self->priv->handle;
-#line 1115 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1116 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp317_ = option;
-#line 1115 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1116 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp318_ = index;
-#line 1115 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1116 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp319_ = contrast;
-#line 1115 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1116 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_int_option (self, _tmp316_, _tmp317_, _tmp318_, _tmp319_, NULL);
-#line 10276 "scanner.c"
+#line 10296 "scanner.c"
 			}
 		}
-#line 1120 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1121 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp320_ = self->priv->current_device;
-#line 1120 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1121 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (g_strcmp0 (_tmp320_, "test") == 0) {
-#line 10283 "scanner.c"
+#line 10303 "scanner.c"
 			SANE_Handle _tmp321_ = {0};
 			gint _tmp322_ = 0;
 			SANE_Option_Descriptor* _tmp323_ = NULL;
@@ -10308,202 +10328,202 @@ static void scanner_do_get_option (Scanner* self) {
 			gint _tmp350_ = 0;
 			SANE_Option_Descriptor* _tmp351_ = NULL;
 			SANE_Option_Descriptor* _tmp352_ = NULL;
-#line 1122 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1123 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp321_ = self->priv->handle;
-#line 1122 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1123 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp323_ = scanner_get_option_by_name (self, _tmp321_, "hand-scanner", &_tmp322_);
-#line 1122 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1123 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			index = (SANE_Int) _tmp322_;
-#line 1122 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			option = _tmp323_;
 #line 1123 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			option = _tmp323_;
+#line 1124 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp324_ = option;
-#line 1123 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1124 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp324_ != NULL) {
-#line 10316 "scanner.c"
+#line 10336 "scanner.c"
 				SANE_Handle _tmp325_ = {0};
 				SANE_Option_Descriptor* _tmp326_ = NULL;
 				SANE_Int _tmp327_ = {0};
-#line 1124 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1125 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp325_ = self->priv->handle;
-#line 1124 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1125 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp326_ = option;
-#line 1124 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1125 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp327_ = index;
-#line 1124 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1125 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_bool_option (self, _tmp325_, _tmp326_, _tmp327_, FALSE, NULL);
-#line 10328 "scanner.c"
+#line 10348 "scanner.c"
 			}
-#line 1125 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1126 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp328_ = self->priv->handle;
-#line 1125 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1126 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp330_ = scanner_get_option_by_name (self, _tmp328_, "three-pass", &_tmp329_);
-#line 1125 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1126 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			index = (SANE_Int) _tmp329_;
-#line 1125 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			option = _tmp330_;
 #line 1126 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			option = _tmp330_;
+#line 1127 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp331_ = option;
-#line 1126 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1127 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp331_ != NULL) {
-#line 10342 "scanner.c"
+#line 10362 "scanner.c"
 				SANE_Handle _tmp332_ = {0};
 				SANE_Option_Descriptor* _tmp333_ = NULL;
 				SANE_Int _tmp334_ = {0};
-#line 1127 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1128 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp332_ = self->priv->handle;
-#line 1127 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1128 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp333_ = option;
-#line 1127 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1128 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp334_ = index;
-#line 1127 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1128 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_bool_option (self, _tmp332_, _tmp333_, _tmp334_, FALSE, NULL);
-#line 10354 "scanner.c"
+#line 10374 "scanner.c"
 			}
-#line 1128 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1129 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp335_ = self->priv->handle;
-#line 1128 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1129 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp337_ = scanner_get_option_by_name (self, _tmp335_, "test-picture", &_tmp336_);
-#line 1128 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1129 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			index = (SANE_Int) _tmp336_;
-#line 1128 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			option = _tmp337_;
 #line 1129 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			option = _tmp337_;
+#line 1130 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp338_ = option;
-#line 1129 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1130 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp338_ != NULL) {
-#line 10368 "scanner.c"
+#line 10388 "scanner.c"
 				SANE_Handle _tmp339_ = {0};
 				SANE_Option_Descriptor* _tmp340_ = NULL;
 				SANE_Int _tmp341_ = {0};
-#line 1130 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp339_ = self->priv->handle;
-#line 1130 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp340_ = option;
-#line 1130 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp341_ = index;
-#line 1130 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_string_option (self, _tmp339_, _tmp340_, _tmp341_, "Color pattern", NULL);
-#line 10380 "scanner.c"
+#line 10400 "scanner.c"
 			}
-#line 1131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1132 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp342_ = self->priv->handle;
-#line 1131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1132 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp344_ = scanner_get_option_by_name (self, _tmp342_, "read-delay", &_tmp343_);
-#line 1131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1132 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			index = (SANE_Int) _tmp343_;
-#line 1131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			option = _tmp344_;
 #line 1132 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			option = _tmp344_;
+#line 1133 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp345_ = option;
-#line 1132 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1133 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp345_ != NULL) {
-#line 10394 "scanner.c"
+#line 10414 "scanner.c"
 				SANE_Handle _tmp346_ = {0};
 				SANE_Option_Descriptor* _tmp347_ = NULL;
 				SANE_Int _tmp348_ = {0};
-#line 1133 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1134 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp346_ = self->priv->handle;
-#line 1133 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1134 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp347_ = option;
-#line 1133 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1134 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp348_ = index;
-#line 1133 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1134 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_bool_option (self, _tmp346_, _tmp347_, _tmp348_, TRUE, NULL);
-#line 10406 "scanner.c"
+#line 10426 "scanner.c"
 			}
-#line 1134 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1135 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp349_ = self->priv->handle;
-#line 1134 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1135 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp351_ = scanner_get_option_by_name (self, _tmp349_, "read-delay-duration", &_tmp350_);
-#line 1134 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1135 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			index = (SANE_Int) _tmp350_;
-#line 1134 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			option = _tmp351_;
 #line 1135 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			option = _tmp351_;
+#line 1136 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp352_ = option;
-#line 1135 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1136 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp352_ != NULL) {
-#line 10420 "scanner.c"
+#line 10440 "scanner.c"
 				SANE_Handle _tmp353_ = {0};
 				SANE_Option_Descriptor* _tmp354_ = NULL;
 				SANE_Int _tmp355_ = {0};
-#line 1136 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1137 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp353_ = self->priv->handle;
-#line 1136 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1137 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp354_ = option;
-#line 1136 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1137 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp355_ = index;
-#line 1136 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1137 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_int_option (self, _tmp353_, _tmp354_, _tmp355_, 200000, NULL);
-#line 10432 "scanner.c"
+#line 10452 "scanner.c"
 			}
 		}
-#line 1139 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		self->priv->state = SCAN_STATE_START;
 #line 1140 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		self->priv->state = SCAN_STATE_START;
+#line 1141 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
-#line 1140 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1141 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 10441 "scanner.c"
+#line 10461 "scanner.c"
 	}
-#line 1143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1144 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp356_ = index;
-#line 1143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1144 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp357_ = option;
-#line 1143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1144 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_log_option (self, _tmp356_, _tmp357_);
-#line 1146 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1147 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp358_ = option;
-#line 1146 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1147 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp359_ = _tmp358_->type;
-#line 1146 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp359_ == SANE_TYPE_GROUP) {
 #line 1147 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	if (_tmp359_ == SANE_TYPE_GROUP) {
+#line 1148 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
-#line 1147 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1148 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 10459 "scanner.c"
+#line 10479 "scanner.c"
 	}
-#line 1150 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1151 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp360_ = option;
-#line 1150 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1151 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp361_ = _tmp360_->cap;
-#line 1150 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if ((_tmp361_ & SANE_CAP_INACTIVE) != ((SANE_Int) 0)) {
 #line 1151 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	if ((_tmp361_ & SANE_CAP_INACTIVE) != ((SANE_Int) 0)) {
+#line 1152 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
-#line 1151 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1152 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 10471 "scanner.c"
+#line 10491 "scanner.c"
 	}
-#line 1154 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp362_ = option;
-#line 1154 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp363_ = _tmp362_->name;
-#line 1154 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp363_ == NULL) {
 #line 1155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	if (_tmp363_ == NULL) {
+#line 1156 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
-#line 1155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1156 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 10483 "scanner.c"
+#line 10503 "scanner.c"
 	}
-#line 1157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1158 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp364_ = self->priv->options;
-#line 1157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1158 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp365_ = option;
-#line 1157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1158 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp366_ = _tmp365_->name;
-#line 1157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1158 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp367_ = g_strdup (_tmp366_);
-#line 1157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1158 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp368_ = index;
-#line 1157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1158 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_hash_table_insert (_tmp364_, _tmp367_, (gpointer) ((gintptr) ((gint) _tmp368_)));
-#line 879 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 880 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (job);
-#line 10499 "scanner.c"
+#line 10519 "scanner.c"
 }
 
 
@@ -10511,54 +10531,54 @@ static gdouble scanner_convert_page_size (Scanner* self, SANE_Option_Descriptor*
 	gdouble result = 0.0;
 	SANE_Option_Descriptor* _tmp0_ = NULL;
 	SANE_Unit _tmp1_ = 0;
-#line 1160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1161 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, 0.0);
-#line 1160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1161 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (option != NULL, 0.0);
-#line 1162 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1163 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = option;
-#line 1162 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1163 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_->unit;
-#line 1162 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1163 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ == SANE_UNIT_PIXEL) {
-#line 10517 "scanner.c"
+#line 10537 "scanner.c"
 		gdouble _tmp2_ = 0.0;
 		gdouble _tmp3_ = 0.0;
-#line 1163 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1164 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp2_ = dpi;
-#line 1163 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1164 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp3_ = size;
-#line 1163 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1164 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		result = (_tmp2_ * _tmp3_) / 254.0;
-#line 1163 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1164 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
-#line 10528 "scanner.c"
+#line 10548 "scanner.c"
 	} else {
 		SANE_Option_Descriptor* _tmp4_ = NULL;
 		SANE_Unit _tmp5_ = 0;
-#line 1164 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1165 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp4_ = option;
-#line 1164 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1165 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp5_ = _tmp4_->unit;
-#line 1164 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1165 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp5_ == SANE_UNIT_MM) {
-#line 10538 "scanner.c"
+#line 10558 "scanner.c"
 			gdouble _tmp6_ = 0.0;
-#line 1165 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1166 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp6_ = size;
-#line 1165 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1166 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp6_ / 10.0;
-#line 1165 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1166 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 10546 "scanner.c"
+#line 10566 "scanner.c"
 		} else {
-#line 1168 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			g_warning ("scanner.vala:1168: Unable to set unsupported unit type");
 #line 1169 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			g_warning ("scanner.vala:1169: Unable to set unsupported unit type");
+#line 1170 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = (gdouble) 0.0f;
-#line 1169 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1170 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 10554 "scanner.c"
+#line 10574 "scanner.c"
 		}
 	}
 }
@@ -10574,51 +10594,51 @@ static SANE_Option_Descriptor* scanner_get_option_by_name (Scanner* self, SANE_H
 	SANE_Handle _tmp4_ = {0};
 	gint _tmp5_ = 0;
 	SANE_Option_Descriptor* _tmp6_ = NULL;
-#line 1173 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1174 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1173 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1174 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 1175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1176 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->options;
-#line 1175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1176 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = name;
-#line 1175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1176 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = g_hash_table_lookup (_tmp0_, _tmp1_);
-#line 1175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_vala_index = (gint) ((gintptr) _tmp2_);
 #line 1176 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_vala_index = (gint) ((gintptr) _tmp2_);
+#line 1177 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = _vala_index;
-#line 1176 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp3_ == 0) {
 #line 1177 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	if (_tmp3_ == 0) {
+#line 1178 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		result = NULL;
-#line 1177 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1178 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (index) {
-#line 1177 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1178 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			*index = _vala_index;
-#line 10592 "scanner.c"
+#line 10612 "scanner.c"
 		}
-#line 1177 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1178 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
-#line 10596 "scanner.c"
+#line 10616 "scanner.c"
 	}
-#line 1179 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = handle;
-#line 1179 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = _vala_index;
-#line 1179 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = sane_get_option_descriptor (_tmp4_, (SANE_Int) _tmp5_);
-#line 1179 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = _tmp6_;
-#line 1179 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (index) {
-#line 1179 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*index = _vala_index;
-#line 10610 "scanner.c"
+#line 10630 "scanner.c"
 	}
-#line 1179 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 10614 "scanner.c"
+#line 10634 "scanner.c"
 }
 
 
@@ -10628,41 +10648,41 @@ static void scanner_do_complete_document (Scanner* self) {
 	GList* _tmp2_ = NULL;
 	NotifyDocumentDone* _tmp3_ = NULL;
 	NotifyDocumentDone* _tmp4_ = NULL;
-#line 1182 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1183 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 1184 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1185 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->handle;
-#line 1184 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	sane_cancel (_tmp0_);
 #line 1185 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:1185: sane_cancel ()");
-#line 1187 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	sane_cancel (_tmp0_);
+#line 1186 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:1186: sane_cancel ()");
+#line 1188 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = self->priv->job_queue;
-#line 1187 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1188 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->job_queue = g_list_remove_link (self->priv->job_queue, _tmp1_);
-#line 1189 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1190 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->state = SCAN_STATE_IDLE;
-#line 1192 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1193 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = self->priv->job_queue;
-#line 1192 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1193 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp2_ != NULL) {
-#line 1194 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		self->priv->state = SCAN_STATE_OPEN;
 #line 1195 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		self->priv->state = SCAN_STATE_OPEN;
+#line 1196 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 10646 "scanner.c"
+#line 10666 "scanner.c"
 	}
-#line 1201 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1202 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = notify_document_done_new ();
-#line 1201 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1202 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = _tmp3_;
-#line 1201 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1202 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_notify (self, (Notify*) _tmp4_);
-#line 1201 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_notify_unref0 (_tmp4_);
 #line 1202 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_notify_unref0 (_tmp4_);
+#line 1203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_set_scanning (self, FALSE);
-#line 10658 "scanner.c"
+#line 10678 "scanner.c"
 }
 
 
@@ -10678,70 +10698,70 @@ static void scanner_do_start (Scanner* self) {
 	gchar* _tmp7_ = NULL;
 	gchar* _tmp8_ = NULL;
 	SANE_Status _tmp9_ = 0;
-#line 1205 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1206 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 1209 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1210 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = notify_expect_page_new ();
-#line 1209 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1210 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_;
-#line 1209 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1210 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_notify (self, (Notify*) _tmp1_);
-#line 1209 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1210 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_notify_unref0 (_tmp1_);
-#line 1211 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1212 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = self->priv->handle;
-#line 1211 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1212 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = sane_start (_tmp2_);
-#line 1211 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	status = _tmp3_;
 #line 1212 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	status = _tmp3_;
+#line 1213 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = self->priv->page_number;
-#line 1212 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1213 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = self->priv->pass_number;
-#line 1212 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1213 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = status;
-#line 1212 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1213 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp7_ = sane_status_to_string (_tmp6_);
-#line 1212 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1213 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp8_ = _tmp7_;
-#line 1212 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:1212: sane_start (page=%d, pass=%d) -> %s", _tmp4_, _tmp5_, _tmp8_);
-#line 1212 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_g_free0 (_tmp8_);
 #line 1213 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp9_ = status;
+	g_debug ("scanner.vala:1213: sane_start (page=%d, pass=%d) -> %s", _tmp4_, _tmp5_, _tmp8_);
 #line 1213 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp9_ == SANE_STATUS_GOOD) {
+	_g_free0 (_tmp8_);
+#line 1214 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp9_ = status;
 #line 1214 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	if (_tmp9_ == SANE_STATUS_GOOD) {
+#line 1215 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->state = SCAN_STATE_GET_PARAMETERS;
-#line 10710 "scanner.c"
+#line 10730 "scanner.c"
 	} else {
 		SANE_Status _tmp10_ = 0;
-#line 1215 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1216 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp10_ = status;
-#line 1215 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp10_ == SANE_STATUS_NO_DOCS) {
 #line 1216 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		if (_tmp10_ == SANE_STATUS_NO_DOCS) {
+#line 1217 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			scanner_do_complete_document (self);
-#line 10719 "scanner.c"
+#line 10739 "scanner.c"
 		} else {
 			SANE_Status _tmp11_ = 0;
 			const gchar* _tmp12_ = NULL;
 			SANE_Status _tmp13_ = 0;
 			const gchar* _tmp14_ = NULL;
-#line 1219 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1220 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp11_ = status;
-#line 1219 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1220 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp12_ = sane_strstatus (_tmp11_);
-#line 1219 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			g_warning ("scanner.vala:1219: Unable to start device: %s", _tmp12_);
 #line 1220 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			g_warning ("scanner.vala:1220: Unable to start device: %s", _tmp12_);
+#line 1221 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp13_ = status;
-#line 1220 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1221 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp14_ = _ ("Unable to start scan");
-#line 1220 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1221 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			scanner_fail_scan (self, (gint) _tmp13_, _tmp14_);
-#line 10737 "scanner.c"
+#line 10757 "scanner.c"
 		}
 	}
 }
@@ -10756,7 +10776,7 @@ static gchar* sane_frame_to_string (SANE_Frame frame) {
 	switch (_tmp0_) {
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_FRAME_GRAY:
-#line 10752 "scanner.c"
+#line 10772 "scanner.c"
 		{
 			gchar* _tmp1_ = NULL;
 #line 106 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -10765,11 +10785,11 @@ static gchar* sane_frame_to_string (SANE_Frame frame) {
 			result = _tmp1_;
 #line 106 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 10761 "scanner.c"
+#line 10781 "scanner.c"
 		}
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_FRAME_RGB:
-#line 10765 "scanner.c"
+#line 10785 "scanner.c"
 		{
 			gchar* _tmp2_ = NULL;
 #line 108 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -10778,11 +10798,11 @@ static gchar* sane_frame_to_string (SANE_Frame frame) {
 			result = _tmp2_;
 #line 108 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 10774 "scanner.c"
+#line 10794 "scanner.c"
 		}
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_FRAME_RED:
-#line 10778 "scanner.c"
+#line 10798 "scanner.c"
 		{
 			gchar* _tmp3_ = NULL;
 #line 110 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -10791,11 +10811,11 @@ static gchar* sane_frame_to_string (SANE_Frame frame) {
 			result = _tmp3_;
 #line 110 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 10787 "scanner.c"
+#line 10807 "scanner.c"
 		}
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_FRAME_GREEN:
-#line 10791 "scanner.c"
+#line 10811 "scanner.c"
 		{
 			gchar* _tmp4_ = NULL;
 #line 112 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -10804,11 +10824,11 @@ static gchar* sane_frame_to_string (SANE_Frame frame) {
 			result = _tmp4_;
 #line 112 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 10800 "scanner.c"
+#line 10820 "scanner.c"
 		}
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_FRAME_BLUE:
-#line 10804 "scanner.c"
+#line 10824 "scanner.c"
 		{
 			gchar* _tmp5_ = NULL;
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -10817,7 +10837,7 @@ static gchar* sane_frame_to_string (SANE_Frame frame) {
 			result = _tmp5_;
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 10813 "scanner.c"
+#line 10833 "scanner.c"
 		}
 		default:
 		{
@@ -10831,7 +10851,7 @@ static gchar* sane_frame_to_string (SANE_Frame frame) {
 			result = _tmp7_;
 #line 116 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 10827 "scanner.c"
+#line 10847 "scanner.c"
 		}
 	}
 }
@@ -10898,301 +10918,301 @@ static void scanner_do_get_parameters (Scanner* self) {
 	gint _tmp72_ = 0;
 	gint _tmp73_ = 0;
 	guchar* _tmp74_ = NULL;
-#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1227 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 1228 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1229 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->handle;
-#line 1228 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1229 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = sane_get_parameters (_tmp0_, &_tmp1_);
-#line 1228 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1229 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->parameters = _tmp1_;
-#line 1228 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	status = _tmp2_;
 #line 1229 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	status = _tmp2_;
+#line 1230 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = status;
-#line 1229 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1230 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = sane_status_to_string (_tmp3_);
-#line 1229 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1230 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = _tmp4_;
-#line 1229 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:1229: sane_get_parameters () -> %s", _tmp5_);
-#line 1229 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_g_free0 (_tmp5_);
 #line 1230 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp6_ = status;
+	g_debug ("scanner.vala:1230: sane_get_parameters () -> %s", _tmp5_);
 #line 1230 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_g_free0 (_tmp5_);
+#line 1231 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp6_ = status;
+#line 1231 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp6_ != SANE_STATUS_GOOD) {
-#line 10918 "scanner.c"
+#line 10938 "scanner.c"
 		SANE_Status _tmp7_ = 0;
 		const gchar* _tmp8_ = NULL;
 		SANE_Status _tmp9_ = 0;
 		const gchar* _tmp10_ = NULL;
-#line 1232 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1233 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = status;
-#line 1232 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1233 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_ = sane_strstatus (_tmp7_);
-#line 1232 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_warning ("scanner.vala:1232: Unable to get device parameters: %s", _tmp8_);
 #line 1233 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		g_warning ("scanner.vala:1233: Unable to get device parameters: %s", _tmp8_);
+#line 1234 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = status;
-#line 1233 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1234 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp10_ = _ ("Error communicating with scanner");
-#line 1233 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1234 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_fail_scan (self, (gint) _tmp9_, _tmp10_);
-#line 1236 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1237 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 10937 "scanner.c"
+#line 10957 "scanner.c"
 	}
-#line 1239 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = self->priv->job_queue;
-#line 1239 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp12_ = _tmp11_->data;
-#line 1239 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp13_ = _scan_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST ((ScanJob*) _tmp12_, TYPE_SCAN_JOB, ScanJob));
-#line 1239 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	job = _tmp13_;
-#line 1243 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1244 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp15_ = self->priv->parameters;
-#line 1243 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1244 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp16_ = _tmp15_.last_frame;
-#line 1243 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1244 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp16_) {
-#line 1243 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1244 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = "SANE_TRUE";
-#line 10955 "scanner.c"
+#line 10975 "scanner.c"
 	} else {
-#line 1243 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1244 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = "SANE_FALSE";
-#line 10959 "scanner.c"
+#line 10979 "scanner.c"
 	}
-#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1242 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp17_ = self->priv->parameters;
-#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1242 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp18_ = _tmp17_.format;
-#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1242 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp19_ = sane_frame_to_string (_tmp18_);
-#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1242 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp20_ = _tmp19_;
-#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1242 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp21_ = self->priv->parameters;
-#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1242 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp22_ = _tmp21_.bytes_per_line;
-#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1242 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp23_ = self->priv->parameters;
-#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1242 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp24_ = _tmp23_.pixels_per_line;
-#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1242 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp25_ = self->priv->parameters;
-#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1242 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp26_ = _tmp25_.lines;
-#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1242 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp27_ = self->priv->parameters;
-#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1242 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp28_ = _tmp27_.depth;
-#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:1241: Parameters: format=%s last_frame=%s bytes_per_line=" \
+#line 1242 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:1242: Parameters: format=%s last_frame=%s bytes_per_line=" \
 "%d pixels_per_line=%d lines=%d depth=%d", _tmp20_, _tmp14_, _tmp22_, _tmp24_, _tmp26_, _tmp28_);
-#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1242 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp20_);
-#line 1249 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1250 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp29_ = scan_page_info_new ();
-#line 1249 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	info = _tmp29_;
 #line 1250 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	info = _tmp29_;
+#line 1251 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp30_ = info;
-#line 1250 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1251 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp31_ = self->priv->parameters;
-#line 1250 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1251 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp32_ = _tmp31_.pixels_per_line;
-#line 1250 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp30_->width = _tmp32_;
 #line 1251 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp30_->width = _tmp32_;
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp33_ = info;
-#line 1251 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp34_ = self->priv->parameters;
-#line 1251 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp35_ = _tmp34_.lines;
-#line 1251 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp33_->height = _tmp35_;
 #line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp33_->height = _tmp35_;
+#line 1253 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp36_ = info;
-#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1253 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp37_ = self->priv->parameters;
-#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1253 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp38_ = _tmp37_.depth;
-#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1253 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp36_->depth = _tmp38_;
-#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp42_ = self->priv->parameters;
-#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp43_ = _tmp42_.depth;
-#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp43_ == 8) {
-#line 11023 "scanner.c"
+#line 11043 "scanner.c"
 		SANE_Parameters _tmp44_ = {0};
 		SANE_Frame _tmp45_ = 0;
-#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp44_ = self->priv->parameters;
-#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp45_ = _tmp44_.format;
-#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp41_ = _tmp45_ == SANE_FRAME_GRAY;
-#line 11032 "scanner.c"
+#line 11052 "scanner.c"
 	} else {
-#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp41_ = FALSE;
-#line 11036 "scanner.c"
+#line 11056 "scanner.c"
 	}
-#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp41_) {
-#line 11040 "scanner.c"
+#line 11060 "scanner.c"
 		ScanJob* _tmp46_ = NULL;
 		gint _tmp47_ = 0;
-#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp46_ = job;
-#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp47_ = _tmp46_->depth;
-#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp40_ = _tmp47_ == 2;
-#line 11049 "scanner.c"
+#line 11069 "scanner.c"
 	} else {
-#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp40_ = FALSE;
-#line 11053 "scanner.c"
+#line 11073 "scanner.c"
 	}
-#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp40_) {
-#line 11057 "scanner.c"
+#line 11077 "scanner.c"
 		ScanJob* _tmp48_ = NULL;
 		ScanMode _tmp49_ = 0;
-#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp48_ = job;
-#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp49_ = _tmp48_->scan_mode;
-#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp39_ = _tmp49_ == SCAN_MODE_GRAY;
-#line 11066 "scanner.c"
+#line 11086 "scanner.c"
 	} else {
-#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp39_ = FALSE;
-#line 11070 "scanner.c"
+#line 11090 "scanner.c"
 	}
-#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp39_) {
-#line 11074 "scanner.c"
+#line 11094 "scanner.c"
 		ScanPageInfo* _tmp50_ = NULL;
 		ScanJob* _tmp51_ = NULL;
 		gint _tmp52_ = 0;
-#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1257 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp50_ = info;
-#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1257 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp51_ = job;
-#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1257 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp52_ = _tmp51_->depth;
-#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1257 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp50_->depth = _tmp52_;
-#line 11086 "scanner.c"
+#line 11106 "scanner.c"
 	}
-#line 1257 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1258 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp54_ = self->priv->parameters;
-#line 1257 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1258 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp55_ = _tmp54_.format;
-#line 1257 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1258 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp55_ == SANE_FRAME_GRAY) {
-#line 1257 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1258 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp53_ = 1;
-#line 11096 "scanner.c"
+#line 11116 "scanner.c"
 	} else {
-#line 1257 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1258 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp53_ = 3;
-#line 11100 "scanner.c"
+#line 11120 "scanner.c"
 	}
-#line 1257 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1258 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp56_ = info;
-#line 1257 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp56_->n_channels = _tmp53_;
 #line 1258 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp56_->n_channels = _tmp53_;
+#line 1259 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp57_ = info;
-#line 1258 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1259 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp58_ = job;
-#line 1258 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1259 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp59_ = _tmp58_->dpi;
-#line 1258 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp57_->dpi = _tmp59_;
 #line 1259 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp57_->dpi = _tmp59_;
+#line 1260 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp60_ = info;
-#line 1259 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1260 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp61_ = self->priv->current_device;
-#line 1259 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1260 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp62_ = g_strdup (_tmp61_);
-#line 1259 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1260 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp60_->device);
-#line 1259 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1260 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp60_->device = _tmp62_;
-#line 1261 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1262 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp63_ = self->priv->page_number;
-#line 1261 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1262 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp64_ = self->priv->notified_page;
-#line 1261 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1262 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp63_ != _tmp64_) {
-#line 11130 "scanner.c"
+#line 11150 "scanner.c"
 		ScanJob* _tmp65_ = NULL;
 		gint _tmp66_ = 0;
 		ScanPageInfo* _tmp67_ = NULL;
 		NotifyGotPageInfo* _tmp68_ = NULL;
 		NotifyGotPageInfo* _tmp69_ = NULL;
 		gint _tmp70_ = 0;
-#line 1263 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1264 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp65_ = job;
-#line 1263 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1264 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp66_ = _tmp65_->id;
-#line 1263 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1264 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp67_ = info;
-#line 1263 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1264 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp68_ = notify_got_page_info_new (_tmp66_, _tmp67_);
-#line 1263 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1264 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp69_ = _tmp68_;
-#line 1263 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1264 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_notify (self, (Notify*) _tmp69_);
-#line 1263 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_notify_unref0 (_tmp69_);
 #line 1264 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_notify_unref0 (_tmp69_);
+#line 1265 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp70_ = self->priv->page_number;
-#line 1264 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1265 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->notified_page = _tmp70_;
-#line 11155 "scanner.c"
+#line 11175 "scanner.c"
 	}
-#line 1268 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1269 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp71_ = self->priv->parameters;
-#line 1268 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1269 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp72_ = _tmp71_.bytes_per_line;
-#line 1268 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	buffer_size = _tmp72_ + 1;
 #line 1269 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	buffer_size = _tmp72_ + 1;
+#line 1270 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp73_ = buffer_size;
-#line 1269 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1270 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp74_ = g_new0 (guchar, _tmp73_);
-#line 1269 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1270 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->buffer = (g_free (self->priv->buffer), NULL);
-#line 1269 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1270 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->buffer = _tmp74_;
-#line 1269 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1270 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->buffer_length1 = _tmp73_;
-#line 1269 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->priv->_buffer_size_ = self->priv->buffer_length1;
 #line 1270 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->priv->n_used = 0;
+	self->priv->_buffer_size_ = self->priv->buffer_length1;
 #line 1271 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->priv->line_count = 0;
+	self->priv->n_used = 0;
 #line 1272 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->priv->pass_number = 0;
+	self->priv->line_count = 0;
 #line 1273 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	self->priv->pass_number = 0;
+#line 1274 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->state = SCAN_STATE_READ;
-#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1227 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_page_info_unref0 (info);
-#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1227 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (job);
-#line 11187 "scanner.c"
+#line 11207 "scanner.c"
 }
 
 
@@ -11209,91 +11229,91 @@ static void scanner_do_complete_page (Scanner* self) {
 	gboolean _tmp8_ = FALSE;
 	ScanJob* _tmp10_ = NULL;
 	ScanType _tmp11_ = 0;
-#line 1276 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1277 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 1278 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1279 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->job_queue;
-#line 1278 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1279 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_->data;
-#line 1278 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1279 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = _scan_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST ((ScanJob*) _tmp1_, TYPE_SCAN_JOB, ScanJob));
-#line 1278 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1279 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	job = _tmp2_;
-#line 1280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1281 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = job;
-#line 1280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1281 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = _tmp3_->id;
-#line 1280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1281 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = notify_page_done_new (_tmp4_);
-#line 1280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1281 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = _tmp5_;
-#line 1280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1281 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_notify (self, (Notify*) _tmp6_);
-#line 1280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1281 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_notify_unref0 (_tmp6_);
-#line 1283 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1284 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp7_ = self->priv->parameters;
-#line 1283 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1284 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp8_ = _tmp7_.last_frame;
-#line 1283 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1284 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!_tmp8_) {
-#line 11232 "scanner.c"
+#line 11252 "scanner.c"
 		gint _tmp9_ = 0;
-#line 1285 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1286 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = self->priv->pass_number;
-#line 1285 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		self->priv->pass_number = _tmp9_ + 1;
 #line 1286 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		self->priv->state = SCAN_STATE_START;
+		self->priv->pass_number = _tmp9_ + 1;
 #line 1287 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		self->priv->state = SCAN_STATE_START;
+#line 1288 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
-#line 1287 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1288 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 11244 "scanner.c"
+#line 11264 "scanner.c"
 	}
-#line 1291 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1292 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = job;
-#line 1291 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1292 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = _tmp10_->type;
-#line 1291 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1292 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp11_ != SCAN_TYPE_SINGLE) {
-#line 11252 "scanner.c"
+#line 11272 "scanner.c"
 		gint _tmp12_ = 0;
 		ScanJob* _tmp13_ = NULL;
 		gint _tmp14_ = 0;
 		NotifyPageDone* _tmp15_ = NULL;
 		NotifyPageDone* _tmp16_ = NULL;
-#line 1293 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1294 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp12_ = self->priv->page_number;
-#line 1293 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		self->priv->page_number = _tmp12_ + 1;
 #line 1294 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		self->priv->pass_number = 0;
+		self->priv->page_number = _tmp12_ + 1;
 #line 1295 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		self->priv->pass_number = 0;
+#line 1296 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp13_ = job;
-#line 1295 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1296 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = _tmp13_->id;
-#line 1295 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1296 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp15_ = notify_page_done_new (_tmp14_);
-#line 1295 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1296 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp16_ = _tmp15_;
-#line 1295 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1296 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_notify (self, (Notify*) _tmp16_);
-#line 1295 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_notify_unref0 (_tmp16_);
 #line 1296 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		self->priv->state = SCAN_STATE_START;
+		_notify_unref0 (_tmp16_);
 #line 1297 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		self->priv->state = SCAN_STATE_START;
+#line 1298 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
-#line 1297 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1298 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 11282 "scanner.c"
+#line 11302 "scanner.c"
 	}
-#line 1300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1301 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_do_complete_document (self);
-#line 1276 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1277 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (job);
-#line 11288 "scanner.c"
+#line 11308 "scanner.c"
 }
 
 
@@ -11332,199 +11352,199 @@ static void scanner_do_read (Scanner* self) {
 	gint _tmp40_ = 0;
 	SANE_Parameters _tmp41_ = {0};
 	gint _tmp42_ = 0;
-#line 1303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1304 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 1305 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1306 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->job_queue;
-#line 1305 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1306 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_->data;
-#line 1305 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1306 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = _scan_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST ((ScanJob*) _tmp1_, TYPE_SCAN_JOB, ScanJob));
-#line 1305 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1306 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	job = _tmp2_;
-#line 1308 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1309 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = self->priv->buffer;
-#line 1308 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1309 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3__length1 = self->priv->buffer_length1;
-#line 1308 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1309 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = self->priv->n_used;
-#line 1308 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1309 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	n_to_read = _tmp3__length1 - _tmp4_;
-#line 1311 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1312 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = self->priv->buffer;
-#line 1311 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1312 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5__length1 = self->priv->buffer_length1;
-#line 1311 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	b = (guchar*) _tmp5_;
 #line 1312 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	b = (guchar*) _tmp5_;
+#line 1313 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = self->priv->handle;
-#line 1312 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1313 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp7_ = b;
-#line 1312 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1313 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp8_ = self->priv->n_used;
-#line 1312 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1313 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp9_ = n_to_read;
-#line 1312 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1313 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = sane_read (_tmp6_, (guint8*) (_tmp7_ + _tmp8_), (SANE_Int) _tmp9_, &_tmp10_);
-#line 1312 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1313 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	n_read = _tmp10_;
-#line 1312 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	status = _tmp11_;
 #line 1313 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	status = _tmp11_;
+#line 1314 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp12_ = n_to_read;
-#line 1313 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1314 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp13_ = status;
-#line 1313 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1314 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp14_ = sane_status_to_string (_tmp13_);
-#line 1313 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1314 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp15_ = _tmp14_;
-#line 1313 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1314 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp16_ = n_read;
-#line 1313 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:1313: sane_read (%d) -> (%s, %d)", _tmp12_, _tmp15_, (gint) _tmp16_);
-#line 1313 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1314 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:1314: sane_read (%d) -> (%s, %d)", _tmp12_, _tmp15_, (gint) _tmp16_);
+#line 1314 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp15_);
-#line 1316 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1317 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp17_ = status;
-#line 1316 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1317 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp17_ == SANE_STATUS_EOF) {
-#line 11383 "scanner.c"
+#line 11403 "scanner.c"
 		gboolean _tmp18_ = FALSE;
 		SANE_Parameters _tmp19_ = {0};
 		gint _tmp20_ = 0;
 		gint _tmp27_ = 0;
-#line 1318 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1319 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp19_ = self->priv->parameters;
-#line 1318 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1319 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp20_ = _tmp19_.lines;
-#line 1318 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1319 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp20_ > 0) {
-#line 11394 "scanner.c"
+#line 11414 "scanner.c"
 			gint _tmp21_ = 0;
 			SANE_Parameters _tmp22_ = {0};
 			gint _tmp23_ = 0;
-#line 1318 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1319 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp21_ = self->priv->line_count;
-#line 1318 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1319 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp22_ = self->priv->parameters;
-#line 1318 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1319 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp23_ = _tmp22_.lines;
-#line 1318 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1319 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp18_ = _tmp21_ != _tmp23_;
-#line 11406 "scanner.c"
+#line 11426 "scanner.c"
 		} else {
-#line 1318 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1319 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp18_ = FALSE;
-#line 11410 "scanner.c"
+#line 11430 "scanner.c"
 		}
-#line 1318 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1319 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp18_) {
-#line 11414 "scanner.c"
+#line 11434 "scanner.c"
 			gint _tmp24_ = 0;
 			SANE_Parameters _tmp25_ = {0};
 			gint _tmp26_ = 0;
-#line 1319 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1320 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp24_ = self->priv->line_count;
-#line 1319 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1320 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp25_ = self->priv->parameters;
-#line 1319 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1320 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp26_ = _tmp25_.lines;
-#line 1319 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			g_warning ("scanner.vala:1319: Scan completed with %d lines, expected %d lines", _tmp24_, _tmp26_);
-#line 11426 "scanner.c"
-		}
 #line 1320 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			g_warning ("scanner.vala:1320: Scan completed with %d lines, expected %d lines", _tmp24_, _tmp26_);
+#line 11446 "scanner.c"
+		}
+#line 1321 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp27_ = self->priv->n_used;
-#line 1320 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1321 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp27_ > 0) {
-#line 11432 "scanner.c"
+#line 11452 "scanner.c"
 			gint _tmp28_ = 0;
-#line 1321 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1322 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp28_ = self->priv->n_used;
-#line 1321 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			g_warning ("scanner.vala:1321: Scan complete with %d bytes of unused data", _tmp28_);
-#line 11438 "scanner.c"
-		}
 #line 1322 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		scanner_do_complete_page (self);
+			g_warning ("scanner.vala:1322: Scan complete with %d bytes of unused data", _tmp28_);
+#line 11458 "scanner.c"
+		}
 #line 1323 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		scanner_do_complete_page (self);
+#line 1324 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
-#line 1323 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1324 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 11446 "scanner.c"
+#line 11466 "scanner.c"
 	}
-#line 1327 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1328 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp29_ = status;
-#line 1327 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1328 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp29_ != SANE_STATUS_GOOD) {
-#line 11452 "scanner.c"
+#line 11472 "scanner.c"
 		SANE_Status _tmp30_ = 0;
 		const gchar* _tmp31_ = NULL;
 		SANE_Status _tmp32_ = 0;
 		const gchar* _tmp33_ = NULL;
-#line 1329 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1330 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp30_ = status;
-#line 1329 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1330 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp31_ = sane_strstatus (_tmp30_);
-#line 1329 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_warning ("scanner.vala:1329: Unable to read frame from device: %s", _tmp31_);
 #line 1330 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		g_warning ("scanner.vala:1330: Unable to read frame from device: %s", _tmp31_);
+#line 1331 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp32_ = status;
-#line 1330 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1331 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp33_ = _ ("Error communicating with scanner");
-#line 1330 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1331 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_fail_scan (self, (gint) _tmp32_, _tmp33_);
-#line 1333 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1334 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
-#line 1333 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1334 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 11473 "scanner.c"
+#line 11493 "scanner.c"
 	}
-#line 1336 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	full_read = FALSE;
 #line 1337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	full_read = FALSE;
+#line 1338 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp35_ = self->priv->n_used;
-#line 1337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1338 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp35_ == 0) {
-#line 11481 "scanner.c"
+#line 11501 "scanner.c"
 		SANE_Int _tmp36_ = {0};
 		guchar* _tmp37_ = NULL;
 		gint _tmp37__length1 = 0;
-#line 1337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1338 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp36_ = n_read;
-#line 1337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1338 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp37_ = self->priv->buffer;
-#line 1337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1338 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp37__length1 = self->priv->buffer_length1;
-#line 1337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1338 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp34_ = _tmp36_ == ((SANE_Int) _tmp37__length1);
-#line 11493 "scanner.c"
+#line 11513 "scanner.c"
 	} else {
-#line 1337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1338 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp34_ = FALSE;
-#line 11497 "scanner.c"
+#line 11517 "scanner.c"
 	}
-#line 1337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp34_) {
 #line 1338 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	if (_tmp34_) {
+#line 1339 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		full_read = TRUE;
-#line 11503 "scanner.c"
+#line 11523 "scanner.c"
 	}
-#line 1339 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1340 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp38_ = self->priv->n_used;
-#line 1339 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1340 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp39_ = n_read;
-#line 1339 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1340 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->n_used = _tmp38_ + ((gint) _tmp39_);
-#line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1343 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp40_ = self->priv->n_used;
-#line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1343 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp41_ = self->priv->parameters;
-#line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1343 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp42_ = _tmp41_.bytes_per_line;
-#line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1343 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp40_ >= _tmp42_) {
-#line 11519 "scanner.c"
+#line 11539 "scanner.c"
 		ScanLine* line = NULL;
 		ScanLine* _tmp43_ = NULL;
 		SANE_Parameters _tmp44_ = {0};
@@ -11573,215 +11593,215 @@ static void scanner_do_read (Scanner* self) {
 		ScanLine* _tmp155_ = NULL;
 		NotifyGotLine* _tmp156_ = NULL;
 		NotifyGotLine* _tmp157_ = NULL;
-#line 1344 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp43_ = scan_line_new ();
-#line 1344 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		line = _tmp43_;
 #line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		line = _tmp43_;
+#line 1346 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp44_ = self->priv->parameters;
-#line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1346 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp45_ = _tmp44_.format;
-#line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1346 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		switch (_tmp45_) {
-#line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1346 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SANE_FRAME_GRAY:
-#line 11580 "scanner.c"
+#line 11600 "scanner.c"
 			{
 				ScanLine* _tmp46_ = NULL;
-#line 1348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1349 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp46_ = line;
-#line 1348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp46_->channel = 0;
 #line 1349 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp46_->channel = 0;
+#line 1350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 11589 "scanner.c"
+#line 11609 "scanner.c"
 			}
-#line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1346 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SANE_FRAME_RGB:
-#line 11593 "scanner.c"
+#line 11613 "scanner.c"
 			{
 				ScanLine* _tmp47_ = NULL;
-#line 1351 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1352 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp47_ = line;
-#line 1351 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp47_->channel = -1;
 #line 1352 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp47_->channel = -1;
+#line 1353 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 11602 "scanner.c"
+#line 11622 "scanner.c"
 			}
-#line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1346 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SANE_FRAME_RED:
-#line 11606 "scanner.c"
+#line 11626 "scanner.c"
 			{
 				ScanLine* _tmp48_ = NULL;
-#line 1354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1355 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp48_ = line;
-#line 1354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp48_->channel = 0;
 #line 1355 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp48_->channel = 0;
+#line 1356 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 11615 "scanner.c"
+#line 11635 "scanner.c"
 			}
-#line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1346 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SANE_FRAME_GREEN:
-#line 11619 "scanner.c"
+#line 11639 "scanner.c"
 			{
 				ScanLine* _tmp49_ = NULL;
-#line 1357 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1358 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp49_ = line;
-#line 1357 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp49_->channel = 1;
 #line 1358 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp49_->channel = 1;
+#line 1359 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 11628 "scanner.c"
+#line 11648 "scanner.c"
 			}
-#line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1346 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SANE_FRAME_BLUE:
-#line 11632 "scanner.c"
+#line 11652 "scanner.c"
 			{
 				ScanLine* _tmp50_ = NULL;
-#line 1360 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp50_ = line;
-#line 1360 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp50_->channel = 2;
 #line 1361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp50_->channel = 2;
+#line 1362 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 11641 "scanner.c"
+#line 11661 "scanner.c"
 			}
 			default:
-#line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1346 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 11646 "scanner.c"
+#line 11666 "scanner.c"
 		}
-#line 1363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1364 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp51_ = line;
-#line 1363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1364 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp52_ = self->priv->parameters;
-#line 1363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1364 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp53_ = _tmp52_.pixels_per_line;
-#line 1363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp51_->width = _tmp53_;
 #line 1364 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp51_->width = _tmp53_;
+#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp54_ = line;
-#line 1364 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp55_ = self->priv->parameters;
-#line 1364 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp56_ = _tmp55_.depth;
-#line 1364 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp54_->depth = _tmp56_;
 #line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp54_->depth = _tmp56_;
+#line 1366 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp57_ = line;
-#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1366 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp58_ = self->priv->buffer;
-#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1366 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp58__length1 = self->priv->buffer_length1;
-#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1366 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->buffer = NULL;
-#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1366 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->buffer_length1 = 0;
-#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1366 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp57_->data = (g_free (_tmp57_->data), NULL);
-#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1366 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp57_->data = _tmp58_;
-#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp57_->data_length1 = _tmp58__length1;
 #line 1366 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp57_->data_length1 = _tmp58__length1;
+#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp59_ = line;
-#line 1366 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp60_ = self->priv->parameters;
-#line 1366 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp61_ = _tmp60_.bytes_per_line;
-#line 1366 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp59_->data_length = _tmp61_;
 #line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp59_->data_length = _tmp61_;
+#line 1368 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp62_ = line;
-#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1368 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp63_ = self->priv->line_count;
-#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp62_->number = _tmp63_;
 #line 1368 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp62_->number = _tmp63_;
+#line 1369 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp64_ = line;
-#line 1368 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1369 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp65_ = self->priv->n_used;
-#line 1368 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1369 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp66_ = line;
-#line 1368 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1369 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp67_ = _tmp66_->data_length;
-#line 1368 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1369 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp64_->n_lines = _tmp65_ / _tmp67_;
-#line 1370 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1371 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp68_ = self->priv->line_count;
-#line 1370 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1371 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp69_ = line;
-#line 1370 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1371 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp70_ = _tmp69_->n_lines;
-#line 1370 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1371 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->line_count = _tmp68_ + _tmp70_;
-#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp71_ = line;
-#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp72_ = _tmp71_->data;
-#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp72__length1 = _tmp71_->data_length1;
-#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		buffer_size = _tmp72__length1;
 #line 1374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		buffer_size = _tmp72__length1;
+#line 1375 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp73_ = full_read;
-#line 1374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1375 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp73_) {
-#line 11724 "scanner.c"
+#line 11744 "scanner.c"
 			gint _tmp74_ = 0;
 			SANE_Parameters _tmp75_ = {0};
 			gint _tmp76_ = 0;
-#line 1375 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1376 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp74_ = buffer_size;
-#line 1375 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1376 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp75_ = self->priv->parameters;
-#line 1375 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1376 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp76_ = _tmp75_.bytes_per_line;
-#line 1375 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1376 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			buffer_size = _tmp74_ + _tmp76_;
-#line 11736 "scanner.c"
+#line 11756 "scanner.c"
 		}
-#line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1378 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp77_ = buffer_size;
-#line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1378 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp78_ = g_new0 (guchar, _tmp77_);
-#line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1378 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->buffer = (g_free (self->priv->buffer), NULL);
-#line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1378 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->buffer = _tmp78_;
-#line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1378 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->buffer_length1 = _tmp77_;
-#line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		self->priv->_buffer_size_ = self->priv->buffer_length1;
 #line 1378 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		self->priv->_buffer_size_ = self->priv->buffer_length1;
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp79_ = self->priv->n_used;
-#line 1378 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp80_ = line;
-#line 1378 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp81_ = _tmp80_->n_lines;
-#line 1378 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp82_ = line;
-#line 1378 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp83_ = _tmp82_->data_length;
-#line 1378 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		n_remaining = _tmp79_ - (_tmp81_ * _tmp83_);
 #line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		n_remaining = _tmp79_ - (_tmp81_ * _tmp83_);
+#line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->n_used = 0;
-#line 11764 "scanner.c"
+#line 11784 "scanner.c"
 		{
 			gint i = 0;
-#line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1381 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			i = 0;
-#line 11769 "scanner.c"
+#line 11789 "scanner.c"
 			{
 				gboolean _tmp84_ = FALSE;
-#line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1381 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp84_ = TRUE;
-#line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1381 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				while (TRUE) {
-#line 11776 "scanner.c"
+#line 11796 "scanner.c"
 					gint _tmp86_ = 0;
 					gint _tmp87_ = 0;
 					guchar* _tmp88_ = NULL;
@@ -11798,147 +11818,147 @@ static void scanner_do_read (Scanner* self) {
 					guchar _tmp97_ = '\0';
 					guchar _tmp98_ = '\0';
 					gint _tmp99_ = 0;
-#line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1381 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp84_) {
-#line 11795 "scanner.c"
+#line 11815 "scanner.c"
 						gint _tmp85_ = 0;
-#line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1381 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp85_ = i;
-#line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1381 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						i = _tmp85_ + 1;
-#line 11801 "scanner.c"
+#line 11821 "scanner.c"
 					}
-#line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1381 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp84_ = FALSE;
-#line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1381 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp86_ = i;
-#line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1381 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp87_ = n_remaining;
-#line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1381 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!(_tmp86_ < _tmp87_)) {
-#line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1381 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						break;
-#line 11813 "scanner.c"
+#line 11833 "scanner.c"
 					}
-#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1383 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp88_ = self->priv->buffer;
-#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1383 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp88__length1 = self->priv->buffer_length1;
-#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1383 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp89_ = i;
-#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1383 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp90_ = line;
-#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1383 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp91_ = _tmp90_->data;
-#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1383 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp91__length1 = _tmp90_->data_length1;
-#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1383 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp92_ = i;
-#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1383 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp93_ = line;
-#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1383 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp94_ = _tmp93_->n_lines;
-#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1383 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp95_ = line;
-#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1383 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp96_ = _tmp95_->data_length;
-#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1383 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp97_ = _tmp91_[_tmp92_ + (_tmp94_ * _tmp96_)];
-#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1383 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp88_[_tmp89_] = _tmp97_;
-#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp98_ = _tmp88_[_tmp89_];
 #line 1383 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp98_ = _tmp88_[_tmp89_];
+#line 1384 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp99_ = self->priv->n_used;
-#line 1383 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1384 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					self->priv->n_used = _tmp99_ + 1;
-#line 11847 "scanner.c"
+#line 11867 "scanner.c"
 				}
 			}
 		}
-#line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp103_ = self->priv->parameters;
-#line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp104_ = _tmp103_.depth;
-#line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp104_ == 8) {
-#line 11857 "scanner.c"
+#line 11877 "scanner.c"
 			SANE_Parameters _tmp105_ = {0};
 			SANE_Frame _tmp106_ = 0;
-#line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp105_ = self->priv->parameters;
-#line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp106_ = _tmp105_.format;
-#line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp102_ = _tmp106_ == SANE_FRAME_GRAY;
-#line 11866 "scanner.c"
+#line 11886 "scanner.c"
 		} else {
-#line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp102_ = FALSE;
-#line 11870 "scanner.c"
+#line 11890 "scanner.c"
 		}
-#line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp102_) {
-#line 11874 "scanner.c"
+#line 11894 "scanner.c"
 			ScanJob* _tmp107_ = NULL;
 			gint _tmp108_ = 0;
-#line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1390 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp107_ = job;
-#line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1390 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp108_ = _tmp107_->depth;
-#line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1390 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp101_ = _tmp108_ == 2;
-#line 11883 "scanner.c"
+#line 11903 "scanner.c"
 		} else {
-#line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp101_ = FALSE;
-#line 11887 "scanner.c"
+#line 11907 "scanner.c"
 		}
-#line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp101_) {
-#line 11891 "scanner.c"
+#line 11911 "scanner.c"
 			ScanJob* _tmp109_ = NULL;
 			ScanMode _tmp110_ = 0;
-#line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1390 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp109_ = job;
-#line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1390 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp110_ = _tmp109_->scan_mode;
-#line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1390 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp100_ = _tmp110_ == SCAN_MODE_GRAY;
-#line 11900 "scanner.c"
+#line 11920 "scanner.c"
 		} else {
-#line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp100_ = FALSE;
-#line 11904 "scanner.c"
+#line 11924 "scanner.c"
 		}
-#line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp100_) {
-#line 11908 "scanner.c"
+#line 11928 "scanner.c"
 			guchar block = '\0';
 			gint write_offset = 0;
 			gint block_shift = 0;
 			ScanLine* _tmp150_ = NULL;
 			ScanLine* _tmp151_ = NULL;
 			gint _tmp152_ = 0;
-#line 1391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			block = (guchar) 0;
 #line 1392 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			write_offset = 0;
+			block = (guchar) 0;
 #line 1393 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			write_offset = 0;
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			block_shift = 6;
-#line 11921 "scanner.c"
+#line 11941 "scanner.c"
 			{
 				gint i = 0;
-#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1395 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = 0;
-#line 11926 "scanner.c"
+#line 11946 "scanner.c"
 				{
 					gboolean _tmp111_ = FALSE;
-#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1395 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp111_ = TRUE;
-#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1395 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
-#line 11933 "scanner.c"
+#line 11953 "scanner.c"
 						gint _tmp113_ = 0;
 						ScanLine* _tmp114_ = NULL;
 						gint _tmp115_ = 0;
@@ -11947,51 +11967,51 @@ static void scanner_do_read (Scanner* self) {
 						ScanLine* _tmp117_ = NULL;
 						gint _tmp118_ = 0;
 						gint _tmp143_ = 0;
-#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1395 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp111_) {
-#line 11944 "scanner.c"
+#line 11964 "scanner.c"
 							gint _tmp112_ = 0;
-#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1395 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp112_ = i;
-#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1395 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							i = _tmp112_ + 1;
-#line 11950 "scanner.c"
+#line 11970 "scanner.c"
 						}
-#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1395 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp111_ = FALSE;
-#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1395 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp113_ = i;
-#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1395 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp114_ = line;
-#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1395 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp115_ = _tmp114_->n_lines;
-#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1395 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!(_tmp113_ < _tmp115_)) {
-#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1395 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
-#line 11964 "scanner.c"
+#line 11984 "scanner.c"
 						}
-#line 1396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp116_ = i;
-#line 1396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp117_ = line;
-#line 1396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp118_ = _tmp117_->data_length;
-#line 1396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						offset = _tmp116_ * _tmp118_;
-#line 11974 "scanner.c"
+#line 11994 "scanner.c"
 						{
 							gint x = 0;
-#line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1398 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							x = 0;
-#line 11979 "scanner.c"
+#line 11999 "scanner.c"
 							{
 								gboolean _tmp119_ = FALSE;
-#line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1398 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 								_tmp119_ = TRUE;
-#line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1398 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 								while (TRUE) {
-#line 11986 "scanner.c"
+#line 12006 "scanner.c"
 									gint _tmp121_ = 0;
 									ScanLine* _tmp122_ = NULL;
 									gint _tmp123_ = 0;
@@ -12008,89 +12028,89 @@ static void scanner_do_read (Scanner* self) {
 									guchar _tmp133_ = '\0';
 									gint _tmp134_ = 0;
 									gint _tmp135_ = 0;
-#line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1398 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									if (!_tmp119_) {
-#line 12005 "scanner.c"
+#line 12025 "scanner.c"
 										gint _tmp120_ = 0;
-#line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1398 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp120_ = x;
-#line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1398 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										x = _tmp120_ + 1;
-#line 12011 "scanner.c"
+#line 12031 "scanner.c"
 									}
-#line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1398 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp119_ = FALSE;
-#line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1398 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp121_ = x;
-#line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1398 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp122_ = line;
-#line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1398 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp123_ = _tmp122_->width;
-#line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1398 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									if (!(_tmp121_ < _tmp123_)) {
-#line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1398 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										break;
-#line 12025 "scanner.c"
+#line 12045 "scanner.c"
 									}
-#line 1399 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1400 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp124_ = line;
-#line 1399 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1400 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp125_ = _tmp124_->data;
-#line 1399 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1400 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp125__length1 = _tmp124_->data_length1;
-#line 1399 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1400 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp126_ = offset;
-#line 1399 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1400 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp127_ = x;
-#line 1399 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1400 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp128_ = _tmp125_[_tmp126_ + _tmp127_];
-#line 1399 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1400 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									p = _tmp128_;
-#line 1402 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1403 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp129_ = p;
-#line 1402 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-									if (((gint) _tmp129_) >= 192) {
 #line 1403 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+									if (((gint) _tmp129_) >= 192) {
+#line 1404 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										sample = (guchar) 3;
-#line 12047 "scanner.c"
+#line 12067 "scanner.c"
 									} else {
 										guchar _tmp130_ = '\0';
-#line 1404 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1405 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp130_ = p;
-#line 1404 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-										if (((gint) _tmp130_) >= 128) {
 #line 1405 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+										if (((gint) _tmp130_) >= 128) {
+#line 1406 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 											sample = (guchar) 2;
-#line 12056 "scanner.c"
+#line 12076 "scanner.c"
 										} else {
 											guchar _tmp131_ = '\0';
-#line 1406 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1407 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 											_tmp131_ = p;
-#line 1406 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-											if (((gint) _tmp131_) >= 64) {
 #line 1407 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+											if (((gint) _tmp131_) >= 64) {
+#line 1408 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 												sample = (guchar) 1;
-#line 12065 "scanner.c"
+#line 12085 "scanner.c"
 											} else {
-#line 1409 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1410 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 												sample = (guchar) 0;
-#line 12069 "scanner.c"
+#line 12089 "scanner.c"
 											}
 										}
 									}
-#line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1412 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp132_ = block;
-#line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1412 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp133_ = sample;
-#line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1412 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp134_ = block_shift;
-#line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-									block = _tmp132_ | (_tmp133_ << _tmp134_);
 #line 1412 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+									block = _tmp132_ | (_tmp133_ << _tmp134_);
+#line 1413 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp135_ = block_shift;
-#line 1412 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1413 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									if (_tmp135_ == 0) {
-#line 12085 "scanner.c"
+#line 12105 "scanner.c"
 										ScanLine* _tmp136_ = NULL;
 										guchar* _tmp137_ = NULL;
 										gint _tmp137__length1 = 0;
@@ -12098,45 +12118,45 @@ static void scanner_do_read (Scanner* self) {
 										guchar _tmp139_ = '\0';
 										guchar _tmp140_ = '\0';
 										gint _tmp141_ = 0;
-#line 1414 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1415 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp136_ = line;
-#line 1414 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1415 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp137_ = _tmp136_->data;
-#line 1414 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1415 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp137__length1 = _tmp136_->data_length1;
-#line 1414 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1415 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp138_ = write_offset;
-#line 1414 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1415 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp139_ = block;
-#line 1414 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1415 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp137_[_tmp138_] = _tmp139_;
-#line 1414 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-										_tmp140_ = _tmp137_[_tmp138_];
 #line 1415 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+										_tmp140_ = _tmp137_[_tmp138_];
+#line 1416 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp141_ = write_offset;
-#line 1415 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-										write_offset = _tmp141_ + 1;
 #line 1416 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-										block = (guchar) 0;
+										write_offset = _tmp141_ + 1;
 #line 1417 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+										block = (guchar) 0;
+#line 1418 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										block_shift = 6;
-#line 12115 "scanner.c"
+#line 12135 "scanner.c"
 									} else {
 										gint _tmp142_ = 0;
-#line 1420 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1421 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp142_ = block_shift;
-#line 1420 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1421 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										block_shift = _tmp142_ - 2;
-#line 12122 "scanner.c"
+#line 12142 "scanner.c"
 									}
 								}
 							}
 						}
-#line 1424 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp143_ = block_shift;
-#line 1424 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (_tmp143_ != 6) {
-#line 12131 "scanner.c"
+#line 12151 "scanner.c"
 							ScanLine* _tmp144_ = NULL;
 							guchar* _tmp145_ = NULL;
 							gint _tmp145__length1 = 0;
@@ -12144,71 +12164,71 @@ static void scanner_do_read (Scanner* self) {
 							guchar _tmp147_ = '\0';
 							guchar _tmp148_ = '\0';
 							gint _tmp149_ = 0;
-#line 1426 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1427 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp144_ = line;
-#line 1426 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1427 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp145_ = _tmp144_->data;
-#line 1426 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1427 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp145__length1 = _tmp144_->data_length1;
-#line 1426 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1427 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp146_ = write_offset;
-#line 1426 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1427 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp147_ = block;
-#line 1426 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1427 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp145_[_tmp146_] = _tmp147_;
-#line 1426 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp148_ = _tmp145_[_tmp146_];
 #line 1427 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+							_tmp148_ = _tmp145_[_tmp146_];
+#line 1428 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp149_ = write_offset;
-#line 1427 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							write_offset = _tmp149_ + 1;
 #line 1428 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							block = (guchar) 0;
+							write_offset = _tmp149_ + 1;
 #line 1429 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+							block = (guchar) 0;
+#line 1430 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							block_shift = 6;
-#line 12161 "scanner.c"
+#line 12181 "scanner.c"
 						}
 					}
 				}
 			}
-#line 1433 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1434 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp150_ = line;
-#line 1433 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1434 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp151_ = line;
-#line 1433 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1434 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp152_ = _tmp151_->width;
-#line 1433 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1434 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp150_->data_length = ((_tmp152_ * 2) + 7) / 8;
-#line 12174 "scanner.c"
+#line 12194 "scanner.c"
 		}
-#line 1436 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp153_ = job;
-#line 1436 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp154_ = _tmp153_->id;
-#line 1436 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp155_ = line;
-#line 1436 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp156_ = notify_got_line_new (_tmp154_, _tmp155_);
-#line 1436 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp157_ = _tmp156_;
-#line 1436 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_notify (self, (Notify*) _tmp157_);
-#line 1436 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_notify_unref0 (_tmp157_);
-#line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1343 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_line_unref0 (line);
-#line 12192 "scanner.c"
+#line 12212 "scanner.c"
 	}
-#line 1303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1304 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (job);
-#line 12196 "scanner.c"
+#line 12216 "scanner.c"
 }
 
 
 static void _scanner_authorization_cb_sane_authcallback (const gchar* resource, gchar* username, gchar* password) {
-#line 1445 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1446 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_authorization_cb (resource, username, -1, password, -1);
-#line 12203 "scanner.c"
+#line 12223 "scanner.c"
 }
 
 
@@ -12228,211 +12248,211 @@ static void* scanner_scan_thread (Scanner* self) {
 	gint _tmp11_ = 0;
 	SANE_Int _tmp12_ = {0};
 	gint _tmp13_ = 0;
-#line 1440 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1441 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1442 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1443 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->state = SCAN_STATE_IDLE;
-#line 1445 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1446 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = sane_init (&_tmp0_, _scanner_authorization_cb_sane_authcallback);
-#line 1445 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1446 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	version_code = _tmp0_;
-#line 1445 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	status = _tmp1_;
 #line 1446 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	status = _tmp1_;
+#line 1447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = status;
-#line 1446 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = sane_status_to_string (_tmp2_);
-#line 1446 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = _tmp3_;
-#line 1446 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:1446: sane_init () -> %s", _tmp4_);
-#line 1446 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_g_free0 (_tmp4_);
 #line 1447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp5_ = status;
+	g_debug ("scanner.vala:1447: sane_init () -> %s", _tmp4_);
 #line 1447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_g_free0 (_tmp4_);
+#line 1448 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp5_ = status;
+#line 1448 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp5_ != SANE_STATUS_GOOD) {
-#line 12247 "scanner.c"
+#line 12267 "scanner.c"
 		SANE_Status _tmp6_ = 0;
 		const gchar* _tmp7_ = NULL;
-#line 1449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1450 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = status;
-#line 1449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1450 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = sane_strstatus (_tmp6_);
-#line 1449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_warning ("scanner.vala:1449: Unable to initialize SANE backend: %s", _tmp7_);
 #line 1450 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		g_warning ("scanner.vala:1450: Unable to initialize SANE backend: %s", _tmp7_);
+#line 1451 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		result = NULL;
-#line 1450 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1451 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
-#line 12260 "scanner.c"
+#line 12280 "scanner.c"
 	}
-#line 1452 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1453 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp8_ = version_code;
-#line 1452 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1453 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp9_ = SANE_VERSION_MAJOR (_tmp8_);
-#line 1452 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1453 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = version_code;
-#line 1452 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1453 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = SANE_VERSION_MINOR (_tmp10_);
-#line 1452 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1453 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp12_ = version_code;
-#line 1452 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1453 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp13_ = SANE_VERSION_BUILD (_tmp12_);
-#line 1452 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:1452: SANE version %d.%d.%d", _tmp9_, _tmp11_, _tmp13_);
-#line 1458 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1453 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:1453: SANE version %d.%d.%d", _tmp9_, _tmp11_, _tmp13_);
+#line 1459 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_redetect (self);
-#line 1460 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1461 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	while (TRUE) {
-#line 12280 "scanner.c"
+#line 12300 "scanner.c"
 		gboolean _tmp14_ = FALSE;
 		ScanState _tmp15_ = 0;
-#line 1460 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1461 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = scanner_handle_requests (self);
-#line 1460 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1461 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (!_tmp14_) {
-#line 1460 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1461 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 12289 "scanner.c"
+#line 12309 "scanner.c"
 		}
-#line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1463 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp15_ = self->priv->state;
-#line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1463 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		switch (_tmp15_) {
-#line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1463 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_IDLE:
-#line 12297 "scanner.c"
+#line 12317 "scanner.c"
 			{
 				GList* _tmp16_ = NULL;
-#line 1465 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1466 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp16_ = self->priv->job_queue;
-#line 1465 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1466 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (_tmp16_ != NULL) {
-#line 1467 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					scanner_set_scanning (self, TRUE);
 #line 1468 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					scanner_set_scanning (self, TRUE);
+#line 1469 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					self->priv->state = SCAN_STATE_OPEN;
-#line 12308 "scanner.c"
+#line 12328 "scanner.c"
 				}
-#line 1470 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1471 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 12312 "scanner.c"
+#line 12332 "scanner.c"
 			}
-#line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1463 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_REDETECT:
-#line 12316 "scanner.c"
+#line 12336 "scanner.c"
 			{
-#line 1472 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				scanner_do_redetect (self);
 #line 1473 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				scanner_do_redetect (self);
+#line 1474 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 12322 "scanner.c"
+#line 12342 "scanner.c"
 			}
-#line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1463 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_OPEN:
-#line 12326 "scanner.c"
+#line 12346 "scanner.c"
 			{
-#line 1475 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				scanner_do_open (self);
 #line 1476 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				scanner_do_open (self);
+#line 1477 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 12332 "scanner.c"
+#line 12352 "scanner.c"
 			}
-#line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1463 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_GET_OPTION:
-#line 12336 "scanner.c"
+#line 12356 "scanner.c"
 			{
-#line 1478 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				scanner_do_get_option (self);
 #line 1479 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				scanner_do_get_option (self);
+#line 1480 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 12342 "scanner.c"
+#line 12362 "scanner.c"
 			}
-#line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1463 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_START:
-#line 12346 "scanner.c"
+#line 12366 "scanner.c"
 			{
-#line 1481 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				scanner_do_start (self);
 #line 1482 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				scanner_do_start (self);
+#line 1483 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 12352 "scanner.c"
+#line 12372 "scanner.c"
 			}
-#line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1463 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_GET_PARAMETERS:
-#line 12356 "scanner.c"
+#line 12376 "scanner.c"
 			{
-#line 1484 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				scanner_do_get_parameters (self);
 #line 1485 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				scanner_do_get_parameters (self);
+#line 1486 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 12362 "scanner.c"
+#line 12382 "scanner.c"
 			}
-#line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1463 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_READ:
-#line 12366 "scanner.c"
+#line 12386 "scanner.c"
 			{
-#line 1487 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				scanner_do_read (self);
 #line 1488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				scanner_do_read (self);
+#line 1489 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 12372 "scanner.c"
+#line 12392 "scanner.c"
 			}
 			default:
-#line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1463 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 12377 "scanner.c"
+#line 12397 "scanner.c"
 		}
 	}
-#line 1492 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1493 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = NULL;
-#line 1492 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1493 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 12384 "scanner.c"
+#line 12404 "scanner.c"
 }
 
 
 static gpointer _scanner_scan_thread_gthread_func (gpointer self) {
 	gpointer result;
 	result = scanner_scan_thread ((Scanner*) self);
-#line 1499 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_unref (self);
-#line 1499 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 12395 "scanner.c"
+#line 12415 "scanner.c"
 }
 
 
 void scanner_start (Scanner* self) {
 	GError * _inner_error_ = NULL;
-#line 1495 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1496 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 12403 "scanner.c"
+#line 12423 "scanner.c"
 	{
 		GThread* _tmp0_ = NULL;
 		GThread* _tmp1_ = NULL;
 		GThread* _tmp2_ = NULL;
-#line 1499 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp1_ = g_thread_try_new ("scan-thread", _scanner_scan_thread_gthread_func, scanner_ref (self), &_inner_error_);
-#line 1499 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp1_;
-#line 1499 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12414 "scanner.c"
+#line 12434 "scanner.c"
 			goto __catch16_g_error;
 		}
-#line 1499 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp2_ = _tmp0_;
-#line 1499 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = NULL;
-#line 1499 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_thread_unref0 (self->priv->thread);
-#line 1499 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->thread = _tmp2_;
-#line 1497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1498 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_thread_unref0 (_tmp0_);
-#line 12427 "scanner.c"
+#line 12447 "scanner.c"
 	}
 	goto __finally16;
 	__catch16_g_error:
@@ -12440,30 +12460,30 @@ void scanner_start (Scanner* self) {
 		GError* e = NULL;
 		GError* _tmp3_ = NULL;
 		const gchar* _tmp4_ = NULL;
-#line 1497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1498 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		e = _inner_error_;
-#line 1497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1498 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_inner_error_ = NULL;
-#line 1503 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1504 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp3_ = e;
-#line 1503 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1504 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp4_ = _tmp3_->message;
-#line 1503 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_critical ("scanner.vala:1503: Unable to create thread: %s", _tmp4_);
-#line 1497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1504 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		g_critical ("scanner.vala:1504: Unable to create thread: %s", _tmp4_);
+#line 1498 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_error_free0 (e);
-#line 12447 "scanner.c"
+#line 12467 "scanner.c"
 	}
 	__finally16:
-#line 1497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1498 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1498 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1498 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_clear_error (&_inner_error_);
-#line 1497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1498 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 12458 "scanner.c"
+#line 12478 "scanner.c"
 	}
 }
 
@@ -12472,119 +12492,119 @@ void scanner_redetect (Scanner* self) {
 	gboolean _tmp0_ = FALSE;
 	GAsyncQueue* _tmp1_ = NULL;
 	RequestRedetect* _tmp2_ = NULL;
-#line 1507 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1508 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 1509 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->need_redetect;
-#line 1509 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp0_) {
 #line 1510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	if (_tmp0_) {
+#line 1511 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 12475 "scanner.c"
+#line 12495 "scanner.c"
 	}
-#line 1511 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1512 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->need_redetect = TRUE;
-#line 1513 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:1513: Requesting redetection of scan devices");
-#line 1515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1514 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:1514: Requesting redetection of scan devices");
+#line 1516 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = self->priv->request_queue;
-#line 1515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1516 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = request_redetect_new ();
-#line 1515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1516 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_async_queue_push (_tmp1_, (Request*) _tmp2_);
-#line 12487 "scanner.c"
+#line 12507 "scanner.c"
 }
 
 
 gboolean scanner_is_scanning (Scanner* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 1518 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1519 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1520 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1521 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->scanning;
-#line 1520 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1521 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = _tmp0_;
-#line 1520 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1521 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 12502 "scanner.c"
+#line 12522 "scanner.c"
 }
 
 
 static gchar* scanner_get_scan_mode_string (Scanner* self, ScanMode mode) {
 	gchar* result = NULL;
 	ScanMode _tmp0_ = 0;
-#line 1523 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1524 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1525 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1526 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = mode;
-#line 1525 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1526 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	switch (_tmp0_) {
-#line 1525 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1526 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_MODE_DEFAULT:
-#line 12517 "scanner.c"
+#line 12537 "scanner.c"
 		{
 			gchar* _tmp1_ = NULL;
-#line 1528 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1529 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp1_ = g_strdup ("ScanMode.DEFAULT");
-#line 1528 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1529 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp1_;
-#line 1528 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1529 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12526 "scanner.c"
+#line 12546 "scanner.c"
 		}
-#line 1525 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1526 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_MODE_COLOR:
-#line 12530 "scanner.c"
+#line 12550 "scanner.c"
 		{
 			gchar* _tmp2_ = NULL;
-#line 1530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1531 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp2_ = g_strdup ("ScanMode.COLOR");
-#line 1530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1531 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp2_;
-#line 1530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1531 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12539 "scanner.c"
+#line 12559 "scanner.c"
 		}
-#line 1525 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1526 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_MODE_GRAY:
-#line 12543 "scanner.c"
+#line 12563 "scanner.c"
 		{
 			gchar* _tmp3_ = NULL;
-#line 1532 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp3_ = g_strdup ("ScanMode.GRAY");
-#line 1532 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp3_;
-#line 1532 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12552 "scanner.c"
+#line 12572 "scanner.c"
 		}
-#line 1525 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1526 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_MODE_LINEART:
-#line 12556 "scanner.c"
+#line 12576 "scanner.c"
 		{
 			gchar* _tmp4_ = NULL;
-#line 1534 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1535 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp4_ = g_strdup ("ScanMode.LINEART");
-#line 1534 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1535 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp4_;
-#line 1534 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1535 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12565 "scanner.c"
+#line 12585 "scanner.c"
 		}
 		default:
 		{
 			ScanMode _tmp5_ = 0;
 			gchar* _tmp6_ = NULL;
-#line 1536 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1537 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp5_ = mode;
-#line 1536 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1537 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp6_ = g_strdup_printf ("%d", (gint) _tmp5_);
-#line 1536 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1537 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp6_;
-#line 1536 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1537 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12579 "scanner.c"
+#line 12599 "scanner.c"
 		}
 	}
 }
@@ -12593,77 +12613,77 @@ static gchar* scanner_get_scan_mode_string (Scanner* self, ScanMode mode) {
 static gchar* scanner_get_scan_type_string (Scanner* self, ScanType type) {
 	gchar* result = NULL;
 	ScanType _tmp0_ = 0;
-#line 1540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = type;
-#line 1542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	switch (_tmp0_) {
-#line 1542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_TYPE_SINGLE:
-#line 12596 "scanner.c"
+#line 12616 "scanner.c"
 		{
 			gchar* _tmp1_ = NULL;
-#line 1545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp1_ = g_strdup ("ScanType.SINGLE");
-#line 1545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp1_;
-#line 1545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12605 "scanner.c"
+#line 12625 "scanner.c"
 		}
-#line 1542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_TYPE_ADF_FRONT:
-#line 12609 "scanner.c"
+#line 12629 "scanner.c"
 		{
 			gchar* _tmp2_ = NULL;
-#line 1547 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp2_ = g_strdup ("ScanType.ADF_FRONT");
-#line 1547 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp2_;
-#line 1547 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12618 "scanner.c"
+#line 12638 "scanner.c"
 		}
-#line 1542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_TYPE_ADF_BACK:
-#line 12622 "scanner.c"
+#line 12642 "scanner.c"
 		{
 			gchar* _tmp3_ = NULL;
-#line 1549 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1550 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp3_ = g_strdup ("ScanType.ADF_BACK");
-#line 1549 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1550 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp3_;
-#line 1549 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1550 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12631 "scanner.c"
+#line 12651 "scanner.c"
 		}
-#line 1542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_TYPE_ADF_BOTH:
-#line 12635 "scanner.c"
+#line 12655 "scanner.c"
 		{
 			gchar* _tmp4_ = NULL;
-#line 1551 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1552 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp4_ = g_strdup ("ScanType.ADF_BOTH");
-#line 1551 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1552 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp4_;
-#line 1551 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1552 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12644 "scanner.c"
+#line 12664 "scanner.c"
 		}
 		default:
 		{
 			ScanType _tmp5_ = 0;
 			gchar* _tmp6_ = NULL;
-#line 1553 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp5_ = type;
-#line 1553 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp6_ = g_strdup_printf ("%d", (gint) _tmp5_);
-#line 1553 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp6_;
-#line 1553 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12658 "scanner.c"
+#line 12678 "scanner.c"
 		}
 	}
 }
@@ -12726,175 +12746,175 @@ void scanner_scan (Scanner* self, const gchar* device, ScanOptions* options) {
 	gint _tmp53_ = 0;
 	GAsyncQueue* _tmp54_ = NULL;
 	Request* _tmp55_ = NULL;
-#line 1557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1558 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 1557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1558 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (options != NULL);
-#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = device;
-#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ != NULL) {
-#line 12729 "scanner.c"
+#line 12749 "scanner.c"
 		const gchar* _tmp2_ = NULL;
-#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp2_ = device;
-#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp2_;
-#line 12735 "scanner.c"
+#line 12755 "scanner.c"
 	} else {
-#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = "(null)";
-#line 12739 "scanner.c"
+#line 12759 "scanner.c"
 	}
-#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = options;
-#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = _tmp3_->dpi;
-#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = options;
-#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = _tmp5_->scan_mode;
-#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp7_ = scanner_get_scan_mode_string (self, _tmp6_);
-#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp8_ = _tmp7_;
-#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp9_ = options;
-#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = _tmp9_->depth;
-#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = options;
-#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp12_ = _tmp11_->type;
-#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp13_ = scanner_get_scan_type_string (self, _tmp12_);
-#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp14_ = _tmp13_;
-#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp15_ = options;
-#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp16_ = _tmp15_->paper_width;
-#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp17_ = options;
-#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp18_ = _tmp17_->paper_height;
-#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp19_ = options;
-#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp20_ = _tmp19_->brightness;
-#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp21_ = options;
-#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp22_ = _tmp21_->contrast;
-#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:1559: Scanner.scan (\"%s\", dpi=%d, scan_mode=%s, depth=%" \
+#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:1560: Scanner.scan (\"%s\", dpi=%d, scan_mode=%s, depth=%" \
 "d, type=%s, paper_width=%d, paper_height=%d, brightness=%d, contrast=%" \
 "d)", _tmp0_, _tmp4_, _tmp8_, _tmp10_, _tmp14_, _tmp16_, _tmp18_, _tmp20_, _tmp22_);
-#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp14_);
-#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp8_);
-#line 1563 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1564 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp23_ = request_start_scan_new ();
-#line 1563 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	request = _tmp23_;
 #line 1564 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	request = _tmp23_;
+#line 1565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp24_ = scan_job_new ();
-#line 1564 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (request->job);
-#line 1564 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	request->job = _tmp24_;
 #line 1565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	request->job = _tmp24_;
+#line 1566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp25_ = request->job;
-#line 1565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp26_ = self->job_id;
-#line 1565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->job_id = _tmp26_ + 1;
-#line 1565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp25_->id = _tmp26_;
 #line 1566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp25_->id = _tmp26_;
+#line 1567 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp27_ = request->job;
-#line 1566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1567 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp28_ = device;
-#line 1566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1567 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp29_ = g_strdup (_tmp28_);
-#line 1566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1567 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp27_->device);
-#line 1566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp27_->device = _tmp29_;
 #line 1567 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp27_->device = _tmp29_;
+#line 1568 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp30_ = request->job;
-#line 1567 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1568 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp31_ = options;
-#line 1567 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1568 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp32_ = _tmp31_->dpi;
-#line 1567 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp30_->dpi = (gdouble) _tmp32_;
 #line 1568 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp30_->dpi = (gdouble) _tmp32_;
+#line 1569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp33_ = request->job;
-#line 1568 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp34_ = options;
-#line 1568 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp35_ = _tmp34_->scan_mode;
-#line 1568 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp33_->scan_mode = _tmp35_;
 #line 1569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp33_->scan_mode = _tmp35_;
+#line 1570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp36_ = request->job;
-#line 1569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp37_ = options;
-#line 1569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp38_ = _tmp37_->depth;
-#line 1569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp36_->depth = _tmp38_;
 #line 1570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp36_->depth = _tmp38_;
+#line 1571 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp39_ = request->job;
-#line 1570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1571 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp40_ = options;
-#line 1570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1571 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp41_ = _tmp40_->type;
-#line 1570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp39_->type = _tmp41_;
 #line 1571 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp39_->type = _tmp41_;
+#line 1572 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp42_ = request->job;
-#line 1571 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1572 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp43_ = options;
-#line 1571 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1572 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp44_ = _tmp43_->paper_width;
-#line 1571 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp42_->page_width = _tmp44_;
 #line 1572 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp42_->page_width = _tmp44_;
+#line 1573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp45_ = request->job;
-#line 1572 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp46_ = options;
-#line 1572 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp47_ = _tmp46_->paper_height;
-#line 1572 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp45_->page_height = _tmp47_;
 #line 1573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp45_->page_height = _tmp47_;
+#line 1574 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp48_ = request->job;
-#line 1573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1574 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp49_ = options;
-#line 1573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1574 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp50_ = _tmp49_->brightness;
-#line 1573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp48_->brightness = _tmp50_;
 #line 1574 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp48_->brightness = _tmp50_;
+#line 1575 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp51_ = request->job;
-#line 1574 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1575 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp52_ = options;
-#line 1574 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1575 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp53_ = _tmp52_->contrast;
-#line 1574 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp51_->contrast = _tmp53_;
 #line 1575 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp51_->contrast = _tmp53_;
+#line 1576 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp54_ = self->priv->request_queue;
-#line 1575 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1576 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp55_ = _request_ref0 ((Request*) request);
-#line 1575 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1576 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_async_queue_push (_tmp54_, _tmp55_);
-#line 1557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1558 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_request_unref0 (request);
-#line 12887 "scanner.c"
+#line 12907 "scanner.c"
 }
 
 
@@ -12902,26 +12922,26 @@ void scanner_cancel (Scanner* self) {
 	gint _tmp0_ = 0;
 	GAsyncQueue* _tmp1_ = NULL;
 	RequestCancel* _tmp2_ = NULL;
-#line 1578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1579 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 1580 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->job_id;
-#line 1580 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->first_job_id = _tmp0_;
 #line 1581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	self->first_job_id = _tmp0_;
+#line 1582 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = self->priv->request_queue;
-#line 1581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1582 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = request_cancel_new ();
-#line 1581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1582 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_async_queue_push (_tmp1_, (Request*) _tmp2_);
-#line 12907 "scanner.c"
+#line 12927 "scanner.c"
 }
 
 
 static gpointer _g_thread_ref0 (gpointer self) {
-#line 1592 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1593 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? g_thread_ref (self) : NULL;
-#line 12914 "scanner.c"
+#line 12934 "scanner.c"
 }
 
 
@@ -12929,40 +12949,40 @@ void scanner_free (Scanner* self) {
 	GAsyncQueue* _tmp0_ = NULL;
 	RequestQuit* _tmp1_ = NULL;
 	GThread* _tmp2_ = NULL;
-#line 1584 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1585 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 1586 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:1586: Stopping scan thread");
-#line 1588 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1587 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:1587: Stopping scan thread");
+#line 1589 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->request_queue;
-#line 1588 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1589 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = request_quit_new ();
-#line 1588 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1589 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_async_queue_push (_tmp0_, (Request*) _tmp1_);
-#line 1590 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1591 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = self->priv->thread;
-#line 1590 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1591 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp2_ != NULL) {
-#line 12936 "scanner.c"
+#line 12956 "scanner.c"
 		GThread* _tmp3_ = NULL;
 		GThread* _tmp4_ = NULL;
-#line 1592 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1593 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp3_ = self->priv->thread;
-#line 1592 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1593 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp4_ = _g_thread_ref0 (_tmp3_);
-#line 1592 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_thread_join (_tmp4_);
 #line 1593 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		g_thread_join (_tmp4_);
+#line 1594 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_thread_unref0 (self->priv->thread);
-#line 1593 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1594 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->thread = NULL;
-#line 12949 "scanner.c"
+#line 12969 "scanner.c"
 	}
-#line 1596 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	sane_exit ();
 #line 1597 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:1597: sane_exit ()");
-#line 12955 "scanner.c"
+	sane_exit ();
+#line 1598 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:1598: sane_exit ()");
+#line 12975 "scanner.c"
 }
 
 
@@ -12981,19 +13001,19 @@ static void g_cclosure_user_marshal_VOID__SCAN_PAGE_INFO (GClosure * closure, GV
 		data1 = closure->data;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 12974 "scanner.c"
+#line 12994 "scanner.c"
 	} else {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data2 = closure->data;
-#line 12980 "scanner.c"
+#line 13000 "scanner.c"
 	}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	callback = (GMarshalFunc_VOID__SCAN_PAGE_INFO) (marshal_data ? marshal_data : cc->callback);
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	callback (data1, value_get_scan_page_info (param_values + 1), data2);
-#line 12986 "scanner.c"
+#line 13006 "scanner.c"
 }
 
 
@@ -13012,19 +13032,19 @@ static void g_cclosure_user_marshal_VOID__SCAN_LINE (GClosure * closure, GValue
 		data1 = closure->data;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 13005 "scanner.c"
+#line 13025 "scanner.c"
 	} else {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data2 = closure->data;
-#line 13011 "scanner.c"
+#line 13031 "scanner.c"
 	}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	callback = (GMarshalFunc_VOID__SCAN_LINE) (marshal_data ? marshal_data : cc->callback);
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	callback (data1, value_get_scan_line (param_values + 1), data2);
-#line 13017 "scanner.c"
+#line 13037 "scanner.c"
 }
 
 
@@ -13043,26 +13063,26 @@ static void g_cclosure_user_marshal_VOID__INT_STRING (GClosure * closure, GValue
 		data1 = closure->data;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 13036 "scanner.c"
+#line 13056 "scanner.c"
 	} else {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data2 = closure->data;
-#line 13042 "scanner.c"
+#line 13062 "scanner.c"
 	}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	callback = (GMarshalFunc_VOID__INT_STRING) (marshal_data ? marshal_data : cc->callback);
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	callback (data1, g_value_get_int (param_values + 1), g_value_get_string (param_values + 2), data2);
-#line 13048 "scanner.c"
+#line 13068 "scanner.c"
 }
 
 
 static void value_scanner_init (GValue* value) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
-#line 13055 "scanner.c"
+#line 13075 "scanner.c"
 }
 
 
@@ -13071,7 +13091,7 @@ static void value_scanner_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_unref (value->data[0].v_pointer);
-#line 13064 "scanner.c"
+#line 13084 "scanner.c"
 	}
 }
 
@@ -13081,11 +13101,11 @@ static void value_scanner_copy_value (const GValue* src_value, GValue* dest_valu
 	if (src_value->data[0].v_pointer) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = scanner_ref (src_value->data[0].v_pointer);
-#line 13074 "scanner.c"
+#line 13094 "scanner.c"
 	} else {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 13078 "scanner.c"
+#line 13098 "scanner.c"
 	}
 }
 
@@ -13093,37 +13113,37 @@ static void value_scanner_copy_value (const GValue* src_value, GValue* dest_valu
 static gpointer value_scanner_peek_pointer (const GValue* value) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 13086 "scanner.c"
+#line 13106 "scanner.c"
 }
 
 
 static gchar* value_scanner_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
-#line 13093 "scanner.c"
+#line 13113 "scanner.c"
 		Scanner* object;
 		object = collect_values[0].v_pointer;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 13100 "scanner.c"
+#line 13120 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 13104 "scanner.c"
+#line 13124 "scanner.c"
 		}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = scanner_ref (object);
-#line 13108 "scanner.c"
+#line 13128 "scanner.c"
 	} else {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 13112 "scanner.c"
+#line 13132 "scanner.c"
 	}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 13116 "scanner.c"
+#line 13136 "scanner.c"
 }
 
 
@@ -13134,25 +13154,25 @@ static gchar* value_scanner_lcopy_value (const GValue* value, guint n_collect_va
 	if (!object_p) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 13127 "scanner.c"
+#line 13147 "scanner.c"
 	}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
-#line 13133 "scanner.c"
+#line 13153 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
-#line 13137 "scanner.c"
+#line 13157 "scanner.c"
 	} else {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = scanner_ref (value->data[0].v_pointer);
-#line 13141 "scanner.c"
+#line 13161 "scanner.c"
 	}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 13145 "scanner.c"
+#line 13165 "scanner.c"
 }
 
 
@@ -13166,7 +13186,7 @@ GParamSpec* param_spec_scanner (const gchar* name, const gchar* nick, const gcha
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
-#line 13159 "scanner.c"
+#line 13179 "scanner.c"
 }
 
 
@@ -13175,7 +13195,7 @@ gpointer value_get_scanner (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCANNER), NULL);
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 13168 "scanner.c"
+#line 13188 "scanner.c"
 }
 
 
@@ -13195,17 +13215,17 @@ void value_set_scanner (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_ref (value->data[0].v_pointer);
-#line 13188 "scanner.c"
+#line 13208 "scanner.c"
 	} else {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 13192 "scanner.c"
+#line 13212 "scanner.c"
 	}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_unref (old);
-#line 13198 "scanner.c"
+#line 13218 "scanner.c"
 	}
 }
 
@@ -13224,17 +13244,17 @@ void value_take_scanner (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 13217 "scanner.c"
+#line 13237 "scanner.c"
 	} else {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 13221 "scanner.c"
+#line 13241 "scanner.c"
 	}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_unref (old);
-#line 13227 "scanner.c"
+#line 13247 "scanner.c"
 	}
 }
 
@@ -13264,7 +13284,7 @@ static void scanner_class_init (ScannerClass * klass) {
 	g_signal_new ("document_done", TYPE_SCANNER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_new ("scanning_changed", TYPE_SCANNER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 13257 "scanner.c"
+#line 13277 "scanner.c"
 }
 
 
@@ -13273,7 +13293,7 @@ static void scanner_instance_init (Scanner * self) {
 	self->priv = SCANNER_GET_PRIVATE (self);
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
-#line 13266 "scanner.c"
+#line 13286 "scanner.c"
 }
 
 
@@ -13301,7 +13321,7 @@ static void scanner_finalize (Scanner* obj) {
 	_g_hash_table_unref0 (self->priv->options);
 #line 250 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->buffer = (g_free (self->priv->buffer), NULL);
-#line 13294 "scanner.c"
+#line 13314 "scanner.c"
 }
 
 
@@ -13326,7 +13346,7 @@ gpointer scanner_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
-#line 13319 "scanner.c"
+#line 13339 "scanner.c"
 }
 
 
@@ -13339,7 +13359,7 @@ void scanner_unref (gpointer instance) {
 		SCANNER_GET_CLASS (self)->finalize (self);
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 13332 "scanner.c"
+#line 13352 "scanner.c"
 	}
 }
 
diff --git a/src/scanner.vala b/src/scanner.vala
index bc2be6d..16f33cf 100644
--- a/src/scanner.vala
+++ b/src/scanner.vala
@@ -672,63 +672,64 @@ public class Scanner
         var cap = option.cap;
         if (cap != 0)
         {
-            s += " cap=";
+            var caps = "";
             if ((cap & Sane.Capability.SOFT_SELECT) != 0)
             {
-                if (s != "")
-                    s += ",";
-                s += "soft-select";
+                if (caps != "")
+                    caps += ",";
+                caps += "soft-select";
                 cap &= ~Sane.Capability.SOFT_SELECT;
             }
             if ((cap & Sane.Capability.HARD_SELECT) != 0)
             {
-                if (s != "")
-                    s += ",";
-                s += "hard-select";
+                if (caps != "")
+                    caps += ",";
+                caps += "hard-select";
                 cap &= ~Sane.Capability.HARD_SELECT;
             }
             if ((cap & Sane.Capability.SOFT_DETECT) != 0)
             {
-                if (s != "")
-                    s += ",";
-                s += "soft-detect";
+                if (caps != "")
+                    caps += ",";
+                caps += "soft-detect";
                 cap &= ~Sane.Capability.SOFT_DETECT;
             }
             if ((cap & Sane.Capability.EMULATED) != 0)
             {
-                if (s != "")
-                    s += ",";
-                s += "emulated";
+                if (caps != "")
+                    caps += ",";
+                caps += "emulated";
                 cap &= ~Sane.Capability.EMULATED;
             }
             if ((cap & Sane.Capability.AUTOMATIC) != 0)
             {
-                if (s != "")
-                    s += ",";
-                s += "automatic";
+                if (caps != "")
+                    caps += ",";
+                caps += "automatic";
                 cap &= ~Sane.Capability.AUTOMATIC;
             }
             if ((cap & Sane.Capability.INACTIVE) != 0)
             {
-                if (s != "")
-                    s += ",";
-                s += "inactive";
+                if (caps != "")
+                    caps += ",";
+                caps += "inactive";
                 cap &= ~Sane.Capability.INACTIVE;
             }
             if ((cap & Sane.Capability.ADVANCED) != 0)
             {
-                if (s != "")
-                    s += ",";
-                s += "advanced";
+                if (caps != "")
+                    caps += ",";
+                caps += "advanced";
                 cap &= ~Sane.Capability.ADVANCED;
             }
             /* Unknown capabilities */
             if (cap != 0)
             {
-                if (s != "")
-                    s += ",";
-                s += "%x".printf ((int) cap);
+                if (caps != "")
+                    caps += ",";
+                caps += "%x".printf ((int) cap);
             }
+            s += " cap=" + caps;
         }
 
         debug ("%s", s);
diff --git a/src/simple-scan.c b/src/simple-scan.c
index d73c486..739fd00 100644
--- a/src/simple-scan.c
+++ b/src/simple-scan.c
@@ -325,11 +325,11 @@ static void simple_scan_scanner_failed_cb (SimpleScan* self, Scanner* scanner, g
 static void _simple_scan_scanner_failed_cb_scanner_scan_failed (Scanner* _sender, gint error_code, const gchar* error_string, gpointer self);
 static void simple_scan_scanner_scanning_changed_cb (SimpleScan* self, Scanner* scanner);
 static void _simple_scan_scanner_scanning_changed_cb_scanner_scanning_changed (Scanner* _sender, gpointer self);
-static void ___lambda22_ (SimpleScan* self);
+static void ___lambda20_ (SimpleScan* self);
 void scanner_redetect (Scanner* self);
-static void ____lambda22__g_usb_context_device_added (GUsbContext* _sender, GUsbDevice* device, gpointer self);
-static void ___lambda23_ (SimpleScan* self);
-static void ____lambda23__g_usb_context_device_removed (GUsbContext* _sender, GUsbDevice* device, gpointer self);
+static void ____lambda20__g_usb_context_device_added (GUsbContext* _sender, GUsbDevice* device, gpointer self);
+static void ___lambda21_ (SimpleScan* self);
+static void ____lambda21__g_usb_context_device_removed (GUsbContext* _sender, GUsbDevice* device, gpointer self);
 void user_interface_set_scan_devices (UserInterface* self, GList* devices, const gchar* missing_driver);
 void user_interface_set_selected_device (UserInterface* self, const gchar* value);
 static void _scan_device_unref0_ (gpointer var);
@@ -535,7 +535,7 @@ static void _simple_scan_scanner_scanning_changed_cb_scanner_scanning_changed (S
 }
 
 
-static void ___lambda22_ (SimpleScan* self) {
+static void ___lambda20_ (SimpleScan* self) {
 	Scanner* _tmp0_ = NULL;
 #line 68 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = self->priv->scanner;
@@ -545,14 +545,14 @@ static void ___lambda22_ (SimpleScan* self) {
 }
 
 
-static void ____lambda22__g_usb_context_device_added (GUsbContext* _sender, GUsbDevice* device, gpointer self) {
+static void ____lambda20__g_usb_context_device_added (GUsbContext* _sender, GUsbDevice* device, gpointer self) {
 #line 68 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	___lambda22_ ((SimpleScan*) self);
+	___lambda20_ ((SimpleScan*) self);
 #line 552 "simple-scan.c"
 }
 
 
-static void ___lambda23_ (SimpleScan* self) {
+static void ___lambda21_ (SimpleScan* self) {
 	Scanner* _tmp0_ = NULL;
 #line 69 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = self->priv->scanner;
@@ -562,9 +562,9 @@ static void ___lambda23_ (SimpleScan* self) {
 }
 
 
-static void ____lambda23__g_usb_context_device_removed (GUsbContext* _sender, GUsbDevice* device, gpointer self) {
+static void ____lambda21__g_usb_context_device_removed (GUsbContext* _sender, GUsbDevice* device, gpointer self) {
 #line 69 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	___lambda23_ ((SimpleScan*) self);
+	___lambda21_ ((SimpleScan*) self);
 #line 569 "simple-scan.c"
 }
 
@@ -712,11 +712,11 @@ static void simple_scan_real_startup (GApplication* base) {
 #line 68 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp21_ = self->priv->usb_context;
 #line 68 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		g_signal_connect_object (_tmp21_, "device-added", (GCallback) ____lambda22__g_usb_context_device_added, self, 0);
+		g_signal_connect_object (_tmp21_, "device-added", (GCallback) ____lambda20__g_usb_context_device_added, self, 0);
 #line 69 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp22_ = self->priv->usb_context;
 #line 69 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		g_signal_connect_object (_tmp22_, "device-removed", (GCallback) ____lambda23__g_usb_context_device_removed, self, 0);
+		g_signal_connect_object (_tmp22_, "device-removed", (GCallback) ____lambda21__g_usb_context_device_removed, self, 0);
 #line 65 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (_tmp18_);
 #line 723 "simple-scan.c"
diff --git a/src/ui.c b/src/ui.c
index cdfb433..15f700d 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -25,7 +25,6 @@
 #include <math.h>
 #include <cairo.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include "packagekit-glib2/packagekit.h"
 #include <glib/gstdio.h>
 #include <unistd.h>
 
@@ -139,9 +138,6 @@ typedef struct _Block2Data Block2Data;
 typedef struct _PageIcon PageIcon;
 typedef struct _PageIconClass PageIconClass;
 #define _cairo_destroy0(var) ((var == NULL) ? NULL : (var = (cairo_destroy (var), NULL)))
-typedef struct _Block3Data Block3Data;
-#define _g_ptr_array_unref0(var) ((var == NULL) ? NULL : (var = (g_ptr_array_unref (var), NULL)))
-typedef struct _UserInterfaceInstallPackagesData UserInterfaceInstallPackagesData;
 #define _g_key_file_unref0(var) ((var == NULL) ? NULL : (var = (g_key_file_unref (var), NULL)))
 typedef struct _ProgressBarDialogPrivate ProgressBarDialogPrivate;
 typedef struct _PageIconPrivate PageIconPrivate;
@@ -309,87 +305,6 @@ struct _Block2Data {
 	GtkWindow* dialog;
 };
 
-struct _Block3Data {
-	int _ref_count_;
-	UserInterface* self;
-	GtkStack* stack;
-	GtkSpinner* spinner;
-	GtkLabel* status_label;
-	GtkLabel* instructions_label;
-};
-
-struct _UserInterfaceInstallPackagesData {
-	int _state_;
-	GObject* _source_object_;
-	GAsyncResult* _res_;
-	GSimpleAsyncResult* _async_result;
-	UserInterface* self;
-	gchar** packages;
-	gint packages_length1;
-	PkProgressCallback progress_callback;
-	gpointer progress_callback_target;
-	PkResults* result;
-	PkTask* task;
-	PkTask* _tmp0_;
-	PkResults* results;
-	PkResults* _tmp1_;
-	PkTask* _tmp2_;
-	gchar** _tmp3_;
-	gint _tmp3__length1;
-	PkProgressCallback _tmp4_;
-	void* _tmp4__target;
-	PkResults* _tmp5_;
-	PkResults* _tmp6_;
-	gboolean _tmp7_;
-	PkResults* _tmp8_;
-	PkResults* _tmp9_;
-	PkError* _tmp10_;
-	PkError* _tmp11_;
-	GPtrArray* package_array;
-	PkResults* _tmp12_;
-	GPtrArray* _tmp13_;
-	gchar** package_ids;
-	GPtrArray* _tmp14_;
-	gint _tmp15_;
-	gint _tmp16_;
-	gchar** _tmp17_;
-	gint package_ids_length1;
-	gint _package_ids_size_;
-	gchar** _tmp18_;
-	gint _tmp18__length1;
-	GPtrArray* _tmp19_;
-	gint _tmp20_;
-	gint _tmp21_;
-	gchar* _tmp22_;
-	gint i;
-	gboolean _tmp23_;
-	gint _tmp24_;
-	gint _tmp25_;
-	GPtrArray* _tmp26_;
-	gint _tmp27_;
-	gint _tmp28_;
-	gchar** _tmp29_;
-	gint _tmp29__length1;
-	gint _tmp30_;
-	GPtrArray* _tmp31_;
-	gpointer* _tmp32_;
-	gint _tmp32__length1;
-	gint _tmp33_;
-	PkPackage* _tmp34_;
-	const gchar* _tmp35_;
-	gchar* _tmp36_;
-	gchar* _tmp37_;
-	PkResults* _tmp38_;
-	PkTask* _tmp39_;
-	gchar** _tmp40_;
-	gint _tmp40__length1;
-	PkProgressCallback _tmp41_;
-	void* _tmp41__target;
-	PkResults* _tmp42_;
-	PkResults* _tmp43_;
-	GError * _inner_error_;
-};
-
 struct _ProgressBarDialog {
 	GtkWindow parent_instance;
 	ProgressBarDialogPrivate * priv;
@@ -690,17 +605,6 @@ static gboolean user_interface_simple_scan_window_configure_event_cb (UserInterf
 static gboolean _user_interface_simple_scan_window_configure_event_cb_gtk_widget_configure_event (GtkWidget* _sender, GdkEventConfigure* event, gpointer self);
 static void user_interface_info_bar_response_cb (UserInterface* self, GtkInfoBar* widget, gint response_id);
 static void user_interface_install_drivers (UserInterface* self);
-static Block3Data* block3_data_ref (Block3Data* _data3_);
-static void block3_data_unref (void * _userdata_);
-static void user_interface_install_packages (UserInterface* self, gchar** packages, int packages_length1, PkProgressCallback progress_callback, void* progress_callback_target, GAsyncReadyCallback _callback_, gpointer _user_data_);
-static PkResults* user_interface_install_packages_finish (UserInterface* self, GAsyncResult* _res_, GError** error);
-static void ___lambda12_ (UserInterface* self);
-static void ____lambda12__pk_progress_callback (PkProgress* progress, PkProgressType type, gpointer self);
-static void ___lambda13_ (Block3Data* _data3_, GObject* object, GAsyncResult* _result_);
-static void ____lambda13__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self);
-static void user_interface_install_packages_data_free (gpointer _data);
-static gboolean user_interface_install_packages_co (UserInterfaceInstallPackagesData* _data_);
-static void user_interface_install_packages_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_);
 static gboolean user_interface_simple_scan_window_window_state_event_cb (UserInterface* self, GtkWidget* widget, GdkEventWindowState* event);
 static gboolean _user_interface_simple_scan_window_window_state_event_cb_gtk_widget_window_state_event (GtkWidget* _sender, GdkEventWindowState* event, gpointer self);
 static gboolean user_interface_window_delete_event_cb (UserInterface* self, GtkWidget* widget, GdkEventAny* event);
@@ -713,23 +617,23 @@ static void _user_interface_page_scan_direction_changed_cb_page_scan_direction_c
 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 void _user_interface_info_bar_response_cb_gtk_info_bar_response (GtkInfoBar* _sender, gint response_id, gpointer self);
+static void __lambda12_ (UserInterface* self);
+static void ___lambda12__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
+static void __lambda13_ (UserInterface* self);
+static void ___lambda13__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
 static void __lambda14_ (UserInterface* self);
 static void ___lambda14__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
 static void __lambda15_ (UserInterface* self);
 static void ___lambda15__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
+void user_interface_set_brightness (UserInterface* self, gint value);
 static void __lambda16_ (UserInterface* self);
-static void ___lambda16__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
+static void ___lambda16__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self);
+void user_interface_set_contrast (UserInterface* self, gint value);
 static void __lambda17_ (UserInterface* self);
-static void ___lambda17__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
-void user_interface_set_brightness (UserInterface* self, gint value);
+static void ___lambda17__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self);
+void user_interface_set_quality (UserInterface* self, gint value);
 static void __lambda18_ (UserInterface* self);
 static void ___lambda18__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self);
-void user_interface_set_contrast (UserInterface* self, gint value);
-static void __lambda19_ (UserInterface* self);
-static void ___lambda19__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self);
-void user_interface_set_quality (UserInterface* self, gint value);
-static void __lambda20_ (UserInterface* self);
-static void ___lambda20__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self);
 BookView* book_view_new (Book* book);
 BookView* book_view_construct (GType object_type, Book* book);
 static void _user_interface_page_selected_cb_book_view_page_selected (BookView* _sender, Page* page, gpointer self);
@@ -746,8 +650,8 @@ static gboolean user_interface_state_get_boolean (UserInterface* self, GKeyFile*
 static gchar* user_interface_state_get_string (UserInterface* self, GKeyFile* f, const gchar* group_name, const gchar* key, const gchar* _default_);
 static gboolean ___lambda11_ (UserInterface* self);
 static gboolean ____lambda11__gsource_func (gpointer self);
-static gboolean ___lambda21_ (UserInterface* self);
-static gboolean ____lambda21__gsource_func (gpointer self);
+static gboolean ___lambda19_ (UserInterface* self);
+static gboolean ____lambda19__gsource_func (gpointer self);
 void progress_bar_dialog_set_fraction (ProgressBarDialog* self, gdouble value);
 void progress_bar_dialog_set_message (ProgressBarDialog* self, const gchar* value);
 void user_interface_start (UserInterface* self);
@@ -791,98 +695,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 287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_added_cb ((UserInterface*) self, _sender, page);
-#line 795 "ui.c"
+#line 699 "ui.c"
 }
 
 
 static void _user_interface_reordered_cb_book_reordered (Book* _sender, gpointer self) {
 #line 288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_reordered_cb ((UserInterface*) self, _sender);
-#line 802 "ui.c"
+#line 706 "ui.c"
 }
 
 
 static void _user_interface_page_removed_cb_book_page_removed (Book* _sender, Page* page, gpointer self) {
 #line 289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_removed_cb ((UserInterface*) self, _sender, page);
-#line 809 "ui.c"
+#line 713 "ui.c"
 }
 
 
 static void _user_interface_new_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_new_document_activate_cb ((UserInterface*) self);
-#line 816 "ui.c"
+#line 720 "ui.c"
 }
 
 
 static void _user_interface_reorder_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_reorder_document_activate_cb ((UserInterface*) self);
-#line 823 "ui.c"
+#line 727 "ui.c"
 }
 
 
 static void _user_interface_save_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_document_activate_cb ((UserInterface*) self);
-#line 830 "ui.c"
+#line 734 "ui.c"
 }
 
 
 static void _user_interface_save_as_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_as_document_activate_cb ((UserInterface*) self);
-#line 837 "ui.c"
+#line 741 "ui.c"
 }
 
 
 static void _user_interface_email_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_email_document_activate_cb ((UserInterface*) self);
-#line 844 "ui.c"
+#line 748 "ui.c"
 }
 
 
 static void _user_interface_print_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_print_document_activate_cb ((UserInterface*) self);
-#line 851 "ui.c"
+#line 755 "ui.c"
 }
 
 
 static void _user_interface_preferences_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_preferences_activate_cb ((UserInterface*) self);
-#line 858 "ui.c"
+#line 762 "ui.c"
 }
 
 
 static void _user_interface_help_contents_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_help_contents_activate_cb ((UserInterface*) self);
-#line 865 "ui.c"
+#line 769 "ui.c"
 }
 
 
 static void _user_interface_about_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_about_activate_cb ((UserInterface*) self);
-#line 872 "ui.c"
+#line 776 "ui.c"
 }
 
 
 static void _user_interface_quit_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_quit_activate_cb ((UserInterface*) self);
-#line 879 "ui.c"
+#line 783 "ui.c"
 }
 
 
 static void _user_interface_needs_saving_cb_book_needs_saving_changed (Book* _sender, gpointer self) {
 #line 268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_needs_saving_cb ((UserInterface*) self, _sender);
-#line 886 "ui.c"
+#line 790 "ui.c"
 }
 
 
@@ -960,7 +864,7 @@ UserInterface* user_interface_construct (GType object_type) {
 	_tmp13_ = _tmp12_;
 #line 276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp13_ == ((guint) 0)) {
-#line 964 "ui.c"
+#line 868 "ui.c"
 		Book* _tmp14_ = NULL;
 #line 278 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_add_default_page (self);
@@ -968,7 +872,7 @@ UserInterface* user_interface_construct (GType object_type) {
 		_tmp14_ = self->priv->_book;
 #line 279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		book_set_needs_saving (_tmp14_, FALSE);
-#line 972 "ui.c"
+#line 876 "ui.c"
 	} else {
 		BookView* _tmp15_ = NULL;
 		Book* _tmp16_ = NULL;
@@ -986,18 +890,18 @@ UserInterface* user_interface_construct (GType object_type) {
 		book_view_set_selected_page (_tmp15_, _tmp18_);
 #line 282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_page_unref0 (_tmp18_);
-#line 990 "ui.c"
+#line 894 "ui.c"
 	}
 #line 260 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self;
-#line 994 "ui.c"
+#line 898 "ui.c"
 }
 
 
 UserInterface* user_interface_new (void) {
 #line 260 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return user_interface_construct (TYPE_USER_INTERFACE);
-#line 1001 "ui.c"
+#line 905 "ui.c"
 }
 
 
@@ -1022,14 +926,14 @@ static gboolean user_interface_find_scan_device (UserInterface* self, const gcha
 	_vala_iter = _tmp1_;
 #line 296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 1026 "ui.c"
+#line 930 "ui.c"
 		{
 			gboolean _tmp3_ = FALSE;
 #line 298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp3_ = TRUE;
 #line 298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			while (TRUE) {
-#line 1033 "ui.c"
+#line 937 "ui.c"
 				gchar* d = NULL;
 				GtkListStore* _tmp8_ = NULL;
 				GtkTreeIter _tmp9_ = {0};
@@ -1037,14 +941,14 @@ static gboolean user_interface_find_scan_device (UserInterface* self, const gcha
 				const gchar* _tmp11_ = NULL;
 #line 298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (!_tmp3_) {
-#line 1041 "ui.c"
+#line 945 "ui.c"
 					gboolean _tmp4_ = FALSE;
 					gboolean _tmp5_ = FALSE;
 #line 304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp5_ = have_iter;
 #line 304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					if (!_tmp5_) {
-#line 1048 "ui.c"
+#line 952 "ui.c"
 						GtkListStore* _tmp6_ = NULL;
 						gboolean _tmp7_ = FALSE;
 #line 304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -1053,17 +957,17 @@ static gboolean user_interface_find_scan_device (UserInterface* self, const gcha
 						_tmp7_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp6_, &_vala_iter);
 #line 304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp4_ = _tmp7_;
-#line 1057 "ui.c"
+#line 961 "ui.c"
 					} else {
 #line 304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp4_ = FALSE;
-#line 1061 "ui.c"
+#line 965 "ui.c"
 					}
 #line 304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					if (!_tmp4_) {
 #line 304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						break;
-#line 1067 "ui.c"
+#line 971 "ui.c"
 					}
 				}
 #line 298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -1082,11 +986,11 @@ static gboolean user_interface_find_scan_device (UserInterface* self, const gcha
 				if (g_strcmp0 (_tmp10_, _tmp11_) == 0) {
 #line 303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					have_iter = TRUE;
-#line 1086 "ui.c"
+#line 990 "ui.c"
 				}
 #line 298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (d);
-#line 1090 "ui.c"
+#line 994 "ui.c"
 			}
 		}
 	}
@@ -1096,11 +1000,11 @@ static gboolean user_interface_find_scan_device (UserInterface* self, const gcha
 	if (iter) {
 #line 307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*iter = _vala_iter;
-#line 1100 "ui.c"
+#line 1004 "ui.c"
 	}
 #line 307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 1104 "ui.c"
+#line 1008 "ui.c"
 }
 
 
@@ -1138,7 +1042,7 @@ static void user_interface_show_error_dialog (UserInterface* self, const gchar*
 	gtk_widget_destroy ((GtkWidget*) dialog);
 #line 310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (dialog);
-#line 1142 "ui.c"
+#line 1046 "ui.c"
 }
 
 
@@ -1229,21 +1133,21 @@ void user_interface_authorize (UserInterface* self, const gchar* resource, gchar
 	if (username) {
 #line 323 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*username = _vala_username;
-#line 1233 "ui.c"
+#line 1137 "ui.c"
 	} else {
 #line 323 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_vala_username);
-#line 1237 "ui.c"
+#line 1141 "ui.c"
 	}
 #line 323 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (password) {
 #line 323 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*password = _vala_password;
-#line 1243 "ui.c"
+#line 1147 "ui.c"
 	} else {
 #line 323 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_vala_password);
-#line 1247 "ui.c"
+#line 1151 "ui.c"
 	}
 }
 
@@ -1264,7 +1168,7 @@ static void user_interface_device_combo_changed_cb (UserInterface* self, GtkWidg
 	if (_tmp0_) {
 #line 344 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 1268 "ui.c"
+#line 1172 "ui.c"
 	}
 #line 345 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->user_selected_device = TRUE;
@@ -1280,7 +1184,7 @@ static void user_interface_device_combo_changed_cb (UserInterface* self, GtkWidg
 	_g_free0 (_tmp3_);
 #line 346 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp4_) {
-#line 1284 "ui.c"
+#line 1188 "ui.c"
 		GSettings* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
@@ -1297,7 +1201,7 @@ static void user_interface_device_combo_changed_cb (UserInterface* self, GtkWidg
 		g_settings_set_string (_tmp5_, "selected-device", _tmp8_);
 #line 347 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_tmp8_);
-#line 1301 "ui.c"
+#line 1205 "ui.c"
 	}
 }
 
@@ -1305,7 +1209,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 1309 "ui.c"
+#line 1213 "ui.c"
 }
 
 
@@ -1347,7 +1251,7 @@ static void user_interface_update_info_bar (UserInterface* self) {
 	_tmp0_ = self->priv->have_error;
 #line 358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
-#line 1351 "ui.c"
+#line 1255 "ui.c"
 		gchar* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
@@ -1384,7 +1288,7 @@ static void user_interface_update_info_bar (UserInterface* self) {
 		_tmp6_ = self->priv->error_change_scanner_hint;
 #line 365 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		show_change_scanner_button = _tmp6_;
-#line 1388 "ui.c"
+#line 1292 "ui.c"
 	} else {
 		GtkListStore* _tmp7_ = NULL;
 		gint _tmp8_ = 0;
@@ -1394,7 +1298,7 @@ static void user_interface_update_info_bar (UserInterface* self) {
 		_tmp8_ = gtk_tree_model_iter_n_children ((GtkTreeModel*) _tmp7_, NULL);
 #line 367 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp8_ == 0) {
-#line 1398 "ui.c"
+#line 1302 "ui.c"
 			gchar* _tmp9_ = NULL;
 			const gchar* _tmp10_ = NULL;
 #line 369 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -1409,7 +1313,7 @@ static void user_interface_update_info_bar (UserInterface* self) {
 			_tmp10_ = self->priv->missing_driver;
 #line 371 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (_tmp10_ == NULL) {
-#line 1413 "ui.c"
+#line 1317 "ui.c"
 				const gchar* _tmp11_ = NULL;
 				gchar* _tmp12_ = NULL;
 				const gchar* _tmp13_ = NULL;
@@ -1430,7 +1334,7 @@ static void user_interface_update_info_bar (UserInterface* self) {
 				_g_free0 (text);
 #line 376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				text = _tmp14_;
-#line 1434 "ui.c"
+#line 1338 "ui.c"
 			} else {
 				const gchar* _tmp15_ = NULL;
 				gchar* _tmp16_ = NULL;
@@ -1454,7 +1358,7 @@ static void user_interface_update_info_bar (UserInterface* self) {
 				text = _tmp18_;
 #line 384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				show_install_button = TRUE;
-#line 1458 "ui.c"
+#line 1362 "ui.c"
 			}
 		} else {
 			GtkInfoBar* _tmp19_ = NULL;
@@ -1470,7 +1374,7 @@ static void user_interface_update_info_bar (UserInterface* self) {
 			_g_free0 (title);
 #line 390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			return;
-#line 1474 "ui.c"
+#line 1378 "ui.c"
 		}
 	}
 #line 393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -1529,14 +1433,14 @@ static void user_interface_update_info_bar (UserInterface* self) {
 	_g_free0 (text);
 #line 350 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (title);
-#line 1533 "ui.c"
+#line 1437 "ui.c"
 }
 
 
 static gpointer _scan_device_ref0 (gpointer self) {
 #line 419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self ? scan_device_ref (self) : NULL;
-#line 1540 "ui.c"
+#line 1444 "ui.c"
 }
 
 
@@ -1567,7 +1471,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const
 	_tmp2_ = self->priv->user_selected_device;
 #line 414 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 1571 "ui.c"
+#line 1475 "ui.c"
 		GtkComboBox* _tmp3_ = NULL;
 		gint _tmp4_ = 0;
 		gint _tmp5_ = 0;
@@ -1579,13 +1483,13 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const
 		_tmp5_ = _tmp4_;
 #line 415 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		have_selection = _tmp5_ >= 0;
-#line 1583 "ui.c"
+#line 1487 "ui.c"
 	}
 #line 418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	index = 0;
 #line 419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = devices;
-#line 1589 "ui.c"
+#line 1493 "ui.c"
 	{
 		GList* device_collection = NULL;
 		GList* device_it = NULL;
@@ -1593,14 +1497,14 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const
 		device_collection = _tmp6_;
 #line 419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		for (device_it = device_collection; device_it != NULL; device_it = device_it->next) {
-#line 1597 "ui.c"
+#line 1501 "ui.c"
 			ScanDevice* _tmp7_ = NULL;
 			ScanDevice* device = NULL;
 #line 419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp7_ = _scan_device_ref0 ((ScanDevice*) device_it->data);
 #line 419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			device = _tmp7_;
-#line 1604 "ui.c"
+#line 1508 "ui.c"
 			{
 				gint n_delete = 0;
 				GtkListStore* _tmp8_ = NULL;
@@ -1621,18 +1525,18 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const
 				iter = _tmp10_;
 #line 424 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp11_) {
-#line 1625 "ui.c"
+#line 1529 "ui.c"
 					gint i = 0;
 #line 426 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					i = 0;
-#line 1629 "ui.c"
+#line 1533 "ui.c"
 					{
 						gboolean _tmp12_ = FALSE;
 #line 427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp12_ = TRUE;
 #line 427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						while (TRUE) {
-#line 1636 "ui.c"
+#line 1540 "ui.c"
 							gchar* name = NULL;
 							gboolean matched = FALSE;
 							GtkListStore* _tmp15_ = NULL;
@@ -1644,7 +1548,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const
 							gint _tmp22_ = 0;
 #line 427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							if (!_tmp12_) {
-#line 1648 "ui.c"
+#line 1552 "ui.c"
 								GtkListStore* _tmp13_ = NULL;
 								gboolean _tmp14_ = FALSE;
 #line 441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -1655,7 +1559,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const
 								if (!_tmp14_) {
 #line 441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 									break;
-#line 1659 "ui.c"
+#line 1563 "ui.c"
 								}
 							}
 #line 427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -1678,7 +1582,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const
 							_tmp20_ = matched;
 #line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							if (_tmp20_) {
-#line 1682 "ui.c"
+#line 1586 "ui.c"
 								gint _tmp21_ = 0;
 #line 437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_tmp21_ = i;
@@ -1688,7 +1592,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const
 								_g_free0 (name);
 #line 438 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								break;
-#line 1692 "ui.c"
+#line 1596 "ui.c"
 							}
 #line 440 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp22_ = i;
@@ -1696,7 +1600,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const
 							i = _tmp22_ + 1;
 #line 427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_g_free0 (name);
-#line 1700 "ui.c"
+#line 1604 "ui.c"
 						}
 					}
 				}
@@ -1704,7 +1608,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const
 				_tmp23_ = n_delete;
 #line 445 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp23_ >= 0) {
-#line 1708 "ui.c"
+#line 1612 "ui.c"
 					gint i = 0;
 					GtkListStore* _tmp24_ = NULL;
 					GtkTreeIter _tmp25_ = {0};
@@ -1720,7 +1624,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const
 					_tmp27_ = _tmp26_->label;
 #line 450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_list_store_set (_tmp24_, &_tmp25_, 1, _tmp27_, -1, -1);
-#line 1724 "ui.c"
+#line 1628 "ui.c"
 					{
 						gboolean _tmp28_ = FALSE;
 #line 452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -1729,7 +1633,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const
 						_tmp28_ = TRUE;
 #line 452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						while (TRUE) {
-#line 1733 "ui.c"
+#line 1637 "ui.c"
 							gint _tmp30_ = 0;
 							gint _tmp31_ = 0;
 							GtkListStore* _tmp32_ = NULL;
@@ -1739,13 +1643,13 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const
 							GtkTreeIter _tmp36_ = {0};
 #line 452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							if (!_tmp28_) {
-#line 1743 "ui.c"
+#line 1647 "ui.c"
 								gint _tmp29_ = 0;
 #line 452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_tmp29_ = i;
 #line 452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								i = _tmp29_ + 1;
-#line 1749 "ui.c"
+#line 1653 "ui.c"
 							}
 #line 452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp28_ = FALSE;
@@ -1757,7 +1661,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const
 							if (!(_tmp30_ < _tmp31_)) {
 #line 452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								break;
-#line 1761 "ui.c"
+#line 1665 "ui.c"
 							}
 #line 454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp32_ = self->priv->device_model;
@@ -1773,7 +1677,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const
 							_tmp36_ = iter;
 #line 455 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							gtk_list_store_remove (_tmp35_, &_tmp36_);
-#line 1777 "ui.c"
+#line 1681 "ui.c"
 						}
 					}
 				} else {
@@ -1808,7 +1712,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const
 					_tmp45_ = _tmp44_->label;
 #line 461 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_list_store_set (_tmp40_, &_tmp41_, 0, _tmp43_, 1, _tmp45_, -1, -1);
-#line 1812 "ui.c"
+#line 1716 "ui.c"
 				}
 #line 463 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp46_ = index;
@@ -1816,13 +1720,13 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const
 				index = _tmp46_ + 1;
 #line 419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_scan_device_unref0 (device);
-#line 1820 "ui.c"
+#line 1724 "ui.c"
 			}
 		}
 	}
 #line 467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	while (TRUE) {
-#line 1826 "ui.c"
+#line 1730 "ui.c"
 		GtkListStore* _tmp47_ = NULL;
 		gint _tmp48_ = 0;
 		GtkTreeIter _tmp49_ = {0};
@@ -1841,7 +1745,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const
 		if (!_tmp50_) {
 #line 467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 1845 "ui.c"
+#line 1749 "ui.c"
 		}
 #line 468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp51_ = self->priv->device_model;
@@ -1849,13 +1753,13 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const
 		_tmp52_ = iter;
 #line 468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_list_store_remove (_tmp51_, &_tmp52_);
-#line 1853 "ui.c"
+#line 1757 "ui.c"
 	}
 #line 471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp53_ = have_selection;
 #line 471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp53_) {
-#line 1859 "ui.c"
+#line 1763 "ui.c"
 		gchar* device = NULL;
 		GSettings* _tmp54_ = NULL;
 		gchar* _tmp55_ = NULL;
@@ -1871,7 +1775,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const
 		_tmp57_ = device;
 #line 474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp57_ != NULL) {
-#line 1875 "ui.c"
+#line 1779 "ui.c"
 			const gchar* _tmp58_ = NULL;
 			GtkTreeIter _tmp59_ = {0};
 			gboolean _tmp60_ = FALSE;
@@ -1883,15 +1787,15 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const
 			iter = _tmp59_;
 #line 474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp56_ = _tmp60_;
-#line 1887 "ui.c"
+#line 1791 "ui.c"
 		} else {
 #line 474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp56_ = FALSE;
-#line 1891 "ui.c"
+#line 1795 "ui.c"
 		}
 #line 474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp56_) {
-#line 1895 "ui.c"
+#line 1799 "ui.c"
 			GtkComboBox* _tmp61_ = NULL;
 			GtkTreeIter _tmp62_ = {0};
 #line 475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -1900,24 +1804,24 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const
 			_tmp62_ = iter;
 #line 475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			gtk_combo_box_set_active_iter (_tmp61_, &_tmp62_);
-#line 1904 "ui.c"
+#line 1808 "ui.c"
 		} else {
 			GtkComboBox* _tmp63_ = NULL;
 #line 477 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp63_ = self->priv->device_combo;
 #line 477 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			gtk_combo_box_set_active (_tmp63_, 0);
-#line 1911 "ui.c"
+#line 1815 "ui.c"
 		}
 #line 471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (device);
-#line 1915 "ui.c"
+#line 1819 "ui.c"
 	}
 #line 480 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->setting_devices = FALSE;
 #line 482 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_info_bar (self);
-#line 1921 "ui.c"
+#line 1825 "ui.c"
 }
 
 
@@ -1954,7 +1858,7 @@ static void user_interface_add_default_page (UserInterface* self) {
 	book_view_set_selected_page (_tmp6_, page);
 #line 485 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 1958 "ui.c"
+#line 1862 "ui.c"
 }
 
 
@@ -1963,7 +1867,7 @@ static Block1Data* block1_data_ref (Block1Data* _data1_) {
 	g_atomic_int_inc (&_data1_->_ref_count_);
 #line 495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return _data1_;
-#line 1967 "ui.c"
+#line 1871 "ui.c"
 }
 
 
@@ -1972,7 +1876,7 @@ static void block1_data_unref (void * _userdata_) {
 	_data1_ = (Block1Data*) _userdata_;
 #line 495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) {
-#line 1976 "ui.c"
+#line 1880 "ui.c"
 		UserInterface* self;
 #line 495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self = _data1_->self;
@@ -1984,7 +1888,7 @@ static void block1_data_unref (void * _userdata_) {
 		_g_object_unref0 (self);
 #line 495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_slice_free (Block1Data, _data1_);
-#line 1988 "ui.c"
+#line 1892 "ui.c"
 	}
 }
 
@@ -1992,7 +1896,7 @@ static void block1_data_unref (void * _userdata_) {
 static gpointer _g_object_ref0 (gpointer self) {
 #line 523 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1996 "ui.c"
+#line 1900 "ui.c"
 }
 
 
@@ -2017,7 +1921,7 @@ static gint string_last_index_of_char (const gchar* self, gunichar c, gint start
 	_tmp3_ = _result_;
 #line 933 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 2021 "ui.c"
+#line 1925 "ui.c"
 		gchar* _tmp4_ = NULL;
 #line 934 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
@@ -2025,13 +1929,13 @@ static gint string_last_index_of_char (const gchar* self, gunichar c, gint start
 		result = (gint) (_tmp4_ - ((gchar*) self));
 #line 934 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		return result;
-#line 2029 "ui.c"
+#line 1933 "ui.c"
 	} else {
 #line 936 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		result = -1;
 #line 936 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		return result;
-#line 2035 "ui.c"
+#line 1939 "ui.c"
 	}
 }
 
@@ -2065,7 +1969,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	_tmp2_ = start;
 #line 1232 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	if (_tmp2_ < ((glong) 0)) {
-#line 2069 "ui.c"
+#line 1973 "ui.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 #line 1233 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
@@ -2074,13 +1978,13 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp4_ = start;
 #line 1233 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		start = _tmp3_ + _tmp4_;
-#line 2078 "ui.c"
+#line 1982 "ui.c"
 	}
 #line 1235 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp5_ = end;
 #line 1235 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	if (_tmp5_ < ((glong) 0)) {
-#line 2084 "ui.c"
+#line 1988 "ui.c"
 		glong _tmp6_ = 0L;
 		glong _tmp7_ = 0L;
 #line 1236 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
@@ -2089,13 +1993,13 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp7_ = end;
 #line 1236 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		end = _tmp6_ + _tmp7_;
-#line 2093 "ui.c"
+#line 1997 "ui.c"
 	}
 #line 1238 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp9_ = start;
 #line 1238 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	if (_tmp9_ >= ((glong) 0)) {
-#line 2099 "ui.c"
+#line 2003 "ui.c"
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
 #line 1238 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
@@ -2104,11 +2008,11 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp11_ = string_length;
 #line 1238 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp10_ <= _tmp11_;
-#line 2108 "ui.c"
+#line 2012 "ui.c"
 	} else {
 #line 1238 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp8_ = FALSE;
-#line 2112 "ui.c"
+#line 2016 "ui.c"
 	}
 #line 1238 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp8_, NULL);
@@ -2116,7 +2020,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	_tmp13_ = end;
 #line 1239 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	if (_tmp13_ >= ((glong) 0)) {
-#line 2120 "ui.c"
+#line 2024 "ui.c"
 		glong _tmp14_ = 0L;
 		glong _tmp15_ = 0L;
 #line 1239 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
@@ -2125,11 +2029,11 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp15_ = string_length;
 #line 1239 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp12_ = _tmp14_ <= _tmp15_;
-#line 2129 "ui.c"
+#line 2033 "ui.c"
 	} else {
 #line 1239 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp12_ = FALSE;
-#line 2133 "ui.c"
+#line 2037 "ui.c"
 	}
 #line 1239 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp12_, NULL);
@@ -2151,7 +2055,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	result = _tmp21_;
 #line 1241 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	return result;
-#line 2155 "ui.c"
+#line 2059 "ui.c"
 }
 
 
@@ -2192,7 +2096,7 @@ static void __lambda5_ (Block1Data* _data1_) {
 	i = _tmp2_;
 #line 571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp3_) {
-#line 2196 "ui.c"
+#line 2100 "ui.c"
 		GtkListStore* _tmp4_ = NULL;
 		GtkTreeIter _tmp5_ = {0};
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -2201,7 +2105,7 @@ static void __lambda5_ (Block1Data* _data1_) {
 		_tmp5_ = i;
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_tree_model_get ((GtkTreeModel*) _tmp4_, &_tmp5_, 1, &extension, -1, -1);
-#line 2205 "ui.c"
+#line 2109 "ui.c"
 	}
 #line 574 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = self->priv->save_dialog;
@@ -2225,7 +2129,7 @@ static void __lambda5_ (Block1Data* _data1_) {
 	_tmp12_ = extension_index;
 #line 579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp12_ >= 0) {
-#line 2229 "ui.c"
+#line 2133 "ui.c"
 		const gchar* _tmp13_ = NULL;
 		gint _tmp14_ = 0;
 		gchar* _tmp15_ = NULL;
@@ -2239,7 +2143,7 @@ static void __lambda5_ (Block1Data* _data1_) {
 		_g_free0 (filename);
 #line 580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		filename = _tmp15_;
-#line 2243 "ui.c"
+#line 2147 "ui.c"
 	}
 #line 581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = filename;
@@ -2263,14 +2167,14 @@ static void __lambda5_ (Block1Data* _data1_) {
 	_g_free0 (path);
 #line 567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (extension);
-#line 2267 "ui.c"
+#line 2171 "ui.c"
 }
 
 
 static void ___lambda5__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
 #line 567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	__lambda5_ (self);
-#line 2274 "ui.c"
+#line 2178 "ui.c"
 }
 
 
@@ -2383,18 +2287,18 @@ static gchar* user_interface_choose_file_location (UserInterface* self) {
 	if (_tmp3_ == NULL) {
 #line 501 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = TRUE;
-#line 2387 "ui.c"
+#line 2291 "ui.c"
 	} else {
 		const gchar* _tmp4_ = NULL;
 #line 501 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = directory;
 #line 501 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = g_strcmp0 (_tmp4_, "") == 0;
-#line 2394 "ui.c"
+#line 2298 "ui.c"
 	}
 #line 501 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 2398 "ui.c"
+#line 2302 "ui.c"
 		const gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
 #line 502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -2405,7 +2309,7 @@ static gchar* user_interface_choose_file_location (UserInterface* self) {
 		_g_free0 (directory);
 #line 502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		directory = _tmp6_;
-#line 2409 "ui.c"
+#line 2313 "ui.c"
 	}
 #line 504 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = _ ("Save As...");
@@ -2631,7 +2535,7 @@ static gchar* user_interface_choose_file_location (UserInterface* self) {
 	_tmp71_ = response;
 #line 589 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp71_ == ((gint) GTK_RESPONSE_ACCEPT)) {
-#line 2635 "ui.c"
+#line 2539 "ui.c"
 		gchar* extension = NULL;
 		gchar* _tmp72_ = NULL;
 		GtkTreeIter i = {0};
@@ -2664,7 +2568,7 @@ static gchar* user_interface_choose_file_location (UserInterface* self) {
 		i = _tmp74_;
 #line 593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp75_) {
-#line 2668 "ui.c"
+#line 2572 "ui.c"
 			GtkListStore* _tmp76_ = NULL;
 			GtkTreeIter _tmp77_ = {0};
 #line 594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -2673,7 +2577,7 @@ static gchar* user_interface_choose_file_location (UserInterface* self) {
 			_tmp77_ = i;
 #line 594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			gtk_tree_model_get ((GtkTreeModel*) _tmp76_, &_tmp77_, 1, &extension, -1, -1);
-#line 2677 "ui.c"
+#line 2581 "ui.c"
 		}
 #line 596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp78_ = self->priv->save_dialog;
@@ -2697,7 +2601,7 @@ static gchar* user_interface_choose_file_location (UserInterface* self) {
 		_tmp84_ = extension_index;
 #line 600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp84_ < 0) {
-#line 2701 "ui.c"
+#line 2605 "ui.c"
 			const gchar* _tmp85_ = NULL;
 			const gchar* _tmp86_ = NULL;
 			gchar* _tmp87_ = NULL;
@@ -2711,7 +2615,7 @@ static gchar* user_interface_choose_file_location (UserInterface* self) {
 			_g_free0 (path);
 #line 601 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			path = _tmp87_;
-#line 2715 "ui.c"
+#line 2619 "ui.c"
 		}
 #line 603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp88_ = path;
@@ -2733,7 +2637,7 @@ static gchar* user_interface_choose_file_location (UserInterface* self) {
 		_g_free0 (path);
 #line 589 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (extension);
-#line 2737 "ui.c"
+#line 2641 "ui.c"
 	}
 #line 606 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp92_ = self->priv->settings;
@@ -2773,7 +2677,7 @@ static gchar* user_interface_choose_file_location (UserInterface* self) {
 	_data1_ = NULL;
 #line 611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 2777 "ui.c"
+#line 2681 "ui.c"
 }
 
 
@@ -2804,21 +2708,21 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 	_tmp1_ = self->priv->book_uri;
 #line 617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp1_ != NULL) {
-#line 2808 "ui.c"
+#line 2712 "ui.c"
 		gboolean _tmp2_ = FALSE;
 #line 617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = force_choose_location;
 #line 617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = !_tmp2_;
-#line 2814 "ui.c"
+#line 2718 "ui.c"
 	} else {
 #line 617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = FALSE;
-#line 2818 "ui.c"
+#line 2722 "ui.c"
 	}
 #line 617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
-#line 2822 "ui.c"
+#line 2726 "ui.c"
 		const gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 #line 618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -2829,7 +2733,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 		_g_free0 (uri);
 #line 618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		uri = _tmp4_;
-#line 2833 "ui.c"
+#line 2737 "ui.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 #line 620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -2838,7 +2742,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 		_g_free0 (uri);
 #line 620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		uri = _tmp5_;
-#line 2842 "ui.c"
+#line 2746 "ui.c"
 	}
 #line 621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = uri;
@@ -2850,7 +2754,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 		_g_free0 (uri);
 #line 622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 2854 "ui.c"
+#line 2758 "ui.c"
 	}
 #line 624 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = uri;
@@ -2878,7 +2782,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 	_tmp14_ = g_str_has_suffix (_tmp13_, ".pdf");
 #line 630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp14_) {
-#line 2882 "ui.c"
+#line 2786 "ui.c"
 		gchar* _tmp15_ = NULL;
 #line 631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = g_strdup ("pdf");
@@ -2886,7 +2790,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 		_g_free0 (format);
 #line 631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		format = _tmp15_;
-#line 2890 "ui.c"
+#line 2794 "ui.c"
 	} else {
 		const gchar* _tmp16_ = NULL;
 		gboolean _tmp17_ = FALSE;
@@ -2896,7 +2800,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 		_tmp17_ = g_str_has_suffix (_tmp16_, ".ps");
 #line 632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp17_) {
-#line 2900 "ui.c"
+#line 2804 "ui.c"
 			gchar* _tmp18_ = NULL;
 #line 633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp18_ = g_strdup ("ps");
@@ -2904,7 +2808,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 			_g_free0 (format);
 #line 633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			format = _tmp18_;
-#line 2908 "ui.c"
+#line 2812 "ui.c"
 		} else {
 			const gchar* _tmp19_ = NULL;
 			gboolean _tmp20_ = FALSE;
@@ -2914,7 +2818,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 			_tmp20_ = g_str_has_suffix (_tmp19_, ".png");
 #line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (_tmp20_) {
-#line 2918 "ui.c"
+#line 2822 "ui.c"
 				gchar* _tmp21_ = NULL;
 #line 635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp21_ = g_strdup ("png");
@@ -2922,7 +2826,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 				_g_free0 (format);
 #line 635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				format = _tmp21_;
-#line 2926 "ui.c"
+#line 2830 "ui.c"
 			} else {
 				gboolean _tmp22_ = FALSE;
 				const gchar* _tmp23_ = NULL;
@@ -2935,7 +2839,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 				if (_tmp24_) {
 #line 636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp22_ = TRUE;
-#line 2939 "ui.c"
+#line 2843 "ui.c"
 				} else {
 					const gchar* _tmp25_ = NULL;
 					gboolean _tmp26_ = FALSE;
@@ -2945,11 +2849,11 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 					_tmp26_ = g_str_has_suffix (_tmp25_, ".tiff");
 #line 636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp22_ = _tmp26_;
-#line 2949 "ui.c"
+#line 2853 "ui.c"
 				}
 #line 636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp22_) {
-#line 2953 "ui.c"
+#line 2857 "ui.c"
 					gchar* _tmp27_ = NULL;
 #line 637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp27_ = g_strdup ("tiff");
@@ -2957,14 +2861,14 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 					_g_free0 (format);
 #line 637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					format = _tmp27_;
-#line 2961 "ui.c"
+#line 2865 "ui.c"
 				}
 			}
 		}
 	}
 #line 639 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_show_progress_dialog (self);
-#line 2968 "ui.c"
+#line 2872 "ui.c"
 	{
 		Book* _tmp28_ = NULL;
 		const gchar* _tmp29_ = NULL;
@@ -2985,7 +2889,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 		book_save (_tmp28_, _tmp29_, _tmp31_, _tmp32_, &_inner_error_);
 #line 642 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2989 "ui.c"
+#line 2893 "ui.c"
 			goto __catch17_g_error;
 		}
 	}
@@ -3032,7 +2936,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 		_g_free0 (uri);
 #line 652 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 3036 "ui.c"
+#line 2940 "ui.c"
 	}
 	__finally17:
 #line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -3051,7 +2955,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 		g_clear_error (&_inner_error_);
 #line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return FALSE;
-#line 3055 "ui.c"
+#line 2959 "ui.c"
 	}
 #line 655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp38_ = uri;
@@ -3077,7 +2981,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 	_g_free0 (uri);
 #line 657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 3081 "ui.c"
+#line 2985 "ui.c"
 }
 
 
@@ -3120,7 +3024,7 @@ static gboolean user_interface_prompt_to_save (UserInterface* self, const gchar*
 		result = TRUE;
 #line 663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 3124 "ui.c"
+#line 3028 "ui.c"
 	}
 #line 665 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = title;
@@ -3170,7 +3074,7 @@ static gboolean user_interface_prompt_to_save (UserInterface* self, const gchar*
 	switch (_tmp16_) {
 #line 680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case GTK_RESPONSE_YES:
-#line 3174 "ui.c"
+#line 3078 "ui.c"
 		{
 			gboolean _tmp17_ = FALSE;
 #line 683 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -3183,7 +3087,7 @@ static gboolean user_interface_prompt_to_save (UserInterface* self, const gchar*
 				_g_object_unref0 (dialog);
 #line 684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				return result;
-#line 3187 "ui.c"
+#line 3091 "ui.c"
 			} else {
 #line 686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				result = FALSE;
@@ -3191,12 +3095,12 @@ static gboolean user_interface_prompt_to_save (UserInterface* self, const gchar*
 				_g_object_unref0 (dialog);
 #line 686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				return result;
-#line 3195 "ui.c"
+#line 3099 "ui.c"
 			}
 		}
 #line 680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case GTK_RESPONSE_NO:
-#line 3200 "ui.c"
+#line 3104 "ui.c"
 		{
 #line 688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			result = TRUE;
@@ -3204,7 +3108,7 @@ static gboolean user_interface_prompt_to_save (UserInterface* self, const gchar*
 			_g_object_unref0 (dialog);
 #line 688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			return result;
-#line 3208 "ui.c"
+#line 3112 "ui.c"
 		}
 		default:
 		{
@@ -3214,12 +3118,12 @@ static gboolean user_interface_prompt_to_save (UserInterface* self, const gchar*
 			_g_object_unref0 (dialog);
 #line 690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			return result;
-#line 3218 "ui.c"
+#line 3122 "ui.c"
 		}
 	}
 #line 660 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (dialog);
-#line 3223 "ui.c"
+#line 3127 "ui.c"
 }
 
 
@@ -3252,7 +3156,7 @@ static void user_interface_clear_document (UserInterface* self) {
 	_tmp3_ = self->priv->copy_to_clipboard_menuitem;
 #line 701 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp3_, FALSE);
-#line 3256 "ui.c"
+#line 3160 "ui.c"
 }
 
 
@@ -3274,7 +3178,7 @@ static void user_interface_new_document (UserInterface* self) {
 	if (!_tmp2_) {
 #line 710 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 3278 "ui.c"
+#line 3182 "ui.c"
 	}
 #line 712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = user_interface_get_scanning (self);
@@ -3284,11 +3188,11 @@ static void user_interface_new_document (UserInterface* self) {
 	if (_tmp4_) {
 #line 713 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_signal_emit_by_name (self, "stop-scan");
-#line 3288 "ui.c"
+#line 3192 "ui.c"
 	}
 #line 714 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_clear_document (self);
-#line 3292 "ui.c"
+#line 3196 "ui.c"
 }
 
 
@@ -3299,14 +3203,14 @@ static void user_interface_new_button_clicked_cb (UserInterface* self, GtkWidget
 	g_return_if_fail (widget != NULL);
 #line 720 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_new_document (self);
-#line 3303 "ui.c"
+#line 3207 "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 3310 "ui.c"
+#line 3214 "ui.c"
 }
 
 
@@ -3315,7 +3219,7 @@ void user_interface_new_document_activate_cb (UserInterface* self) {
 	g_return_if_fail (self != NULL);
 #line 725 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_new_document (self);
-#line 3319 "ui.c"
+#line 3223 "ui.c"
 }
 
 
@@ -3340,7 +3244,7 @@ static void user_interface_set_document_hint (UserInterface* self, const gchar*
 	_tmp2_ = document_hint;
 #line 732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (g_strcmp0 (_tmp2_, "text") == 0) {
-#line 3344 "ui.c"
+#line 3248 "ui.c"
 		GtkRadioMenuItem* _tmp3_ = NULL;
 		GtkRadioMenuItem* _tmp4_ = NULL;
 		GtkRadioMenuItem* _tmp5_ = NULL;
@@ -3356,14 +3260,14 @@ static void user_interface_set_document_hint (UserInterface* self, const gchar*
 		_tmp5_ = self->priv->text_menuitem;
 #line 736 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp5_, TRUE);
-#line 3360 "ui.c"
+#line 3264 "ui.c"
 	} else {
 		const gchar* _tmp6_ = NULL;
 #line 738 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = document_hint;
 #line 738 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (g_strcmp0 (_tmp6_, "photo") == 0) {
-#line 3367 "ui.c"
+#line 3271 "ui.c"
 			GtkRadioMenuItem* _tmp7_ = NULL;
 			GtkRadioMenuItem* _tmp8_ = NULL;
 			GtkRadioMenuItem* _tmp9_ = NULL;
@@ -3379,14 +3283,14 @@ static void user_interface_set_document_hint (UserInterface* self, const gchar*
 			_tmp9_ = self->priv->photo_menuitem;
 #line 742 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp9_, TRUE);
-#line 3383 "ui.c"
+#line 3287 "ui.c"
 		}
 	}
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = save;
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp10_) {
-#line 3390 "ui.c"
+#line 3294 "ui.c"
 		GSettings* _tmp11_ = NULL;
 		const gchar* _tmp12_ = NULL;
 #line 746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -3395,7 +3299,7 @@ static void user_interface_set_document_hint (UserInterface* self, const gchar*
 		_tmp12_ = document_hint;
 #line 746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_settings_set_string (_tmp11_, "document-type", _tmp12_);
-#line 3399 "ui.c"
+#line 3303 "ui.c"
 	}
 }
 
@@ -3418,7 +3322,7 @@ static void user_interface_text_menuitem_toggled_cb (UserInterface* self, GtkChe
 	if (_tmp2_) {
 #line 753 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_document_hint (self, "text", TRUE);
-#line 3422 "ui.c"
+#line 3326 "ui.c"
 	}
 }
 
@@ -3426,7 +3330,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 3430 "ui.c"
+#line 3334 "ui.c"
 }
 
 
@@ -3448,7 +3352,7 @@ static void user_interface_photo_menuitem_toggled_cb (UserInterface* self, GtkCh
 	if (_tmp2_) {
 #line 760 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_document_hint (self, "photo", TRUE);
-#line 3452 "ui.c"
+#line 3356 "ui.c"
 	}
 }
 
@@ -3456,7 +3360,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 3460 "ui.c"
+#line 3364 "ui.c"
 }
 
 
@@ -3475,14 +3379,14 @@ static void user_interface_set_page_side (UserInterface* self, ScanType page_sid
 	iter = _tmp1_;
 #line 767 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 3479 "ui.c"
+#line 3383 "ui.c"
 		{
 			gboolean _tmp3_ = FALSE;
 #line 769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp3_ = TRUE;
 #line 769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			while (TRUE) {
-#line 3486 "ui.c"
+#line 3390 "ui.c"
 				gint s = 0;
 				GtkListStore* _tmp6_ = NULL;
 				GtkTreeIter _tmp7_ = {0};
@@ -3490,7 +3394,7 @@ static void user_interface_set_page_side (UserInterface* self, ScanType page_sid
 				ScanType _tmp9_ = 0;
 #line 769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (!_tmp3_) {
-#line 3494 "ui.c"
+#line 3398 "ui.c"
 					GtkListStore* _tmp4_ = NULL;
 					gboolean _tmp5_ = FALSE;
 #line 778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -3501,7 +3405,7 @@ static void user_interface_set_page_side (UserInterface* self, ScanType page_sid
 					if (!_tmp5_) {
 #line 778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						break;
-#line 3505 "ui.c"
+#line 3409 "ui.c"
 					}
 				}
 #line 769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -3518,7 +3422,7 @@ static void user_interface_set_page_side (UserInterface* self, ScanType page_sid
 				_tmp9_ = page_side;
 #line 773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp8_ == ((gint) _tmp9_)) {
-#line 3522 "ui.c"
+#line 3426 "ui.c"
 					GtkComboBox* _tmp10_ = NULL;
 					GtkTreeIter _tmp11_ = {0};
 #line 775 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -3529,7 +3433,7 @@ static void user_interface_set_page_side (UserInterface* self, ScanType page_sid
 					gtk_combo_box_set_active_iter (_tmp10_, &_tmp11_);
 #line 776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					return;
-#line 3533 "ui.c"
+#line 3437 "ui.c"
 				}
 			}
 		}
@@ -3544,7 +3448,7 @@ static void user_interface_set_paper_size (UserInterface* self, gint width, gint
 	gboolean _tmp18_ = FALSE;
 #line 782 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 3548 "ui.c"
+#line 3452 "ui.c"
 	{
 		GtkListStore* _tmp0_ = NULL;
 		GtkTreeIter _tmp1_ = {0};
@@ -3562,7 +3466,7 @@ static void user_interface_set_paper_size (UserInterface* self, gint width, gint
 		_tmp3_ = TRUE;
 #line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		while (TRUE) {
-#line 3566 "ui.c"
+#line 3470 "ui.c"
 			gboolean _tmp6_ = FALSE;
 			gint w = 0;
 			gint h = 0;
@@ -3573,7 +3477,7 @@ static void user_interface_set_paper_size (UserInterface* self, gint width, gint
 			gint _tmp11_ = 0;
 #line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (!_tmp3_) {
-#line 3577 "ui.c"
+#line 3481 "ui.c"
 				GtkListStore* _tmp4_ = NULL;
 				gboolean _tmp5_ = FALSE;
 #line 789 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -3582,7 +3486,7 @@ static void user_interface_set_paper_size (UserInterface* self, gint width, gint
 				_tmp5_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp4_, &iter);
 #line 789 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				have_iter = _tmp5_;
-#line 3586 "ui.c"
+#line 3490 "ui.c"
 			}
 #line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp3_ = FALSE;
@@ -3592,7 +3496,7 @@ static void user_interface_set_paper_size (UserInterface* self, gint width, gint
 			if (!_tmp6_) {
 #line 788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 3596 "ui.c"
+#line 3500 "ui.c"
 			}
 #line 792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp7_ = self->priv->paper_size_model;
@@ -3606,7 +3510,7 @@ static void user_interface_set_paper_size (UserInterface* self, gint width, gint
 			_tmp11_ = width;
 #line 793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (_tmp10_ == _tmp11_) {
-#line 3610 "ui.c"
+#line 3514 "ui.c"
 				gint _tmp12_ = 0;
 				gint _tmp13_ = 0;
 #line 793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -3615,17 +3519,17 @@ static void user_interface_set_paper_size (UserInterface* self, gint width, gint
 				_tmp13_ = height;
 #line 793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp9_ = _tmp12_ == _tmp13_;
-#line 3619 "ui.c"
+#line 3523 "ui.c"
 			} else {
 #line 793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp9_ = FALSE;
-#line 3623 "ui.c"
+#line 3527 "ui.c"
 			}
 #line 793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (_tmp9_) {
 #line 794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 3629 "ui.c"
+#line 3533 "ui.c"
 			}
 		}
 	}
@@ -3633,7 +3537,7 @@ static void user_interface_set_paper_size (UserInterface* self, gint width, gint
 	_tmp14_ = have_iter;
 #line 797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp14_) {
-#line 3637 "ui.c"
+#line 3541 "ui.c"
 		GtkListStore* _tmp15_ = NULL;
 		GtkTreeIter _tmp16_ = {0};
 		gboolean _tmp17_ = FALSE;
@@ -3645,13 +3549,13 @@ static void user_interface_set_paper_size (UserInterface* self, gint width, gint
 		iter = _tmp16_;
 #line 798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		have_iter = _tmp17_;
-#line 3649 "ui.c"
+#line 3553 "ui.c"
 	}
 #line 799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = have_iter;
 #line 799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp18_) {
-#line 3655 "ui.c"
+#line 3559 "ui.c"
 		GtkComboBox* _tmp19_ = NULL;
 		GtkTreeIter _tmp20_ = {0};
 #line 800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -3660,7 +3564,7 @@ static void user_interface_set_paper_size (UserInterface* self, gint width, gint
 		_tmp20_ = iter;
 #line 800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_combo_box_set_active_iter (_tmp19_, &_tmp20_);
-#line 3664 "ui.c"
+#line 3568 "ui.c"
 	}
 }
 
@@ -3684,7 +3588,7 @@ static gint user_interface_get_text_dpi (UserInterface* self) {
 	iter = _tmp1_;
 #line 808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 3688 "ui.c"
+#line 3592 "ui.c"
 		GtkListStore* _tmp3_ = NULL;
 		GtkTreeIter _tmp4_ = {0};
 #line 809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -3693,13 +3597,13 @@ static gint user_interface_get_text_dpi (UserInterface* self) {
 		_tmp4_ = iter;
 #line 809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_tree_model_get ((GtkTreeModel*) _tmp3_, &_tmp4_, 0, &dpi, -1, -1);
-#line 3697 "ui.c"
+#line 3601 "ui.c"
 	}
 #line 811 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = dpi;
 #line 811 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 3703 "ui.c"
+#line 3607 "ui.c"
 }
 
 
@@ -3722,7 +3626,7 @@ static gint user_interface_get_photo_dpi (UserInterface* self) {
 	iter = _tmp1_;
 #line 819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 3726 "ui.c"
+#line 3630 "ui.c"
 		GtkListStore* _tmp3_ = NULL;
 		GtkTreeIter _tmp4_ = {0};
 #line 820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -3731,13 +3635,13 @@ static gint user_interface_get_photo_dpi (UserInterface* self) {
 		_tmp4_ = iter;
 #line 820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_tree_model_get ((GtkTreeModel*) _tmp3_, &_tmp4_, 0, &dpi, -1, -1);
-#line 3735 "ui.c"
+#line 3639 "ui.c"
 	}
 #line 822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = dpi;
 #line 822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 3741 "ui.c"
+#line 3645 "ui.c"
 }
 
 
@@ -3761,7 +3665,7 @@ static ScanType user_interface_get_page_side (UserInterface* self) {
 	iter = _tmp1_;
 #line 830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 3765 "ui.c"
+#line 3669 "ui.c"
 		GtkListStore* _tmp3_ = NULL;
 		GtkTreeIter _tmp4_ = {0};
 #line 831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -3770,7 +3674,7 @@ static ScanType user_interface_get_page_side (UserInterface* self) {
 		_tmp4_ = iter;
 #line 831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_tree_model_get ((GtkTreeModel*) _tmp3_, &_tmp4_, 0, &page_side, -1, -1);
-#line 3774 "ui.c"
+#line 3678 "ui.c"
 	}
 #line 833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = page_side;
@@ -3778,7 +3682,7 @@ static ScanType user_interface_get_page_side (UserInterface* self) {
 	result = (ScanType) _tmp5_;
 #line 833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 3782 "ui.c"
+#line 3686 "ui.c"
 }
 
 
@@ -3807,7 +3711,7 @@ static gboolean user_interface_get_paper_size (UserInterface* self, gint* width,
 	iter = _tmp2_;
 #line 841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp3_) {
-#line 3811 "ui.c"
+#line 3715 "ui.c"
 		GtkListStore* _tmp4_ = NULL;
 		GtkTreeIter _tmp5_ = {0};
 #line 843 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -3822,17 +3726,17 @@ static gboolean user_interface_get_paper_size (UserInterface* self, gint* width,
 		if (width) {
 #line 844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			*width = _vala_width;
-#line 3826 "ui.c"
+#line 3730 "ui.c"
 		}
 #line 844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (height) {
 #line 844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			*height = _vala_height;
-#line 3832 "ui.c"
+#line 3736 "ui.c"
 		}
 #line 844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 3836 "ui.c"
+#line 3740 "ui.c"
 	}
 #line 847 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
@@ -3840,17 +3744,17 @@ static gboolean user_interface_get_paper_size (UserInterface* self, gint* width,
 	if (width) {
 #line 847 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*width = _vala_width;
-#line 3844 "ui.c"
+#line 3748 "ui.c"
 	}
 #line 847 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (height) {
 #line 847 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*height = _vala_height;
-#line 3850 "ui.c"
+#line 3754 "ui.c"
 	}
 #line 847 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 3854 "ui.c"
+#line 3758 "ui.c"
 }
 
 
@@ -3879,7 +3783,7 @@ static ScanOptions* user_interface_make_scan_options (UserInterface* self) {
 	_tmp1_ = self->priv->document_hint;
 #line 853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (g_strcmp0 (_tmp1_, "text") == 0) {
-#line 3883 "ui.c"
+#line 3787 "ui.c"
 		ScanOptions* _tmp2_ = NULL;
 		ScanOptions* _tmp3_ = NULL;
 		gint _tmp4_ = 0;
@@ -3898,7 +3802,7 @@ static ScanOptions* user_interface_make_scan_options (UserInterface* self) {
 		_tmp5_ = options;
 #line 857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_->depth = 2;
-#line 3902 "ui.c"
+#line 3806 "ui.c"
 	} else {
 		ScanOptions* _tmp6_ = NULL;
 		ScanOptions* _tmp7_ = NULL;
@@ -3918,7 +3822,7 @@ static ScanOptions* user_interface_make_scan_options (UserInterface* self) {
 		_tmp9_ = options;
 #line 863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_->depth = 8;
-#line 3922 "ui.c"
+#line 3826 "ui.c"
 	}
 #line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = options;
@@ -3950,7 +3854,7 @@ static ScanOptions* user_interface_make_scan_options (UserInterface* self) {
 	result = options;
 #line 869 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 3954 "ui.c"
+#line 3858 "ui.c"
 }
 
 
@@ -3982,14 +3886,14 @@ static void user_interface_scan_button_clicked_cb (UserInterface* self, GtkWidge
 	_g_free0 (_tmp3_);
 #line 873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_scan_options_unref0 (options);
-#line 3986 "ui.c"
+#line 3890 "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 3993 "ui.c"
+#line 3897 "ui.c"
 }
 
 
@@ -4000,14 +3904,14 @@ static void user_interface_stop_scan_button_clicked_cb (UserInterface* self, Gtk
 	g_return_if_fail (widget != NULL);
 #line 883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_emit_by_name (self, "stop-scan");
-#line 4004 "ui.c"
+#line 3908 "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 4011 "ui.c"
+#line 3915 "ui.c"
 }
 
 
@@ -4026,7 +3930,7 @@ static void user_interface_continuous_scan_button_clicked_cb (UserInterface* sel
 	if (_tmp1_) {
 #line 890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_signal_emit_by_name (self, "stop-scan");
-#line 4030 "ui.c"
+#line 3934 "ui.c"
 	} else {
 		ScanOptions* options = NULL;
 		ScanOptions* _tmp2_ = NULL;
@@ -4060,7 +3964,7 @@ static void user_interface_continuous_scan_button_clicked_cb (UserInterface* sel
 		_g_free0 (_tmp7_);
 #line 889 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_scan_options_unref0 (options);
-#line 4064 "ui.c"
+#line 3968 "ui.c"
 	}
 }
 
@@ -4068,7 +3972,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 4072 "ui.c"
+#line 3976 "ui.c"
 }
 
 
@@ -4082,14 +3986,14 @@ static void user_interface_preferences_button_clicked_cb (UserInterface* self, G
 	_tmp0_ = self->priv->preferences_dialog;
 #line 902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_present ((GtkWindow*) _tmp0_);
-#line 4086 "ui.c"
+#line 3990 "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 4093 "ui.c"
+#line 3997 "ui.c"
 }
 
 
@@ -4101,7 +4005,7 @@ void user_interface_preferences_activate_cb (UserInterface* self) {
 	_tmp0_ = self->priv->preferences_dialog;
 #line 907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_present ((GtkWindow*) _tmp0_);
-#line 4105 "ui.c"
+#line 4009 "ui.c"
 }
 
 
@@ -4117,7 +4021,7 @@ static gboolean user_interface_preferences_dialog_delete_event_cb (UserInterface
 	result = TRUE;
 #line 913 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 4121 "ui.c"
+#line 4025 "ui.c"
 }
 
 
@@ -4126,7 +4030,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 4130 "ui.c"
+#line 4034 "ui.c"
 }
 
 
@@ -4140,21 +4044,21 @@ static void user_interface_preferences_dialog_response_cb (UserInterface* self,
 	_tmp0_ = self->priv->preferences_dialog;
 #line 919 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp0_, FALSE);
-#line 4144 "ui.c"
+#line 4048 "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 4151 "ui.c"
+#line 4055 "ui.c"
 }
 
 
 static gpointer _page_ref0 (gpointer self) {
 #line 924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self ? page_ref (self) : NULL;
-#line 4158 "ui.c"
+#line 4062 "ui.c"
 }
 
 
@@ -4181,7 +4085,7 @@ static void user_interface_update_page_menu (UserInterface* self) {
 	_tmp4_ = page;
 #line 925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp4_ == NULL) {
-#line 4185 "ui.c"
+#line 4089 "ui.c"
 		GtkMenuItem* _tmp5_ = NULL;
 		GtkMenuItem* _tmp6_ = NULL;
 #line 927 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -4192,7 +4096,7 @@ static void user_interface_update_page_menu (UserInterface* self) {
 		_tmp6_ = self->priv->page_move_right_menuitem;
 #line 928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_set_sensitive ((GtkWidget*) _tmp6_, FALSE);
-#line 4196 "ui.c"
+#line 4100 "ui.c"
 	} else {
 		guint index = 0U;
 		Book* _tmp7_ = NULL;
@@ -4231,11 +4135,11 @@ static void user_interface_update_page_menu (UserInterface* self) {
 		_tmp16_ = _tmp15_;
 #line 934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_set_sensitive ((GtkWidget*) _tmp12_, _tmp13_ < (_tmp16_ - 1));
-#line 4235 "ui.c"
+#line 4139 "ui.c"
 	}
 #line 922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 4239 "ui.c"
+#line 4143 "ui.c"
 }
 
 
@@ -4266,7 +4170,7 @@ static void user_interface_page_selected_cb (UserInterface* self, BookView* view
 	if (_tmp0_ == NULL) {
 #line 941 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4270 "ui.c"
+#line 4174 "ui.c"
 	}
 #line 943 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->updating_page_menu = TRUE;
@@ -4286,7 +4190,7 @@ static void user_interface_page_selected_cb (UserInterface* self, BookView* view
 	_tmp5_ = _tmp4_;
 #line 948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp5_) {
-#line 4290 "ui.c"
+#line 4194 "ui.c"
 		gchar* crop_name = NULL;
 		Page* _tmp6_ = NULL;
 		const gchar* _tmp7_ = NULL;
@@ -4307,13 +4211,13 @@ static void user_interface_page_selected_cb (UserInterface* self, BookView* view
 		_tmp10_ = crop_name;
 #line 951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp10_ != NULL) {
-#line 4311 "ui.c"
+#line 4215 "ui.c"
 			const gchar* _tmp11_ = NULL;
 #line 953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp11_ = crop_name;
 #line 953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (g_strcmp0 (_tmp11_, "A4") == 0) {
-#line 4317 "ui.c"
+#line 4221 "ui.c"
 				GtkRadioMenuItem* _tmp12_ = NULL;
 				GtkRadioMenuItem* _tmp13_ = NULL;
 #line 954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -4324,14 +4228,14 @@ static void user_interface_page_selected_cb (UserInterface* self, BookView* view
 				_g_object_unref0 (menuitem);
 #line 954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				menuitem = _tmp13_;
-#line 4328 "ui.c"
+#line 4232 "ui.c"
 			} else {
 				const gchar* _tmp14_ = NULL;
 #line 955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp14_ = crop_name;
 #line 955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (g_strcmp0 (_tmp14_, "A5") == 0) {
-#line 4335 "ui.c"
+#line 4239 "ui.c"
 					GtkRadioMenuItem* _tmp15_ = NULL;
 					GtkRadioMenuItem* _tmp16_ = NULL;
 #line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -4342,14 +4246,14 @@ static void user_interface_page_selected_cb (UserInterface* self, BookView* view
 					_g_object_unref0 (menuitem);
 #line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					menuitem = _tmp16_;
-#line 4346 "ui.c"
+#line 4250 "ui.c"
 				} else {
 					const gchar* _tmp17_ = NULL;
 #line 957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp17_ = crop_name;
 #line 957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					if (g_strcmp0 (_tmp17_, "A6") == 0) {
-#line 4353 "ui.c"
+#line 4257 "ui.c"
 						GtkRadioMenuItem* _tmp18_ = NULL;
 						GtkRadioMenuItem* _tmp19_ = NULL;
 #line 958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -4360,14 +4264,14 @@ static void user_interface_page_selected_cb (UserInterface* self, BookView* view
 						_g_object_unref0 (menuitem);
 #line 958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						menuitem = _tmp19_;
-#line 4364 "ui.c"
+#line 4268 "ui.c"
 					} else {
 						const gchar* _tmp20_ = NULL;
 #line 959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp20_ = crop_name;
 #line 959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						if (g_strcmp0 (_tmp20_, "letter") == 0) {
-#line 4371 "ui.c"
+#line 4275 "ui.c"
 							GtkRadioMenuItem* _tmp21_ = NULL;
 							GtkRadioMenuItem* _tmp22_ = NULL;
 #line 960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -4378,14 +4282,14 @@ static void user_interface_page_selected_cb (UserInterface* self, BookView* view
 							_g_object_unref0 (menuitem);
 #line 960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							menuitem = _tmp22_;
-#line 4382 "ui.c"
+#line 4286 "ui.c"
 						} else {
 							const gchar* _tmp23_ = NULL;
 #line 961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp23_ = crop_name;
 #line 961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							if (g_strcmp0 (_tmp23_, "legal") == 0) {
-#line 4389 "ui.c"
+#line 4293 "ui.c"
 								GtkRadioMenuItem* _tmp24_ = NULL;
 								GtkRadioMenuItem* _tmp25_ = NULL;
 #line 962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -4396,14 +4300,14 @@ static void user_interface_page_selected_cb (UserInterface* self, BookView* view
 								_g_object_unref0 (menuitem);
 #line 962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								menuitem = _tmp25_;
-#line 4400 "ui.c"
+#line 4304 "ui.c"
 							} else {
 								const gchar* _tmp26_ = NULL;
 #line 963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_tmp26_ = crop_name;
 #line 963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								if (g_strcmp0 (_tmp26_, "4x6") == 0) {
-#line 4407 "ui.c"
+#line 4311 "ui.c"
 									GtkRadioMenuItem* _tmp27_ = NULL;
 									GtkRadioMenuItem* _tmp28_ = NULL;
 #line 964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -4414,7 +4318,7 @@ static void user_interface_page_selected_cb (UserInterface* self, BookView* view
 									_g_object_unref0 (menuitem);
 #line 964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 									menuitem = _tmp28_;
-#line 4418 "ui.c"
+#line 4322 "ui.c"
 								}
 							}
 						}
@@ -4432,11 +4336,11 @@ static void user_interface_page_selected_cb (UserInterface* self, BookView* view
 			_g_object_unref0 (menuitem);
 #line 967 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			menuitem = _tmp30_;
-#line 4436 "ui.c"
+#line 4340 "ui.c"
 		}
 #line 948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (crop_name);
-#line 4440 "ui.c"
+#line 4344 "ui.c"
 	}
 #line 970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp31_ = menuitem;
@@ -4466,7 +4370,7 @@ static void user_interface_page_selected_cb (UserInterface* self, BookView* view
 	self->priv->updating_page_menu = FALSE;
 #line 938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (menuitem);
-#line 4470 "ui.c"
+#line 4374 "ui.c"
 }
 
 
@@ -4496,7 +4400,7 @@ static void user_interface_show_page_cb (UserInterface* self, BookView* view, Pa
 		_g_free0 (path);
 #line 981 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4500 "ui.c"
+#line 4404 "ui.c"
 	}
 #line 982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = path;
@@ -4504,7 +4408,7 @@ static void user_interface_show_page_cb (UserInterface* self, BookView* view, Pa
 	_tmp3_ = g_file_new_for_path (_tmp2_);
 #line 982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	file = _tmp3_;
-#line 4508 "ui.c"
+#line 4412 "ui.c"
 	{
 		Page* _tmp4_ = NULL;
 		gint _tmp5_ = 0;
@@ -4522,7 +4426,7 @@ static void user_interface_show_page_cb (UserInterface* self, BookView* view, Pa
 		page_save (_tmp4_, "tiff", _tmp6_, _tmp7_, &_inner_error_);
 #line 986 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4526 "ui.c"
+#line 4430 "ui.c"
 			goto __catch18_g_error;
 		}
 	}
@@ -4553,7 +4457,7 @@ static void user_interface_show_page_cb (UserInterface* self, BookView* view, Pa
 		_g_free0 (path);
 #line 993 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4557 "ui.c"
+#line 4461 "ui.c"
 	}
 	__finally18:
 #line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -4568,7 +4472,7 @@ static void user_interface_show_page_cb (UserInterface* self, BookView* view, Pa
 		g_clear_error (&_inner_error_);
 #line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4572 "ui.c"
+#line 4476 "ui.c"
 	}
 	{
 		GdkScreen* _tmp11_ = NULL;
@@ -4595,7 +4499,7 @@ static void user_interface_show_page_cb (UserInterface* self, BookView* view, Pa
 		_g_free0 (_tmp15_);
 #line 998 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4599 "ui.c"
+#line 4503 "ui.c"
 			goto __catch19_g_error;
 		}
 	}
@@ -4620,7 +4524,7 @@ static void user_interface_show_page_cb (UserInterface* self, BookView* view, Pa
 		user_interface_show_error_dialog (self, _tmp17_, _tmp19_);
 #line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 4624 "ui.c"
+#line 4528 "ui.c"
 	}
 	__finally19:
 #line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -4635,13 +4539,13 @@ static void user_interface_show_page_cb (UserInterface* self, BookView* view, Pa
 		g_clear_error (&_inner_error_);
 #line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4639 "ui.c"
+#line 4543 "ui.c"
 	}
 #line 977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (file);
 #line 977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (path);
-#line 4645 "ui.c"
+#line 4549 "ui.c"
 }
 
 
@@ -4658,7 +4562,7 @@ static void user_interface_show_page_menu_cb (UserInterface* self, BookView* vie
 	_tmp1_ = gtk_get_current_event_time ();
 #line 1010 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_menu_popup (_tmp0_, NULL, NULL, NULL, NULL, (guint) 3, _tmp1_);
-#line 4662 "ui.c"
+#line 4566 "ui.c"
 }
 
 
@@ -4680,7 +4584,7 @@ static void user_interface_rotate_left_button_clicked_cb (UserInterface* self, G
 	if (_tmp0_) {
 #line 1017 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4684 "ui.c"
+#line 4588 "ui.c"
 	}
 #line 1018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->book_view;
@@ -4696,24 +4600,24 @@ static void user_interface_rotate_left_button_clicked_cb (UserInterface* self, G
 	_tmp5_ = page;
 #line 1019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp5_ != NULL) {
-#line 4700 "ui.c"
+#line 4604 "ui.c"
 		Page* _tmp6_ = NULL;
 #line 1020 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = page;
 #line 1020 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		page_rotate_left (_tmp6_);
-#line 4706 "ui.c"
+#line 4610 "ui.c"
 	}
 #line 1014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 4710 "ui.c"
+#line 4614 "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 4717 "ui.c"
+#line 4621 "ui.c"
 }
 
 
@@ -4735,7 +4639,7 @@ static void user_interface_rotate_right_button_clicked_cb (UserInterface* self,
 	if (_tmp0_) {
 #line 1027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4739 "ui.c"
+#line 4643 "ui.c"
 	}
 #line 1028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->book_view;
@@ -4751,24 +4655,24 @@ static void user_interface_rotate_right_button_clicked_cb (UserInterface* self,
 	_tmp5_ = page;
 #line 1029 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp5_ != NULL) {
-#line 4755 "ui.c"
+#line 4659 "ui.c"
 		Page* _tmp6_ = NULL;
 #line 1030 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = page;
 #line 1030 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		page_rotate_right (_tmp6_);
-#line 4761 "ui.c"
+#line 4665 "ui.c"
 	}
 #line 1024 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 4765 "ui.c"
+#line 4669 "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 4772 "ui.c"
+#line 4676 "ui.c"
 }
 
 
@@ -4797,7 +4701,7 @@ static void user_interface_set_crop (UserInterface* self, const gchar* crop_name
 	if (_tmp2_) {
 #line 1038 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4801 "ui.c"
+#line 4705 "ui.c"
 	}
 #line 1040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->book_view;
@@ -4819,26 +4723,26 @@ static void user_interface_set_crop (UserInterface* self, const gchar* crop_name
 		_page_unref0 (page);
 #line 1044 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4823 "ui.c"
+#line 4727 "ui.c"
 	}
 #line 1047 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = crop_name;
 #line 1047 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp8_ == NULL) {
-#line 4829 "ui.c"
+#line 4733 "ui.c"
 		Page* _tmp9_ = NULL;
 #line 1048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_ = page;
 #line 1048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		page_set_no_crop (_tmp9_);
-#line 4835 "ui.c"
+#line 4739 "ui.c"
 	} else {
 		const gchar* _tmp10_ = NULL;
 #line 1049 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp10_ = crop_name;
 #line 1049 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (g_strcmp0 (_tmp10_, "custom") == 0) {
-#line 4842 "ui.c"
+#line 4746 "ui.c"
 			gint width = 0;
 			Page* _tmp11_ = NULL;
 			gint _tmp12_ = 0;
@@ -4903,7 +4807,7 @@ static void user_interface_set_crop (UserInterface* self, const gchar* crop_name
 			_tmp26_ = crop_height;
 #line 1056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			page_move_crop (_tmp22_, (_tmp23_ - _tmp24_) / 2, (_tmp25_ - _tmp26_) / 2);
-#line 4907 "ui.c"
+#line 4811 "ui.c"
 		} else {
 			Page* _tmp27_ = NULL;
 			const gchar* _tmp28_ = NULL;
@@ -4913,12 +4817,12 @@ static void user_interface_set_crop (UserInterface* self, const gchar* crop_name
 			_tmp28_ = crop_name;
 #line 1059 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			page_set_named_crop (_tmp27_, _tmp28_);
-#line 4917 "ui.c"
+#line 4821 "ui.c"
 		}
 	}
 #line 1033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 4922 "ui.c"
+#line 4826 "ui.c"
 }
 
 
@@ -4940,7 +4844,7 @@ static void user_interface_no_crop_menuitem_toggled_cb (UserInterface* self, Gtk
 	if (_tmp2_) {
 #line 1066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, NULL);
-#line 4944 "ui.c"
+#line 4848 "ui.c"
 	}
 }
 
@@ -4948,7 +4852,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 4952 "ui.c"
+#line 4856 "ui.c"
 }
 
 
@@ -4970,7 +4874,7 @@ static void user_interface_custom_crop_menuitem_toggled_cb (UserInterface* self,
 	if (_tmp2_) {
 #line 1073 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "custom");
-#line 4974 "ui.c"
+#line 4878 "ui.c"
 	}
 }
 
@@ -4978,7 +4882,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 4982 "ui.c"
+#line 4886 "ui.c"
 }
 
 
@@ -4997,7 +4901,7 @@ static void user_interface_crop_button_toggled_cb (UserInterface* self, GtkToggl
 	if (_tmp0_) {
 #line 1080 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 5001 "ui.c"
+#line 4905 "ui.c"
 	}
 #line 1082 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = widget;
@@ -5007,20 +4911,20 @@ static void user_interface_crop_button_toggled_cb (UserInterface* self, GtkToggl
 	_tmp3_ = _tmp2_;
 #line 1082 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp3_) {
-#line 5011 "ui.c"
+#line 4915 "ui.c"
 		GtkRadioMenuItem* _tmp4_ = NULL;
 #line 1083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = self->priv->custom_crop_menuitem;
 #line 1083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp4_, TRUE);
-#line 5017 "ui.c"
+#line 4921 "ui.c"
 	} else {
 		GtkRadioMenuItem* _tmp5_ = NULL;
 #line 1085 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = self->priv->no_crop_menuitem;
 #line 1085 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp5_, TRUE);
-#line 5024 "ui.c"
+#line 4928 "ui.c"
 	}
 }
 
@@ -5028,7 +4932,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 5032 "ui.c"
+#line 4936 "ui.c"
 }
 
 
@@ -5047,7 +4951,7 @@ static void user_interface_crop_toolbutton_toggled_cb (UserInterface* self, GtkT
 	if (_tmp0_) {
 #line 1092 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 5051 "ui.c"
+#line 4955 "ui.c"
 	}
 #line 1094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = widget;
@@ -5057,20 +4961,20 @@ static void user_interface_crop_toolbutton_toggled_cb (UserInterface* self, GtkT
 	_tmp3_ = _tmp2_;
 #line 1094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp3_) {
-#line 5061 "ui.c"
+#line 4965 "ui.c"
 		GtkRadioMenuItem* _tmp4_ = NULL;
 #line 1095 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = self->priv->custom_crop_menuitem;
 #line 1095 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp4_, TRUE);
-#line 5067 "ui.c"
+#line 4971 "ui.c"
 	} else {
 		GtkRadioMenuItem* _tmp5_ = NULL;
 #line 1097 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = self->priv->no_crop_menuitem;
 #line 1097 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp5_, TRUE);
-#line 5074 "ui.c"
+#line 4978 "ui.c"
 	}
 }
 
@@ -5078,7 +4982,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 5082 "ui.c"
+#line 4986 "ui.c"
 }
 
 
@@ -5100,7 +5004,7 @@ static void user_interface_four_by_six_menuitem_toggled_cb (UserInterface* self,
 	if (_tmp2_) {
 #line 1104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "4x6");
-#line 5104 "ui.c"
+#line 5008 "ui.c"
 	}
 }
 
@@ -5108,7 +5012,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 5112 "ui.c"
+#line 5016 "ui.c"
 }
 
 
@@ -5130,7 +5034,7 @@ static void user_interface_legal_menuitem_toggled_cb (UserInterface* self, GtkCh
 	if (_tmp2_) {
 #line 1111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "legal");
-#line 5134 "ui.c"
+#line 5038 "ui.c"
 	}
 }
 
@@ -5138,7 +5042,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 5142 "ui.c"
+#line 5046 "ui.c"
 }
 
 
@@ -5160,7 +5064,7 @@ static void user_interface_letter_menuitem_toggled_cb (UserInterface* self, GtkC
 	if (_tmp2_) {
 #line 1118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "letter");
-#line 5164 "ui.c"
+#line 5068 "ui.c"
 	}
 }
 
@@ -5168,7 +5072,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 5172 "ui.c"
+#line 5076 "ui.c"
 }
 
 
@@ -5190,7 +5094,7 @@ static void user_interface_a6_menuitem_toggled_cb (UserInterface* self, GtkCheck
 	if (_tmp2_) {
 #line 1125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "A6");
-#line 5194 "ui.c"
+#line 5098 "ui.c"
 	}
 }
 
@@ -5198,7 +5102,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 5202 "ui.c"
+#line 5106 "ui.c"
 }
 
 
@@ -5220,7 +5124,7 @@ static void user_interface_a5_menuitem_toggled_cb (UserInterface* self, GtkCheck
 	if (_tmp2_) {
 #line 1132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "A5");
-#line 5224 "ui.c"
+#line 5128 "ui.c"
 	}
 }
 
@@ -5228,7 +5132,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 5232 "ui.c"
+#line 5136 "ui.c"
 }
 
 
@@ -5250,7 +5154,7 @@ static void user_interface_a4_menuitem_toggled_cb (UserInterface* self, GtkCheck
 	if (_tmp2_) {
 #line 1139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "A4");
-#line 5254 "ui.c"
+#line 5158 "ui.c"
 	}
 }
 
@@ -5258,7 +5162,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 5262 "ui.c"
+#line 5166 "ui.c"
 }
 
 
@@ -5292,7 +5196,7 @@ static void user_interface_crop_rotate_menuitem_activate_cb (UserInterface* self
 		_page_unref0 (page);
 #line 1147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 5296 "ui.c"
+#line 5200 "ui.c"
 	}
 #line 1148 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = page;
@@ -5300,14 +5204,14 @@ static void user_interface_crop_rotate_menuitem_activate_cb (UserInterface* self
 	page_rotate_crop (_tmp5_);
 #line 1143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 5304 "ui.c"
+#line 5208 "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 5311 "ui.c"
+#line 5215 "ui.c"
 }
 
 
@@ -5348,7 +5252,7 @@ static void user_interface_page_move_left_menuitem_activate_cb (UserInterface* s
 	_tmp7_ = index;
 #line 1156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp7_ > ((guint) 0)) {
-#line 5352 "ui.c"
+#line 5256 "ui.c"
 		Book* _tmp8_ = NULL;
 		Page* _tmp9_ = NULL;
 		guint _tmp10_ = 0U;
@@ -5360,18 +5264,18 @@ static void user_interface_page_move_left_menuitem_activate_cb (UserInterface* s
 		_tmp10_ = index;
 #line 1157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		book_move_page (_tmp8_, _tmp9_, _tmp10_ - 1);
-#line 5364 "ui.c"
+#line 5268 "ui.c"
 	}
 #line 1152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 5368 "ui.c"
+#line 5272 "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 5375 "ui.c"
+#line 5279 "ui.c"
 }
 
 
@@ -5421,7 +5325,7 @@ static void user_interface_page_move_right_menuitem_activate_cb (UserInterface*
 	_tmp10_ = _tmp9_;
 #line 1165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp7_ < (_tmp10_ - 1)) {
-#line 5425 "ui.c"
+#line 5329 "ui.c"
 		Book* _tmp11_ = NULL;
 		Page* _tmp12_ = NULL;
 		Book* _tmp13_ = NULL;
@@ -5439,18 +5343,18 @@ static void user_interface_page_move_right_menuitem_activate_cb (UserInterface*
 		_tmp15_ = book_get_page_index (_tmp13_, _tmp14_);
 #line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		book_move_page (_tmp11_, _tmp12_, _tmp15_ + 1);
-#line 5443 "ui.c"
+#line 5347 "ui.c"
 	}
 #line 1161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 5447 "ui.c"
+#line 5351 "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 5454 "ui.c"
+#line 5358 "ui.c"
 }
 
 
@@ -5479,14 +5383,14 @@ static void user_interface_page_delete_menuitem_activate_cb (UserInterface* self
 	_tmp5_ = _tmp4_;
 #line 1172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_delete_page (_tmp2_, _tmp5_);
-#line 5483 "ui.c"
+#line 5387 "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 5490 "ui.c"
+#line 5394 "ui.c"
 }
 
 
@@ -5495,7 +5399,7 @@ static Block2Data* block2_data_ref (Block2Data* _data2_) {
 	g_atomic_int_inc (&_data2_->_ref_count_);
 #line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return _data2_;
-#line 5499 "ui.c"
+#line 5403 "ui.c"
 }
 
 
@@ -5504,7 +5408,7 @@ static void block2_data_unref (void * _userdata_) {
 	_data2_ = (Block2Data*) _userdata_;
 #line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (g_atomic_int_dec_and_test (&_data2_->_ref_count_)) {
-#line 5508 "ui.c"
+#line 5412 "ui.c"
 		UserInterface* self;
 #line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self = _data2_->self;
@@ -5514,7 +5418,7 @@ static void block2_data_unref (void * _userdata_) {
 		_g_object_unref0 (self);
 #line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_slice_free (Block2Data, _data2_);
-#line 5518 "ui.c"
+#line 5422 "ui.c"
 	}
 }
 
@@ -5535,7 +5439,7 @@ static gboolean __lambda6_ (Block2Data* _data2_, GdkEventKey* e) {
 	_tmp2_ = _tmp1_->state;
 #line 1186 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_ == 0) {
-#line 5539 "ui.c"
+#line 5443 "ui.c"
 		GdkEventKey* _tmp3_ = NULL;
 		guint _tmp4_ = 0U;
 #line 1186 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -5544,11 +5448,11 @@ static gboolean __lambda6_ (Block2Data* _data2_, GdkEventKey* e) {
 		_tmp4_ = _tmp3_->keyval;
 #line 1186 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = _tmp4_ == ((guint) GDK_KEY_Escape);
-#line 5548 "ui.c"
+#line 5452 "ui.c"
 	} else {
 #line 1186 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = FALSE;
-#line 5552 "ui.c"
+#line 5456 "ui.c"
 	}
 #line 1186 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
@@ -5558,13 +5462,13 @@ static gboolean __lambda6_ (Block2Data* _data2_, GdkEventKey* e) {
 		result = TRUE;
 #line 1189 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 5562 "ui.c"
+#line 5466 "ui.c"
 	}
 #line 1192 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
 #line 1192 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 5568 "ui.c"
+#line 5472 "ui.c"
 }
 
 
@@ -5573,7 +5477,7 @@ static gboolean ___lambda6__gtk_widget_key_press_event (GtkWidget* _sender, GdkE
 	result = __lambda6_ (self, event);
 #line 1184 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 5577 "ui.c"
+#line 5481 "ui.c"
 }
 
 
@@ -5588,14 +5492,14 @@ static void __lambda7_ (Block2Data* _data2_) {
 	book_combine_sides (_tmp0_);
 #line 1209 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_destroy ((GtkWidget*) _data2_->dialog);
-#line 5592 "ui.c"
+#line 5496 "ui.c"
 }
 
 
 static void ___lambda7__gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 1206 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	__lambda7_ (self);
-#line 5599 "ui.c"
+#line 5503 "ui.c"
 }
 
 
@@ -5610,14 +5514,14 @@ static void __lambda8_ (Block2Data* _data2_) {
 	book_combine_sides_reverse (_tmp0_);
 #line 1219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_destroy ((GtkWidget*) _data2_->dialog);
-#line 5614 "ui.c"
+#line 5518 "ui.c"
 }
 
 
 static void ___lambda8__gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 1216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	__lambda8_ (self);
-#line 5621 "ui.c"
+#line 5525 "ui.c"
 }
 
 
@@ -5632,14 +5536,14 @@ static void __lambda9_ (Block2Data* _data2_) {
 	book_reverse (_tmp0_);
 #line 1229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_destroy ((GtkWidget*) _data2_->dialog);
-#line 5636 "ui.c"
+#line 5540 "ui.c"
 }
 
 
 static void ___lambda9__gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 1226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	__lambda9_ (self);
-#line 5643 "ui.c"
+#line 5547 "ui.c"
 }
 
 
@@ -5649,14 +5553,14 @@ static void __lambda10_ (Block2Data* _data2_) {
 	self = _data2_->self;
 #line 1238 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_destroy ((GtkWidget*) _data2_->dialog);
-#line 5653 "ui.c"
+#line 5557 "ui.c"
 }
 
 
 static void ___lambda10__gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 1236 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	__lambda10_ (self);
-#line 5660 "ui.c"
+#line 5564 "ui.c"
 }
 
 
@@ -5823,7 +5727,7 @@ static void user_interface_reorder_document (UserInterface* self) {
 	block2_data_unref (_data2_);
 #line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data2_ = NULL;
-#line 5827 "ui.c"
+#line 5731 "ui.c"
 }
 
 
@@ -5832,7 +5736,7 @@ void user_interface_reorder_document_activate_cb (UserInterface* self) {
 	g_return_if_fail (self != NULL);
 #line 1248 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_reorder_document (self);
-#line 5836 "ui.c"
+#line 5740 "ui.c"
 }
 
 
@@ -5843,14 +5747,14 @@ static void user_interface_reorder_menuitem_activate_cb (UserInterface* self, Gt
 	g_return_if_fail (widget != NULL);
 #line 1254 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_reorder_document (self);
-#line 5847 "ui.c"
+#line 5751 "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 5854 "ui.c"
+#line 5758 "ui.c"
 }
 
 
@@ -5920,7 +5824,7 @@ static GtkButton* user_interface_make_reorder_button (UserInterface* self, const
 	_g_object_unref0 (vbox);
 #line 1273 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 5924 "ui.c"
+#line 5828 "ui.c"
 }
 
 
@@ -5938,7 +5842,7 @@ static gchar string_get (const gchar* self, glong index) {
 	result = _tmp1_;
 #line 997 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	return result;
-#line 5942 "ui.c"
+#line 5846 "ui.c"
 }
 
 
@@ -5964,19 +5868,19 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar
 	gtk_widget_set_visible ((GtkWidget*) _tmp1_, TRUE);
 #line 1281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page_box = NULL;
-#line 5968 "ui.c"
+#line 5872 "ui.c"
 	{
 		gint i = 0;
 #line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		i = 0;
-#line 5973 "ui.c"
+#line 5877 "ui.c"
 		{
 			gboolean _tmp2_ = FALSE;
 #line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp2_ = TRUE;
 #line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			while (TRUE) {
-#line 5980 "ui.c"
+#line 5884 "ui.c"
 				const gchar* _tmp4_ = NULL;
 				gint _tmp5_ = 0;
 				gchar _tmp6_ = '\0';
@@ -6018,13 +5922,13 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar
 				PageIcon* _tmp51_ = NULL;
 #line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (!_tmp2_) {
-#line 6022 "ui.c"
+#line 5926 "ui.c"
 					gint _tmp3_ = 0;
 #line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp3_ = i;
 #line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					i = _tmp3_ + 1;
-#line 6028 "ui.c"
+#line 5932 "ui.c"
 				}
 #line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp2_ = FALSE;
@@ -6038,7 +5942,7 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar
 				if (!(_tmp6_ != '\0')) {
 #line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					break;
-#line 6042 "ui.c"
+#line 5946 "ui.c"
 				}
 #line 1284 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp7_ = items;
@@ -6048,7 +5952,7 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar
 				_tmp9_ = string_get (_tmp7_, (glong) _tmp8_);
 #line 1284 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp9_ == '-') {
-#line 6052 "ui.c"
+#line 5956 "ui.c"
 					GtkArrow* a = NULL;
 					GtkArrow* _tmp10_ = NULL;
 					GtkArrow* _tmp11_ = NULL;
@@ -6078,7 +5982,7 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar
 					_g_object_unref0 (a);
 #line 1290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					continue;
-#line 6082 "ui.c"
+#line 5986 "ui.c"
 				}
 #line 1294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp14_ = items;
@@ -6102,13 +6006,13 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar
 				if (_tmp20_ == '\0') {
 #line 1297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					break;
-#line 6106 "ui.c"
+#line 6010 "ui.c"
 				}
 #line 1299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp21_ = page_box;
 #line 1299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp21_ == NULL) {
-#line 6112 "ui.c"
+#line 6016 "ui.c"
 					GtkBox* _tmp22_ = NULL;
 					GtkBox* _tmp23_ = NULL;
 					GtkBox* _tmp24_ = NULL;
@@ -6131,7 +6035,7 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar
 					_tmp25_ = page_box;
 #line 1303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_box_pack_start (_tmp24_, (GtkWidget*) _tmp25_, FALSE, FALSE, (guint) 0);
-#line 6135 "ui.c"
+#line 6039 "ui.c"
 				}
 #line 1307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				r = 1.0;
@@ -6145,7 +6049,7 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar
 				switch (_tmp26_) {
 #line 1310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					case 'F':
-#line 6149 "ui.c"
+#line 6053 "ui.c"
 					{
 #line 1314 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						r = 0x75 / 255.0;
@@ -6155,11 +6059,11 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar
 						b = 0x7B / 255.0;
 #line 1317 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						break;
-#line 6159 "ui.c"
+#line 6063 "ui.c"
 					}
 #line 1310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					case 'B':
-#line 6163 "ui.c"
+#line 6067 "ui.c"
 					{
 #line 1320 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						r = 0xF5 / 255.0;
@@ -6169,11 +6073,11 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar
 						b = 0.0;
 #line 1323 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						break;
-#line 6173 "ui.c"
+#line 6077 "ui.c"
 					}
 #line 1310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					case 'C':
-#line 6177 "ui.c"
+#line 6081 "ui.c"
 					{
 						gdouble p = 0.0;
 						const gchar* _tmp27_ = NULL;
@@ -6204,12 +6108,12 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar
 						b = (gdouble) 0;
 #line 1330 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						break;
-#line 6208 "ui.c"
+#line 6112 "ui.c"
 					}
 					default:
 #line 1310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					break;
-#line 6213 "ui.c"
+#line 6117 "ui.c"
 				}
 #line 1334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp33_ = r;
@@ -6267,7 +6171,7 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar
 				gtk_box_pack_start (_tmp50_, (GtkWidget*) _tmp51_, FALSE, FALSE, (guint) 0);
 #line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_object_unref0 (icon);
-#line 6271 "ui.c"
+#line 6175 "ui.c"
 			}
 		}
 	}
@@ -6277,7 +6181,7 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar
 	_g_object_unref0 (page_box);
 #line 1343 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 6281 "ui.c"
+#line 6185 "ui.c"
 }
 
 
@@ -6288,14 +6192,14 @@ static void user_interface_save_file_button_clicked_cb (UserInterface* self, Gtk
 	g_return_if_fail (widget != NULL);
 #line 1349 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_document (self, FALSE);
-#line 6292 "ui.c"
+#line 6196 "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 6299 "ui.c"
+#line 6203 "ui.c"
 }
 
 
@@ -6304,7 +6208,7 @@ void user_interface_save_document_activate_cb (UserInterface* self) {
 	g_return_if_fail (self != NULL);
 #line 1354 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_document (self, FALSE);
-#line 6308 "ui.c"
+#line 6212 "ui.c"
 }
 
 
@@ -6333,24 +6237,24 @@ static void user_interface_copy_to_clipboard_button_clicked_cb (UserInterface* s
 	_tmp4_ = page;
 #line 1361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp4_ != NULL) {
-#line 6337 "ui.c"
+#line 6241 "ui.c"
 		Page* _tmp5_ = NULL;
 #line 1362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = page;
 #line 1362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		page_copy_to_clipboard (_tmp5_, (GtkWindow*) self);
-#line 6343 "ui.c"
+#line 6247 "ui.c"
 	}
 #line 1358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 6347 "ui.c"
+#line 6251 "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 6354 "ui.c"
+#line 6258 "ui.c"
 }
 
 
@@ -6361,14 +6265,14 @@ static void user_interface_save_as_file_button_clicked_cb (UserInterface* self,
 	g_return_if_fail (widget != NULL);
 #line 1368 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_document (self, TRUE);
-#line 6365 "ui.c"
+#line 6269 "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 6372 "ui.c"
+#line 6276 "ui.c"
 }
 
 
@@ -6377,14 +6281,14 @@ void user_interface_save_as_document_activate_cb (UserInterface* self) {
 	g_return_if_fail (self != NULL);
 #line 1373 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_document (self, TRUE);
-#line 6381 "ui.c"
+#line 6285 "ui.c"
 }
 
 
 static gpointer _cairo_reference0 (gpointer self) {
 #line 1380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self ? cairo_reference (self) : NULL;
-#line 6388 "ui.c"
+#line 6292 "ui.c"
 }
 
 
@@ -6458,7 +6362,7 @@ static void user_interface_draw_page (UserInterface* self, GtkPrintOperation* op
 	if (_tmp7_ > _tmp9_) {
 #line 1386 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		is_landscape = TRUE;
-#line 6462 "ui.c"
+#line 6366 "ui.c"
 	}
 #line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = page;
@@ -6470,7 +6374,7 @@ static void user_interface_draw_page (UserInterface* self, GtkPrintOperation* op
 	_tmp13_ = is_landscape;
 #line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp12_ != _tmp13_) {
-#line 6474 "ui.c"
+#line 6378 "ui.c"
 		cairo_t* _tmp14_ = NULL;
 		GtkPrintContext* _tmp15_ = NULL;
 		gdouble _tmp16_ = 0.0;
@@ -6487,7 +6391,7 @@ static void user_interface_draw_page (UserInterface* self, GtkPrintOperation* op
 		_tmp17_ = context;
 #line 1390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		cairo_rotate (_tmp17_, G_PI_2);
-#line 6491 "ui.c"
+#line 6395 "ui.c"
 	}
 #line 1393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = context;
@@ -6533,7 +6437,7 @@ static void user_interface_draw_page (UserInterface* self, GtkPrintOperation* op
 	_page_unref0 (page);
 #line 1376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_cairo_destroy0 (context);
-#line 6537 "ui.c"
+#line 6441 "ui.c"
 }
 
 
@@ -6553,14 +6457,14 @@ static void user_interface_email_button_clicked_cb (UserInterface* self, GtkWidg
 	_tmp2_ = _tmp1_;
 #line 1404 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_emit_by_name (self, "email", _tmp0_, _tmp2_);
-#line 6557 "ui.c"
+#line 6461 "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 6564 "ui.c"
+#line 6468 "ui.c"
 }
 
 
@@ -6578,14 +6482,14 @@ void user_interface_email_document_activate_cb (UserInterface* self) {
 	_tmp2_ = _tmp1_;
 #line 1409 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_emit_by_name (self, "email", _tmp0_, _tmp2_);
-#line 6582 "ui.c"
+#line 6486 "ui.c"
 }
 
 
 static void _user_interface_draw_page_gtk_print_operation_draw_page (GtkPrintOperation* _sender, GtkPrintContext* context, gint page_nr, gpointer self) {
 #line 1416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_draw_page ((UserInterface*) self, _sender, context, page_nr);
-#line 6589 "ui.c"
+#line 6493 "ui.c"
 }
 
 
@@ -6613,13 +6517,13 @@ static void user_interface_print_document (UserInterface* self) {
 	g_object_set (print, "n-pages", (gint) _tmp3_, NULL);
 #line 1416 "/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 6617 "ui.c"
+#line 6521 "ui.c"
 	{
 #line 1420 "/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 1420 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6623 "ui.c"
+#line 6527 "ui.c"
 			goto __catch20_g_error;
 		}
 	}
@@ -6641,7 +6545,7 @@ static void user_interface_print_document (UserInterface* self) {
 		g_warning ("ui.vala:1424: Error printing: %s", _tmp5_);
 #line 1418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 6645 "ui.c"
+#line 6549 "ui.c"
 	}
 	__finally20:
 #line 1418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -6654,7 +6558,7 @@ static void user_interface_print_document (UserInterface* self) {
 		g_clear_error (&_inner_error_);
 #line 1418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 6658 "ui.c"
+#line 6562 "ui.c"
 	}
 #line 1427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_parse_name ("draw-page", gtk_print_operation_get_type (), &_tmp6_, NULL, FALSE);
@@ -6662,7 +6566,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 1412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (print);
-#line 6666 "ui.c"
+#line 6570 "ui.c"
 }
 
 
@@ -6673,14 +6577,14 @@ static void user_interface_print_button_clicked_cb (UserInterface* self, GtkWidg
 	g_return_if_fail (widget != NULL);
 #line 1433 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_print_document (self);
-#line 6677 "ui.c"
+#line 6581 "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 6684 "ui.c"
+#line 6588 "ui.c"
 }
 
 
@@ -6689,7 +6593,7 @@ void user_interface_print_document_activate_cb (UserInterface* self) {
 	g_return_if_fail (self != NULL);
 #line 1438 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_print_document (self);
-#line 6693 "ui.c"
+#line 6597 "ui.c"
 }
 
 
@@ -6697,7 +6601,7 @@ static void user_interface_launch_help (UserInterface* self) {
 	GError * _inner_error_ = NULL;
 #line 1441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 6701 "ui.c"
+#line 6605 "ui.c"
 	{
 		GdkScreen* _tmp0_ = NULL;
 		GdkScreen* _tmp1_ = NULL;
@@ -6712,7 +6616,7 @@ static void user_interface_launch_help (UserInterface* self) {
 		gtk_show_uri (_tmp1_, "help:simple-scan", _tmp2_, &_inner_error_);
 #line 1445 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6716 "ui.c"
+#line 6620 "ui.c"
 			goto __catch21_g_error;
 		}
 	}
@@ -6737,7 +6641,7 @@ static void user_interface_launch_help (UserInterface* self) {
 		user_interface_show_error_dialog (self, _tmp3_, _tmp5_);
 #line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 6741 "ui.c"
+#line 6645 "ui.c"
 	}
 	__finally21:
 #line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -6748,7 +6652,7 @@ static void user_interface_launch_help (UserInterface* self) {
 		g_clear_error (&_inner_error_);
 #line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 6752 "ui.c"
+#line 6656 "ui.c"
 	}
 }
 
@@ -6760,14 +6664,14 @@ static void user_interface_help_contents_menuitem_activate_cb (UserInterface* se
 	g_return_if_fail (widget != NULL);
 #line 1458 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_launch_help (self);
-#line 6764 "ui.c"
+#line 6668 "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 6771 "ui.c"
+#line 6675 "ui.c"
 }
 
 
@@ -6776,7 +6680,7 @@ void user_interface_help_contents_activate_cb (UserInterface* self) {
 	g_return_if_fail (self != NULL);
 #line 1463 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_launch_help (self);
-#line 6780 "ui.c"
+#line 6684 "ui.c"
 }
 
 
@@ -6851,7 +6755,7 @@ static void user_interface_show_about (UserInterface* self) {
 	_g_free0 (license);
 #line 1466 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	authors = (_vala_array_free (authors, authors_length1, (GDestroyNotify) g_free), NULL);
-#line 6844 "ui.c"
+#line 6748 "ui.c"
 }
 
 
@@ -6862,14 +6766,14 @@ static void user_interface_about_menuitem_activate_cb (UserInterface* self, GtkW
 	g_return_if_fail (widget != NULL);
 #line 1497 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_show_about (self);
-#line 6855 "ui.c"
+#line 6759 "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 6862 "ui.c"
+#line 6766 "ui.c"
 }
 
 
@@ -6878,7 +6782,7 @@ void user_interface_about_activate_cb (UserInterface* self) {
 	g_return_if_fail (self != NULL);
 #line 1502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_show_about (self);
-#line 6871 "ui.c"
+#line 6775 "ui.c"
 }
 
 
@@ -6903,7 +6807,7 @@ static gboolean user_interface_on_quit (UserInterface* self) {
 		result = FALSE;
 #line 1511 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 6896 "ui.c"
+#line 6800 "ui.c"
 	}
 #line 1513 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_destroy ((GtkWidget*) self);
@@ -6913,7 +6817,7 @@ static gboolean user_interface_on_quit (UserInterface* self) {
 	if (_tmp3_ != ((guint) 0)) {
 #line 1516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_save_state (self, TRUE);
-#line 6906 "ui.c"
+#line 6810 "ui.c"
 	}
 #line 1518 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = self->priv->autosave_manager;
@@ -6923,7 +6827,7 @@ static gboolean user_interface_on_quit (UserInterface* self) {
 	result = TRUE;
 #line 1520 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 6916 "ui.c"
+#line 6820 "ui.c"
 }
 
 
@@ -6934,14 +6838,14 @@ static void user_interface_quit_menuitem_activate_cb (UserInterface* self, GtkWi
 	g_return_if_fail (widget != NULL);
 #line 1526 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_on_quit (self);
-#line 6927 "ui.c"
+#line 6831 "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 6934 "ui.c"
+#line 6838 "ui.c"
 }
 
 
@@ -6950,7 +6854,7 @@ void user_interface_quit_activate_cb (UserInterface* self) {
 	g_return_if_fail (self != NULL);
 #line 1531 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_on_quit (self);
-#line 6943 "ui.c"
+#line 6847 "ui.c"
 }
 
 
@@ -6967,7 +6871,7 @@ static gboolean user_interface_simple_scan_window_configure_event_cb (UserInterf
 	_tmp0_ = self->priv->window_is_maximized;
 #line 1537 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp0_) {
-#line 6960 "ui.c"
+#line 6864 "ui.c"
 		GdkEventConfigure* _tmp1_ = NULL;
 		gint _tmp2_ = 0;
 		GdkEventConfigure* _tmp3_ = NULL;
@@ -6986,13 +6890,13 @@ static gboolean user_interface_simple_scan_window_configure_event_cb (UserInterf
 		self->priv->window_height = _tmp4_;
 #line 1541 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_save_state (self, FALSE);
-#line 6979 "ui.c"
+#line 6883 "ui.c"
 	}
 #line 1544 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
 #line 1544 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 6985 "ui.c"
+#line 6889 "ui.c"
 }
 
 
@@ -7001,7 +6905,7 @@ static gboolean _user_interface_simple_scan_window_configure_event_cb_gtk_widget
 	result = user_interface_simple_scan_window_configure_event_cb ((UserInterface*) self, _sender, event);
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 6994 "ui.c"
+#line 6898 "ui.c"
 }
 
 
@@ -7017,7 +6921,7 @@ static void user_interface_info_bar_response_cb (UserInterface* self, GtkInfoBar
 	switch (_tmp0_) {
 #line 1549 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case 1:
-#line 7010 "ui.c"
+#line 6914 "ui.c"
 		{
 			GtkComboBox* _tmp1_ = NULL;
 			GtkDialog* _tmp2_ = NULL;
@@ -7031,17 +6935,17 @@ static void user_interface_info_bar_response_cb (UserInterface* self, GtkInfoBar
 			gtk_window_present ((GtkWindow*) _tmp2_);
 #line 1555 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 7024 "ui.c"
+#line 6928 "ui.c"
 		}
 #line 1549 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case 2:
-#line 7028 "ui.c"
+#line 6932 "ui.c"
 		{
 #line 1558 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			user_interface_install_drivers (self);
 #line 1559 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 7034 "ui.c"
+#line 6938 "ui.c"
 		}
 		default:
 		{
@@ -7059,235 +6963,423 @@ static void user_interface_info_bar_response_cb (UserInterface* self, GtkInfoBar
 			user_interface_update_info_bar (self);
 #line 1565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 7052 "ui.c"
+#line 6956 "ui.c"
 		}
 	}
 }
 
 
-static Block3Data* block3_data_ref (Block3Data* _data3_) {
-#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_atomic_int_inc (&_data3_->_ref_count_);
-#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return _data3_;
-#line 7063 "ui.c"
-}
-
-
-static void block3_data_unref (void * _userdata_) {
-	Block3Data* _data3_;
-	_data3_ = (Block3Data*) _userdata_;
-#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (g_atomic_int_dec_and_test (&_data3_->_ref_count_)) {
-#line 7072 "ui.c"
-		UserInterface* self;
-#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		self = _data3_->self;
-#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (_data3_->instructions_label);
-#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (_data3_->status_label);
-#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (_data3_->spinner);
-#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (_data3_->stack);
-#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (self);
-#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_slice_free (Block3Data, _data3_);
-#line 7088 "ui.c"
+static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int str_array_length1) {
+	gchar* result = NULL;
+	const gchar* _tmp0_ = NULL;
+	gboolean _tmp1_ = FALSE;
+	gboolean _tmp2_ = FALSE;
+	gchar** _tmp3_ = NULL;
+	gint _tmp3__length1 = 0;
+#line 964 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+	_tmp0_ = separator;
+#line 964 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+	if (_tmp0_ == NULL) {
+#line 965 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+		separator = "";
+#line 6975 "ui.c"
+	}
+#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+	_tmp3_ = str_array;
+#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+	_tmp3__length1 = str_array_length1;
+#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+	if (_tmp3_ != NULL) {
+#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+		_tmp2_ = TRUE;
+#line 6985 "ui.c"
+	} else {
+		gchar** _tmp4_ = NULL;
+		gint _tmp4__length1 = 0;
+#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+		_tmp4_ = str_array;
+#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+		_tmp4__length1 = str_array_length1;
+#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+		_tmp2_ = _tmp4__length1 > 0;
+#line 6995 "ui.c"
+	}
+#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+	if (_tmp2_) {
+#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+		_tmp1_ = TRUE;
+#line 7001 "ui.c"
+	} else {
+		gboolean _tmp5_ = FALSE;
+		gchar** _tmp6_ = NULL;
+		gint _tmp6__length1 = 0;
+#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+		_tmp6_ = str_array;
+#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+		_tmp6__length1 = str_array_length1;
+#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+		if (_tmp6__length1 == (-1)) {
+#line 7012 "ui.c"
+			gchar** _tmp7_ = NULL;
+			gint _tmp7__length1 = 0;
+			const gchar* _tmp8_ = NULL;
+#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+			_tmp7_ = str_array;
+#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+			_tmp7__length1 = str_array_length1;
+#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+			_tmp8_ = _tmp7_[0];
+#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+			_tmp5_ = _tmp8_ != NULL;
+#line 7024 "ui.c"
+		} else {
+#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+			_tmp5_ = FALSE;
+#line 7028 "ui.c"
+		}
+#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+		_tmp1_ = _tmp5_;
+#line 7032 "ui.c"
 	}
-}
-
-
-static void ___lambda12_ (UserInterface* self) {
-}
-
-
-static void ____lambda12__pk_progress_callback (PkProgress* progress, PkProgressType type, gpointer self) {
-#line 1646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	___lambda12_ ((UserInterface*) self);
-#line 7100 "ui.c"
-}
-
-
-static void ___lambda13_ (Block3Data* _data3_, GObject* object, GAsyncResult* _result_) {
-	UserInterface* self;
-	GtkLabel* _tmp0_ = NULL;
-	GtkSpinner* _tmp1_ = NULL;
-	GtkLabel* _tmp2_ = NULL;
-	GtkStack* _tmp3_ = NULL;
-	GtkLabel* _tmp4_ = NULL;
-	gchar* result_text = NULL;
-	const gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	GtkLabel* _tmp23_ = NULL;
-	const gchar* _tmp24_ = NULL;
-	GError * _inner_error_ = NULL;
-#line 1646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self = _data3_->self;
-#line 1646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (_result_ != NULL);
-#line 1648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = _data3_->status_label;
-#line 1648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp0_, TRUE);
-#line 1649 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = _data3_->spinner;
-#line 1649 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_set (_tmp1_, "active", FALSE, NULL);
-#line 1650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = _data3_->status_label;
-#line 1650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_label_set_text (_tmp2_, "☒");
-#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = _data3_->stack;
-#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = _data3_->status_label;
-#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_stack_set_visible_child (_tmp3_, (GtkWidget*) _tmp4_);
-#line 1653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp5_ = _ ("Drivers installed successfully!");
-#line 1653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp6_ = g_strdup (_tmp5_);
-#line 1653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	result_text = _tmp6_;
+#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+	if (_tmp1_) {
+#line 7036 "ui.c"
+		gint i = 0;
+		gsize len = 0UL;
+		gint _tmp31_ = 0;
+		gint _tmp33_ = 0;
+		gint _tmp34_ = 0;
+		gsize _tmp35_ = 0UL;
+		const gchar* _tmp36_ = NULL;
+		gint _tmp37_ = 0;
+		gint _tmp38_ = 0;
+		gint _tmp39_ = 0;
+		const gchar* res = NULL;
+		gsize _tmp40_ = 0UL;
+		void* _tmp41_ = NULL;
+		void* ptr = NULL;
+		const gchar* _tmp42_ = NULL;
+		gchar** _tmp43_ = NULL;
+		gint _tmp43__length1 = 0;
+		const gchar* _tmp44_ = NULL;
+		void* _tmp45_ = NULL;
+		const gchar* _tmp62_ = NULL;
+#line 969 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+		len = (gsize) 1;
+#line 7059 "ui.c"
+		{
+			gboolean _tmp9_ = FALSE;
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+			i = 0;
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+			_tmp9_ = TRUE;
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+			while (TRUE) {
+#line 7068 "ui.c"
+				gboolean _tmp11_ = FALSE;
+				gboolean _tmp12_ = FALSE;
+				gchar** _tmp13_ = NULL;
+				gint _tmp13__length1 = 0;
+				gint _tmp21_ = 0;
+				gchar** _tmp22_ = NULL;
+				gint _tmp22__length1 = 0;
+				gint _tmp23_ = 0;
+				const gchar* _tmp24_ = NULL;
+				gsize _tmp30_ = 0UL;
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+				if (!_tmp9_) {
+#line 7081 "ui.c"
+					gint _tmp10_ = 0;
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+					_tmp10_ = i;
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+					i = _tmp10_ + 1;
+#line 7087 "ui.c"
+				}
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+				_tmp9_ = FALSE;
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+				_tmp13_ = str_array;
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+				_tmp13__length1 = str_array_length1;
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+				if (_tmp13__length1 != (-1)) {
+#line 7097 "ui.c"
+					gint _tmp14_ = 0;
+					gchar** _tmp15_ = NULL;
+					gint _tmp15__length1 = 0;
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+					_tmp14_ = i;
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+					_tmp15_ = str_array;
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+					_tmp15__length1 = str_array_length1;
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+					_tmp12_ = _tmp14_ < _tmp15__length1;
+#line 7109 "ui.c"
+				} else {
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+					_tmp12_ = FALSE;
+#line 7113 "ui.c"
+				}
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+				if (_tmp12_) {
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+					_tmp11_ = TRUE;
+#line 7119 "ui.c"
+				} else {
+					gboolean _tmp16_ = FALSE;
+					gchar** _tmp17_ = NULL;
+					gint _tmp17__length1 = 0;
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+					_tmp17_ = str_array;
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+					_tmp17__length1 = str_array_length1;
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+					if (_tmp17__length1 == (-1)) {
+#line 7130 "ui.c"
+						gchar** _tmp18_ = NULL;
+						gint _tmp18__length1 = 0;
+						gint _tmp19_ = 0;
+						const gchar* _tmp20_ = NULL;
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+						_tmp18_ = str_array;
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+						_tmp18__length1 = str_array_length1;
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+						_tmp19_ = i;
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+						_tmp20_ = _tmp18_[_tmp19_];
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+						_tmp16_ = _tmp20_ != NULL;
 #line 7145 "ui.c"
-	{
-		PkResults* results = NULL;
-		GAsyncResult* _tmp7_ = NULL;
-		PkResults* _tmp8_ = NULL;
-		PkError* _tmp9_ = NULL;
-		PkError* _tmp10_ = NULL;
-		gboolean _tmp11_ = FALSE;
-#line 1656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp7_ = _result_;
-#line 1656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp8_ = user_interface_install_packages_finish (self, _tmp7_, &_inner_error_);
-#line 1656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		results = _tmp8_;
-#line 1656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7161 "ui.c"
-			goto __catch22_g_error;
+					} else {
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+						_tmp16_ = FALSE;
+#line 7149 "ui.c"
+					}
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+					_tmp11_ = _tmp16_;
+#line 7153 "ui.c"
+				}
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+				if (!_tmp11_) {
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+					break;
+#line 7159 "ui.c"
+				}
+#line 971 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+				_tmp22_ = str_array;
+#line 971 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+				_tmp22__length1 = str_array_length1;
+#line 971 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+				_tmp23_ = i;
+#line 971 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+				_tmp24_ = _tmp22_[_tmp23_];
+#line 971 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+				if (_tmp24_ != NULL) {
+#line 7171 "ui.c"
+					gchar** _tmp25_ = NULL;
+					gint _tmp25__length1 = 0;
+					gint _tmp26_ = 0;
+					const gchar* _tmp27_ = NULL;
+					gint _tmp28_ = 0;
+					gint _tmp29_ = 0;
+#line 971 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+					_tmp25_ = str_array;
+#line 971 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+					_tmp25__length1 = str_array_length1;
+#line 971 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+					_tmp26_ = i;
+#line 971 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+					_tmp27_ = _tmp25_[_tmp26_];
+#line 971 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+					_tmp28_ = strlen ((const gchar*) _tmp27_);
+#line 971 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+					_tmp29_ = _tmp28_;
+#line 971 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+					_tmp21_ = _tmp29_;
+#line 7192 "ui.c"
+				} else {
+#line 971 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+					_tmp21_ = 0;
+#line 7196 "ui.c"
+				}
+#line 971 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+				_tmp30_ = len;
+#line 971 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+				len = _tmp30_ + _tmp21_;
+#line 7202 "ui.c"
+			}
 		}
-#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp9_ = pk_results_get_error_code (results);
-#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp10_ = _tmp9_;
-#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp11_ = _tmp10_ == NULL;
-#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (_tmp10_);
-#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (_tmp11_) {
-#line 7174 "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 7180 "ui.c"
-		} else {
-			PkError* e = NULL;
-			PkError* _tmp13_ = NULL;
-			const gchar* _tmp14_ = NULL;
-			PkError* _tmp15_ = NULL;
-			PkErrorEnum _tmp16_ = 0;
-			PkErrorEnum _tmp17_ = 0;
-			gchar* _tmp18_ = NULL;
-#line 1661 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp13_ = pk_results_get_error_code (results);
-#line 1661 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			e = _tmp13_;
-#line 1663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp14_ = _ ("Failed to install drivers (error code %d).");
-#line 1663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp15_ = e;
-#line 1663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			g_object_get (_tmp15_, "code", &_tmp16_, NULL);
-#line 1663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp17_ = _tmp16_;
-#line 1663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp18_ = g_strdup_printf (_tmp14_, _tmp17_);
-#line 1663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_g_free0 (result_text);
-#line 1663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			result_text = _tmp18_;
-#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_g_object_unref0 (e);
+#line 973 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+		_tmp31_ = i;
+#line 973 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+		if (_tmp31_ == 0) {
 #line 7209 "ui.c"
+			gchar* _tmp32_ = NULL;
+#line 974 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+			_tmp32_ = g_strdup ("");
+#line 974 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+			result = _tmp32_;
+#line 974 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+			return result;
+#line 7217 "ui.c"
 		}
-#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (results);
-#line 7213 "ui.c"
-	}
-	goto __finally22;
-	__catch22_g_error:
-	{
-		GError* e = NULL;
-		const gchar* _tmp19_ = NULL;
-		gchar* _tmp20_ = NULL;
-		GError* _tmp21_ = NULL;
-		const gchar* _tmp22_ = NULL;
-#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		e = _inner_error_;
-#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_inner_error_ = NULL;
-#line 1669 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp19_ = _ ("Failed to install drivers.");
-#line 1669 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp20_ = g_strdup (_tmp19_);
-#line 1669 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (result_text);
-#line 1669 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		result_text = _tmp20_;
-#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp21_ = e;
-#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp22_ = _tmp21_->message;
-#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_warning ("ui.vala:1670: Failed to install drivers: %s", _tmp22_);
-#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_error_free0 (e);
-#line 7243 "ui.c"
-	}
-	__finally22:
-#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (result_text);
-#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_clear_error (&_inner_error_);
-#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return;
-#line 7256 "ui.c"
+#line 976 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+		_tmp33_ = i;
+#line 976 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+		str_array_length1 = _tmp33_;
+#line 976 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+		_tmp34_ = str_array_length1;
+#line 977 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+		_tmp35_ = len;
+#line 977 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+		_tmp36_ = separator;
+#line 977 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+		_tmp37_ = strlen ((const gchar*) _tmp36_);
+#line 977 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+		_tmp38_ = _tmp37_;
+#line 977 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+		_tmp39_ = i;
+#line 977 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+		len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1));
+#line 979 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+		_tmp40_ = len;
+#line 979 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+		_tmp41_ = g_malloc (_tmp40_);
+#line 979 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+		res = _tmp41_;
+#line 980 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+		_tmp42_ = res;
+#line 980 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+		_tmp43_ = str_array;
+#line 980 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+		_tmp43__length1 = str_array_length1;
+#line 980 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+		_tmp44_ = _tmp43_[0];
+#line 980 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+		_tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_);
+#line 980 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+		ptr = _tmp45_;
+#line 7255 "ui.c"
+		{
+			gboolean _tmp46_ = FALSE;
+#line 981 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+			i = 1;
+#line 981 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+			_tmp46_ = TRUE;
+#line 981 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+			while (TRUE) {
+#line 7264 "ui.c"
+				gint _tmp48_ = 0;
+				gchar** _tmp49_ = NULL;
+				gint _tmp49__length1 = 0;
+				void* _tmp50_ = NULL;
+				const gchar* _tmp51_ = NULL;
+				void* _tmp52_ = NULL;
+				const gchar* _tmp53_ = NULL;
+				gchar** _tmp54_ = NULL;
+				gint _tmp54__length1 = 0;
+				gint _tmp55_ = 0;
+				const gchar* _tmp56_ = NULL;
+				void* _tmp60_ = NULL;
+				void* _tmp61_ = NULL;
+#line 981 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+				if (!_tmp46_) {
+#line 7280 "ui.c"
+					gint _tmp47_ = 0;
+#line 981 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+					_tmp47_ = i;
+#line 981 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+					i = _tmp47_ + 1;
+#line 7286 "ui.c"
+				}
+#line 981 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+				_tmp46_ = FALSE;
+#line 981 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+				_tmp48_ = i;
+#line 981 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+				_tmp49_ = str_array;
+#line 981 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+				_tmp49__length1 = str_array_length1;
+#line 981 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+				if (!(_tmp48_ < _tmp49__length1)) {
+#line 981 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+					break;
+#line 7300 "ui.c"
+				}
+#line 982 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+				_tmp50_ = ptr;
+#line 982 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+				_tmp51_ = separator;
+#line 982 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+				_tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_);
+#line 982 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+				ptr = _tmp52_;
+#line 983 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+				_tmp54_ = str_array;
+#line 983 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+				_tmp54__length1 = str_array_length1;
+#line 983 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+				_tmp55_ = i;
+#line 983 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+				_tmp56_ = _tmp54_[_tmp55_];
+#line 983 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+				if (_tmp56_ != NULL) {
+#line 7320 "ui.c"
+					gchar** _tmp57_ = NULL;
+					gint _tmp57__length1 = 0;
+					gint _tmp58_ = 0;
+					const gchar* _tmp59_ = NULL;
+#line 983 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+					_tmp57_ = str_array;
+#line 983 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+					_tmp57__length1 = str_array_length1;
+#line 983 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+					_tmp58_ = i;
+#line 983 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+					_tmp59_ = _tmp57_[_tmp58_];
+#line 983 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+					_tmp53_ = (const gchar*) _tmp59_;
+#line 7335 "ui.c"
+				} else {
+#line 983 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+					_tmp53_ = "";
+#line 7339 "ui.c"
+				}
+#line 983 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+				_tmp60_ = ptr;
+#line 983 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+				_tmp61_ = g_stpcpy (_tmp60_, _tmp53_);
+#line 983 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+				ptr = _tmp61_;
+#line 7347 "ui.c"
+			}
+		}
+#line 986 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+		_tmp62_ = res;
+#line 986 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+		res = NULL;
+#line 986 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+		result = (gchar*) _tmp62_;
+#line 986 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+		return result;
+#line 7358 "ui.c"
+	} else {
+		gchar* _tmp63_ = NULL;
+#line 988 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+		_tmp63_ = g_strdup ("");
+#line 988 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+		result = _tmp63_;
+#line 988 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+		return result;
+#line 7367 "ui.c"
 	}
-#line 1672 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp23_ = _data3_->instructions_label;
-#line 1672 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp24_ = result_text;
-#line 1672 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_label_set_text (_tmp23_, _tmp24_);
-#line 1646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (result_text);
-#line 7266 "ui.c"
-}
-
-
-static void ____lambda13__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self) {
-#line 1646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	___lambda13_ (self, source_object, res);
-#line 1646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	block3_data_unref (self);
-#line 7275 "ui.c"
 }
 
 
 static void user_interface_install_drivers (UserInterface* self) {
-	Block3Data* _data3_;
 	gchar* message = NULL;
 	gchar* _tmp0_ = NULL;
 	gchar* instructions = NULL;
@@ -7313,7 +7405,7 @@ static void user_interface_install_drivers (UserInterface* self) {
 	static GQuark _tmp5_label5 = 0;
 #line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	static GQuark _tmp5_label6 = 0;
-#line 7306 "ui.c"
+#line 7398 "ui.c"
 	GtkDialog* dialog = NULL;
 	const gchar* _tmp23_ = NULL;
 	const gchar* _tmp24_ = NULL;
@@ -7336,17 +7428,21 @@ static void user_interface_install_drivers (UserInterface* self) {
 	GtkDialog* _tmp39_ = NULL;
 	GtkBox* _tmp40_ = NULL;
 	GtkBox* _tmp41_ = NULL;
+	GtkStack* stack = NULL;
 	GtkStack* _tmp42_ = NULL;
 	GtkBox* _tmp43_ = NULL;
 	GtkStack* _tmp44_ = NULL;
+	GtkSpinner* spinner = NULL;
 	GtkSpinner* _tmp45_ = NULL;
 	GtkSpinner* _tmp46_ = NULL;
 	GtkStack* _tmp47_ = NULL;
 	GtkSpinner* _tmp48_ = NULL;
+	GtkLabel* status_label = NULL;
 	GtkLabel* _tmp49_ = NULL;
 	GtkLabel* _tmp50_ = NULL;
 	GtkStack* _tmp51_ = NULL;
 	GtkLabel* _tmp52_ = NULL;
+	GtkLabel* instructions_label = NULL;
 	const gchar* _tmp53_ = NULL;
 	GtkLabel* _tmp54_ = NULL;
 	GtkLabel* _tmp55_ = NULL;
@@ -7365,16 +7461,10 @@ static void user_interface_install_drivers (UserInterface* self) {
 	GtkLabel* _tmp68_ = NULL;
 	gchar** _tmp69_ = NULL;
 	gint _tmp69__length1 = 0;
-	GtkDialog* _tmp75_ = NULL;
-	GtkDialog* _tmp76_ = NULL;
+	GtkDialog* _tmp77_ = NULL;
+	GtkDialog* _tmp78_ = NULL;
 #line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data3_ = g_slice_new0 (Block3Data);
-#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data3_->_ref_count_ = 1;
-#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data3_->self = g_object_ref (self);
 #line 1571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = g_strdup ("");
 #line 1571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -7401,7 +7491,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 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		switch (0) {
-#line 7394 "ui.c"
+#line 7484 "ui.c"
 			default:
 			{
 				const gchar* _tmp7_ = NULL;
@@ -7427,13 +7517,13 @@ static void user_interface_install_drivers (UserInterface* self) {
 				instructions = _tmp10_;
 #line 1583 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 7419 "ui.c"
+#line 7509 "ui.c"
 			}
 		}
 	} else if (_tmp6_ == ((0 != _tmp5_label4) ? _tmp5_label4 : (_tmp5_label4 = g_quark_from_static_string ("samsung")))) {
 #line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		switch (0) {
-#line 7425 "ui.c"
+#line 7515 "ui.c"
 			default:
 			{
 				const gchar* _tmp11_ = NULL;
@@ -7459,13 +7549,13 @@ static void user_interface_install_drivers (UserInterface* self) {
 				instructions = _tmp14_;
 #line 1589 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 7450 "ui.c"
+#line 7540 "ui.c"
 			}
 		}
 	} else if (_tmp6_ == ((0 != _tmp5_label5) ? _tmp5_label5 : (_tmp5_label5 = g_quark_from_static_string ("hpaio")))) {
 #line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		switch (0) {
-#line 7456 "ui.c"
+#line 7546 "ui.c"
 			default:
 			{
 				const gchar* _tmp15_ = NULL;
@@ -7496,13 +7586,13 @@ static void user_interface_install_drivers (UserInterface* self) {
 				_packages_to_install_size_ = packages_to_install_length1;
 #line 1594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 7487 "ui.c"
+#line 7577 "ui.c"
 			}
 		}
 	} else if (_tmp6_ == ((0 != _tmp5_label6) ? _tmp5_label6 : (_tmp5_label6 = g_quark_from_static_string ("epkowa")))) {
 #line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		switch (0) {
-#line 7493 "ui.c"
+#line 7583 "ui.c"
 			default:
 			{
 				const gchar* _tmp19_ = NULL;
@@ -7528,7 +7618,7 @@ static void user_interface_install_drivers (UserInterface* self) {
 				instructions = _tmp22_;
 #line 1600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 7518 "ui.c"
+#line 7608 "ui.c"
 			}
 		}
 	}
@@ -7601,11 +7691,11 @@ static void user_interface_install_drivers (UserInterface* self) {
 #line 1616 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp42_);
 #line 1616 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data3_->stack = _tmp42_;
+	stack = _tmp42_;
 #line 1617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp43_ = instructions_box;
 #line 1617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp44_ = _data3_->stack;
+	_tmp44_ = stack;
 #line 1617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (_tmp43_, (GtkWidget*) _tmp44_, FALSE, FALSE, (guint) 0);
 #line 1619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -7613,15 +7703,15 @@ static void user_interface_install_drivers (UserInterface* self) {
 #line 1619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp45_);
 #line 1619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data3_->spinner = _tmp45_;
+	spinner = _tmp45_;
 #line 1620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp46_ = _data3_->spinner;
+	_tmp46_ = spinner;
 #line 1620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp46_, TRUE);
 #line 1621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp47_ = _data3_->stack;
+	_tmp47_ = stack;
 #line 1621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp48_ = _data3_->spinner;
+	_tmp48_ = spinner;
 #line 1621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_container_add ((GtkContainer*) _tmp47_, (GtkWidget*) _tmp48_);
 #line 1623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -7629,15 +7719,15 @@ static void user_interface_install_drivers (UserInterface* self) {
 #line 1623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp49_);
 #line 1623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data3_->status_label = _tmp49_;
+	status_label = _tmp49_;
 #line 1624 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp50_ = _data3_->status_label;
+	_tmp50_ = status_label;
 #line 1624 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp50_, TRUE);
 #line 1625 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp51_ = _data3_->stack;
+	_tmp51_ = stack;
 #line 1625 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp52_ = _data3_->status_label;
+	_tmp52_ = status_label;
 #line 1625 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_container_add ((GtkContainer*) _tmp51_, (GtkWidget*) _tmp52_);
 #line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -7647,23 +7737,23 @@ static void user_interface_install_drivers (UserInterface* self) {
 #line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp54_);
 #line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data3_->instructions_label = _tmp54_;
+	instructions_label = _tmp54_;
 #line 1628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp55_ = _data3_->instructions_label;
+	_tmp55_ = instructions_label;
 #line 1628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp55_, TRUE);
 #line 1629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp56_ = _data3_->instructions_label;
+	_tmp56_ = instructions_label;
 #line 1629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_label_set_xalign (_tmp56_, 0.f);
 #line 1630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp57_ = _data3_->instructions_label;
+	_tmp57_ = instructions_label;
 #line 1630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_label_set_use_markup (_tmp57_, TRUE);
 #line 1631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp58_ = instructions_box;
 #line 1631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp59_ = _data3_->instructions_label;
+	_tmp59_ = instructions_label;
 #line 1631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (_tmp58_, (GtkWidget*) _tmp59_, FALSE, FALSE, (guint) 0);
 #line 1633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -7704,43 +7794,55 @@ static void user_interface_install_drivers (UserInterface* self) {
 	_tmp69__length1 = packages_to_install_length1;
 #line 1640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp69__length1 > 0) {
-#line 7694 "ui.c"
-		GtkStack* _tmp70_ = NULL;
-		GtkSpinner* _tmp71_ = NULL;
-		GtkLabel* _tmp72_ = NULL;
-		const gchar* _tmp73_ = NULL;
-		gchar** _tmp74_ = NULL;
-		gint _tmp74__length1 = 0;
-#line 1642 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp70_ = _data3_->stack;
-#line 1642 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_widget_set_visible ((GtkWidget*) _tmp70_, TRUE);
-#line 1643 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp71_ = _data3_->spinner;
-#line 1643 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_object_set (_tmp71_, "active", TRUE, NULL);
-#line 1644 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp72_ = _data3_->instructions_label;
-#line 1644 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp73_ = _ ("Installing drivers...");
-#line 1644 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_label_set_text (_tmp72_, _tmp73_);
-#line 1646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp74_ = packages_to_install;
-#line 1646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp74__length1 = packages_to_install_length1;
-#line 1646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_install_packages (self, _tmp74_, _tmp74__length1, ____lambda12__pk_progress_callback, self, ____lambda13__gasync_ready_callback, block3_data_ref (_data3_));
-#line 7721 "ui.c"
-	}
+#line 7784 "ui.c"
+		GtkLabel* _tmp70_ = NULL;
+		const gchar* _tmp71_ = NULL;
+		gchar** _tmp72_ = NULL;
+		gint _tmp72__length1 = 0;
+		gchar* _tmp73_ = NULL;
+		gchar* _tmp74_ = NULL;
+		gchar* _tmp75_ = NULL;
+		gchar* _tmp76_ = NULL;
+#line 1676 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp70_ = instructions_label;
+#line 1676 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp71_ = _ ("You need to install the %s package(s).");
+#line 1676 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp72_ = packages_to_install;
+#line 1676 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp72__length1 = packages_to_install_length1;
+#line 1676 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp73_ = _vala_g_strjoinv (", ", _tmp72_, _tmp72__length1);
+#line 1676 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp74_ = _tmp73_;
 #line 1676 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp75_ = dialog;
+		_tmp75_ = g_strdup_printf (_tmp71_, _tmp74_);
 #line 1676 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_dialog_run (_tmp75_);
-#line 1677 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp76_ = dialog;
-#line 1677 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_destroy ((GtkWidget*) _tmp76_);
+		_tmp76_ = _tmp75_;
+#line 1676 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_label_set_text (_tmp70_, _tmp76_);
+#line 1676 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_free0 (_tmp76_);
+#line 1676 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_free0 (_tmp74_);
+#line 7815 "ui.c"
+	}
+#line 1681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp77_ = dialog;
+#line 1681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_dialog_run (_tmp77_);
+#line 1682 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp78_ = dialog;
+#line 1682 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_destroy ((GtkWidget*) _tmp78_);
+#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (instructions_label);
+#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (status_label);
+#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (spinner);
+#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (stack);
 #line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (instructions_box);
 #line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -7753,564 +7855,7 @@ static void user_interface_install_drivers (UserInterface* self) {
 	_g_free0 (instructions);
 #line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (message);
-#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	block3_data_unref (_data3_);
-#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data3_ = NULL;
-#line 7747 "ui.c"
-}
-
-
-static void user_interface_install_packages_data_free (gpointer _data) {
-	UserInterfaceInstallPackagesData* _data_;
-	_data_ = _data;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (_data_->result);
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (_data_->self);
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_slice_free (UserInterfaceInstallPackagesData, _data_);
-#line 7760 "ui.c"
-}
-
-
-static void user_interface_install_packages (UserInterface* self, gchar** packages, int packages_length1, PkProgressCallback progress_callback, void* progress_callback_target, GAsyncReadyCallback _callback_, gpointer _user_data_) {
-	UserInterfaceInstallPackagesData* _data_;
-	UserInterface* _tmp0_ = NULL;
-	gchar** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	PkProgressCallback _tmp2_ = NULL;
-	void* _tmp2__target = NULL;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_ = g_slice_new0 (UserInterfaceInstallPackagesData);
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, user_interface_install_packages);
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, user_interface_install_packages_data_free);
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = _g_object_ref0 (self);
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->self = _tmp0_;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = packages;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1__length1 = packages_length1;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->packages = _tmp1_;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->packages_length1 = _tmp1__length1;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = progress_callback;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2__target = progress_callback_target;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->progress_callback = _tmp2_;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->progress_callback_target = _tmp2__target;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_install_packages_co (_data_);
-#line 7799 "ui.c"
-}
-
-
-static PkResults* user_interface_install_packages_finish (UserInterface* self, GAsyncResult* _res_, GError** error) {
-	PkResults* result;
-	UserInterfaceInstallPackagesData* _data_;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (_res_), error)) {
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return NULL;
-#line 7810 "ui.c"
-	}
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	result = _data_->result;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->result = NULL;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return result;
-#line 7820 "ui.c"
-}
-
-
-static void user_interface_install_packages_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_) {
-	UserInterfaceInstallPackagesData* _data_;
-#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_ = _user_data_;
-#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_source_object_ = source_object;
-#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_res_ = _res_;
-#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_install_packages_co (_data_);
-#line 7834 "ui.c"
-}
-
-
-static gint g_ptr_array_get_length (GPtrArray* self) {
-	gint result;
-	guint _tmp0_ = 0U;
-#line 4428 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, 0);
-#line 4428 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-	_tmp0_ = self->len;
-#line 4428 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-	result = (gint) _tmp0_;
-#line 4428 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-	return result;
-#line 7849 "ui.c"
-}
-
-
-static void g_ptr_array_set_length (GPtrArray* self, gint value) {
-	gint _tmp0_ = 0;
-#line 4429 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-	g_return_if_fail (self != NULL);
-#line 4429 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-	_tmp0_ = value;
-#line 4429 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-	g_ptr_array_set_size (self, _tmp0_);
-#line 7861 "ui.c"
-}
-
-
-static gboolean user_interface_install_packages_co (UserInterfaceInstallPackagesData* _data_) {
-#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	switch (_data_->_state_) {
-#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		case 0:
-#line 7870 "ui.c"
-		goto _state_0;
-#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		case 1:
-#line 7874 "ui.c"
-		goto _state_1;
-#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		case 2:
-#line 7878 "ui.c"
-		goto _state_2;
-		default:
-#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_assert_not_reached ();
-#line 7883 "ui.c"
-	}
-	_state_0:
-#line 1682 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp0_ = NULL;
-#line 1682 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp0_ = pk_task_new ();
-#line 1682 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->task = _data_->_tmp0_;
-#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp2_ = NULL;
-#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp2_ = _data_->task;
-#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp3_ = NULL;
-#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp3__length1 = 0;
-#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp3_ = _data_->packages;
-#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp3__length1 = _data_->packages_length1;
-#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp4_ = NULL;
-#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp4__target = NULL;
-#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp4_ = _data_->progress_callback;
-#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp4__target = _data_->progress_callback_target;
-#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_state_ = 1;
-#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	pk_task_resolve_async (_data_->_tmp2_, (PkBitfield) PK_FILTER_ENUM_NOT_INSTALLED, _data_->_tmp3_, NULL, _data_->_tmp4_, _data_->_tmp4__target, user_interface_install_packages_ready, _data_);
-#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return FALSE;
-#line 7918 "ui.c"
-	_state_1:
-#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp5_ = NULL;
-#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp5_ = pk_task_generic_finish (_data_->_tmp2_, _data_->_res_, &_data_->_inner_error_);
-#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp1_ = _data_->_tmp5_;
-#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
-#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_);
-#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_error_free (_data_->_inner_error_);
-#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (_data_->results);
-#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (_data_->task);
-#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (_data_->_state_ == 0) {
-#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			g_simple_async_result_complete_in_idle (_data_->_async_result);
-#line 7940 "ui.c"
-		} else {
-#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			g_simple_async_result_complete (_data_->_async_result);
-#line 7944 "ui.c"
-		}
-#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_object_unref (_data_->_async_result);
-#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return FALSE;
-#line 7950 "ui.c"
-	}
-#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp6_ = NULL;
-#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp6_ = _data_->_tmp1_;
-#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp1_ = NULL;
-#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (_data_->results);
-#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->results = _data_->_tmp6_;
-#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp8_ = NULL;
-#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp8_ = _data_->results;
-#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_data_->_tmp8_ == NULL) {
-#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_data_->_tmp7_ = TRUE;
-#line 7970 "ui.c"
-	} else {
-#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_data_->_tmp9_ = NULL;
-#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_data_->_tmp9_ = _data_->results;
-#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_data_->_tmp10_ = NULL;
-#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_data_->_tmp10_ = pk_results_get_error_code (_data_->_tmp9_);
-#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_data_->_tmp11_ = NULL;
-#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_data_->_tmp11_ = _data_->_tmp10_;
-#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_data_->_tmp7_ = _data_->_tmp11_ != NULL;
-#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (_data_->_tmp11_);
-#line 7988 "ui.c"
-	}
-#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_data_->_tmp7_) {
-#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_data_->result = _data_->results;
-#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (_data_->_tmp1_);
-#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (_data_->task);
-#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (_data_->_state_ == 0) {
-#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			g_simple_async_result_complete_in_idle (_data_->_async_result);
-#line 8002 "ui.c"
-		} else {
-#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			g_simple_async_result_complete (_data_->_async_result);
-#line 8006 "ui.c"
-		}
-#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_object_unref (_data_->_async_result);
-#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return FALSE;
-#line 8012 "ui.c"
-	}
-#line 1688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp12_ = NULL;
-#line 1688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp12_ = _data_->results;
-#line 1688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp13_ = NULL;
-#line 1688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp13_ = pk_results_get_package_array (_data_->_tmp12_);
-#line 1688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->package_array = _data_->_tmp13_;
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp14_ = NULL;
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp14_ = _data_->package_array;
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp15_ = 0;
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp15_ = g_ptr_array_get_length (_data_->_tmp14_);
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp16_ = 0;
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp16_ = _data_->_tmp15_;
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp17_ = NULL;
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp17_ = g_new0 (gchar*, (_data_->_tmp16_ + 1) + 1);
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->package_ids_length1 = 0;
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_package_ids_size_ = 0;
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->package_ids = _data_->_tmp17_;
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->package_ids_length1 = _data_->_tmp16_ + 1;
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_package_ids_size_ = _data_->package_ids_length1;
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp18_ = NULL;
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp18__length1 = 0;
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp18_ = _data_->package_ids;
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp18__length1 = _data_->package_ids_length1;
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp19_ = NULL;
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp19_ = _data_->package_array;
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp20_ = 0;
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp20_ = g_ptr_array_get_length (_data_->_tmp19_);
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp21_ = 0;
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp21_ = _data_->_tmp20_;
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (_data_->_tmp18_[_data_->_tmp21_]);
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp18_[_data_->_tmp21_] = NULL;
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp22_ = NULL;
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp22_ = _data_->_tmp18_[_data_->_tmp21_];
-#line 8078 "ui.c"
-	{
-#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_data_->i = 0;
-#line 8082 "ui.c"
-		{
-#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_data_->_tmp23_ = TRUE;
-#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			while (TRUE) {
-#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				if (!_data_->_tmp23_) {
-#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_data_->_tmp24_ = 0;
-#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_data_->_tmp24_ = _data_->i;
-#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_data_->i = _data_->_tmp24_ + 1;
-#line 8096 "ui.c"
-				}
-#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp23_ = FALSE;
-#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp25_ = 0;
-#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp25_ = _data_->i;
-#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp26_ = NULL;
-#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp26_ = _data_->package_array;
-#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp27_ = 0;
-#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp27_ = g_ptr_array_get_length (_data_->_tmp26_);
-#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp28_ = 0;
-#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp28_ = _data_->_tmp27_;
-#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				if (!(_data_->_tmp25_ < _data_->_tmp28_)) {
-#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					break;
-#line 8120 "ui.c"
-				}
-#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp29_ = NULL;
-#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp29__length1 = 0;
-#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp29_ = _data_->package_ids;
-#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp29__length1 = _data_->package_ids_length1;
-#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp30_ = 0;
-#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp30_ = _data_->i;
-#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp31_ = NULL;
-#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp31_ = _data_->package_array;
-#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp32_ = NULL;
-#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp32__length1 = 0;
-#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp32_ = _data_->_tmp31_->pdata;
-#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp32__length1 = (gint) _data_->_tmp31_->len;
-#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp33_ = 0;
-#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp33_ = _data_->i;
-#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp34_ = NULL;
-#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp34_ = _data_->_tmp32_[_data_->_tmp33_];
-#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp35_ = NULL;
-#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp35_ = pk_package_get_id (_data_->_tmp34_);
-#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp36_ = NULL;
-#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp36_ = g_strdup (_data_->_tmp35_);
-#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_g_free0 (_data_->_tmp29_[_data_->_tmp30_]);
-#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp29_[_data_->_tmp30_] = _data_->_tmp36_;
-#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp37_ = NULL;
-#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp37_ = _data_->_tmp29_[_data_->_tmp30_];
-#line 8170 "ui.c"
-			}
-		}
-	}
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp39_ = NULL;
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp39_ = _data_->task;
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp40_ = NULL;
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp40__length1 = 0;
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp40_ = _data_->package_ids;
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp40__length1 = _data_->package_ids_length1;
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp41_ = NULL;
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp41__target = NULL;
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp41_ = _data_->progress_callback;
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp41__target = _data_->progress_callback_target;
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_state_ = 2;
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	pk_task_install_packages_async (_data_->_tmp39_, _data_->_tmp40_, NULL, _data_->_tmp41_, _data_->_tmp41__target, user_interface_install_packages_ready, _data_);
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return FALSE;
-#line 8200 "ui.c"
-	_state_2:
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp42_ = NULL;
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp42_ = pk_task_generic_finish (_data_->_tmp39_, _data_->_res_, &_data_->_inner_error_);
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp38_ = _data_->_tmp42_;
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_);
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_error_free (_data_->_inner_error_);
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_data_->package_ids = (_vala_array_free (_data_->package_ids, _data_->package_ids_length1, (GDestroyNotify) g_free), NULL);
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_ptr_array_unref0 (_data_->package_array);
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (_data_->_tmp1_);
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (_data_->results);
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (_data_->task);
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (_data_->_state_ == 0) {
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			g_simple_async_result_complete_in_idle (_data_->_async_result);
-#line 8228 "ui.c"
-		} else {
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			g_simple_async_result_complete (_data_->_async_result);
-#line 8232 "ui.c"
-		}
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_object_unref (_data_->_async_result);
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return FALSE;
-#line 8238 "ui.c"
-	}
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp43_ = NULL;
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp43_ = _data_->_tmp38_;
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp38_ = NULL;
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->result = _data_->_tmp43_;
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (_data_->_tmp38_);
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->package_ids = (_vala_array_free (_data_->package_ids, _data_->package_ids_length1, (GDestroyNotify) g_free), NULL);
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_ptr_array_unref0 (_data_->package_array);
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (_data_->_tmp1_);
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (_data_->results);
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (_data_->task);
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_data_->_state_ == 0) {
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_simple_async_result_complete_in_idle (_data_->_async_result);
-#line 8264 "ui.c"
-	} else {
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_simple_async_result_complete (_data_->_async_result);
-#line 8268 "ui.c"
-	}
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_unref (_data_->_async_result);
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return FALSE;
-#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (_data_->_tmp38_);
-#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->package_ids = (_vala_array_free (_data_->package_ids, _data_->package_ids_length1, (GDestroyNotify) g_free), NULL);
-#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_ptr_array_unref0 (_data_->package_array);
-#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (_data_->_tmp1_);
-#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (_data_->results);
-#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (_data_->task);
-#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_data_->_state_ == 0) {
-#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_simple_async_result_complete_in_idle (_data_->_async_result);
-#line 8290 "ui.c"
-	} else {
-#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_simple_async_result_complete (_data_->_async_result);
-#line 8294 "ui.c"
-	}
-#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_unref (_data_->_async_result);
-#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return FALSE;
-#line 8300 "ui.c"
+#line 7845 "ui.c"
 }
 
 
@@ -8318,36 +7863,36 @@ static gboolean user_interface_simple_scan_window_window_state_event_cb (UserInt
 	gboolean result = FALSE;
 	GdkEventWindowState* _tmp0_ = NULL;
 	GdkWindowState _tmp1_ = 0;
-#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1705 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1705 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (widget != NULL, FALSE);
-#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1705 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1707 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = event;
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1707 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _tmp0_->changed_mask;
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1707 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if ((_tmp1_ & GDK_WINDOW_STATE_MAXIMIZED) != 0) {
-#line 8320 "ui.c"
+#line 7865 "ui.c"
 		GdkEventWindowState* _tmp2_ = NULL;
 		GdkWindowState _tmp3_ = 0;
-#line 1702 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1709 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = event;
-#line 1702 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1709 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = _tmp2_->new_window_state;
-#line 1702 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1709 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->window_is_maximized = (_tmp3_ & GDK_WINDOW_STATE_MAXIMIZED) != 0;
-#line 1703 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1710 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_save_state (self, FALSE);
-#line 8331 "ui.c"
+#line 7876 "ui.c"
 	}
-#line 1705 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
-#line 1705 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 8337 "ui.c"
+#line 7882 "ui.c"
 }
 
 
@@ -8356,26 +7901,26 @@ static gboolean _user_interface_simple_scan_window_window_state_event_cb_gtk_wid
 	result = user_interface_simple_scan_window_window_state_event_cb ((UserInterface*) self, _sender, event);
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 8346 "ui.c"
+#line 7891 "ui.c"
 }
 
 
 static gboolean user_interface_window_delete_event_cb (UserInterface* self, GtkWidget* widget, GdkEventAny* event) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 1709 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1716 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1709 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1716 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (widget != NULL, FALSE);
-#line 1709 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1716 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1711 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = user_interface_on_quit (self);
-#line 1711 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = !_tmp0_;
-#line 1711 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 8365 "ui.c"
+#line 7910 "ui.c"
 }
 
 
@@ -8384,7 +7929,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 8374 "ui.c"
+#line 7919 "ui.c"
 }
 
 
@@ -8398,37 +7943,37 @@ static void user_interface_page_size_changed_cb (UserInterface* self, Page* page
 	Page* _tmp6_ = NULL;
 	gint _tmp7_ = 0;
 	gint _tmp8_ = 0;
-#line 1714 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1721 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1714 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1721 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (page != NULL);
-#line 1716 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1723 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = page;
-#line 1716 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1723 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = page_get_width (_tmp0_);
-#line 1716 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1723 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1716 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1723 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_width = _tmp2_;
-#line 1717 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1724 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = page;
-#line 1717 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1724 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page_get_height (_tmp3_);
-#line 1717 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1724 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = _tmp4_;
-#line 1717 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1724 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_height = _tmp5_;
-#line 1718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1725 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = page;
-#line 1718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1725 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = page_get_dpi (_tmp6_);
-#line 1718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1725 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = _tmp7_;
-#line 1718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1725 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_dpi = _tmp8_;
-#line 1719 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1726 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_state (self, FALSE);
-#line 8418 "ui.c"
+#line 7963 "ui.c"
 }
 
 
@@ -8436,35 +7981,35 @@ static void user_interface_page_scan_direction_changed_cb (UserInterface* self,
 	Page* _tmp0_ = NULL;
 	ScanDirection _tmp1_ = 0;
 	ScanDirection _tmp2_ = 0;
-#line 1722 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1729 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1722 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1729 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (page != NULL);
-#line 1724 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1731 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = page;
-#line 1724 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1731 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = page_get_scan_direction (_tmp0_);
-#line 1724 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1731 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1724 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1731 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_scan_direction = _tmp2_;
-#line 1725 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_state (self, FALSE);
-#line 8440 "ui.c"
+#line 7985 "ui.c"
 }
 
 
 static void _user_interface_page_size_changed_cb_page_size_changed (Page* _sender, gpointer self) {
-#line 1732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1739 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_size_changed_cb ((UserInterface*) self, _sender);
-#line 8447 "ui.c"
+#line 7992 "ui.c"
 }
 
 
 static void _user_interface_page_scan_direction_changed_cb_page_scan_direction_changed (Page* _sender, gpointer self) {
-#line 1733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_scan_direction_changed_cb ((UserInterface*) self, _sender);
-#line 8454 "ui.c"
+#line 7999 "ui.c"
 }
 
 
@@ -8475,46 +8020,46 @@ static void user_interface_page_added_cb (UserInterface* self, Book* book, Page*
 	ScanDirection _tmp3_ = 0;
 	Page* _tmp4_ = NULL;
 	Page* _tmp5_ = NULL;
-#line 1728 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1728 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (book != NULL);
-#line 1728 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (page != NULL);
-#line 1730 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1737 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = page;
-#line 1730 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1737 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_size_changed_cb (self, _tmp0_);
-#line 1731 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1738 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = page;
-#line 1731 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1738 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = page_get_scan_direction (_tmp1_);
-#line 1731 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1738 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 1731 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1738 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_scan_direction = _tmp3_;
-#line 1732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1739 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page;
-#line 1732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1739 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_object (_tmp4_, "size-changed", (GCallback) _user_interface_page_size_changed_cb_page_size_changed, self, 0);
-#line 1733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = page;
-#line 1733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_object (_tmp5_, "scan-direction-changed", (GCallback) _user_interface_page_scan_direction_changed_cb_page_scan_direction_changed, self, 0);
-#line 1735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1742 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_page_menu (self);
-#line 8493 "ui.c"
+#line 8038 "ui.c"
 }
 
 
 static void user_interface_reordered_cb (UserInterface* self, Book* book) {
-#line 1738 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1745 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1738 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1745 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (book != NULL);
-#line 1740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_page_menu (self);
-#line 8504 "ui.c"
+#line 8049 "ui.c"
 }
 
 
@@ -8526,39 +8071,39 @@ static void user_interface_page_removed_cb (UserInterface* self, Book* book, Pag
 	Book* _tmp4_ = NULL;
 	guint _tmp5_ = 0U;
 	guint _tmp6_ = 0U;
-#line 1743 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1750 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1743 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1750 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (book != NULL);
-#line 1743 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1750 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (page != NULL);
-#line 1745 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1752 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = page;
-#line 1745 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1752 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_parse_name ("size-changed", TYPE_PAGE, &_tmp1_, NULL, FALSE);
-#line 1745 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1752 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _user_interface_page_size_changed_cb_page_size_changed, self);
-#line 1746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1753 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = page;
-#line 1746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1753 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_parse_name ("scan-direction-changed", TYPE_PAGE, &_tmp3_, NULL, FALSE);
-#line 1746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1753 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _user_interface_page_scan_direction_changed_cb_page_scan_direction_changed, self);
-#line 1749 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1756 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = book;
-#line 1749 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1756 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = book_get_n_pages (_tmp4_);
-#line 1749 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1756 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = _tmp5_;
-#line 1749 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1756 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp6_ == ((guint) 0)) {
-#line 1750 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_add_default_page (self);
-#line 8544 "ui.c"
+#line 8089 "ui.c"
 	}
-#line 1752 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1759 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_page_menu (self);
-#line 8548 "ui.c"
+#line 8093 "ui.c"
 }
 
 
@@ -8580,79 +8125,79 @@ static void user_interface_set_dpi_combo (UserInterface* self, GtkComboBox* comb
 	gint _scan_resolutions_size_ = 0;
 	gint* _tmp10_ = NULL;
 	gint _tmp10__length1 = 0;
-#line 1755 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1755 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (combo != NULL);
-#line 1757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1764 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 1757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1764 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp0_);
-#line 1757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1764 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	renderer = _tmp0_;
-#line 1758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = combo;
-#line 1758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = renderer;
-#line 1758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp1_, (GtkCellRenderer*) _tmp2_, TRUE);
-#line 1759 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = combo;
-#line 1759 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = renderer;
-#line 1759 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp3_, (GtkCellRenderer*) _tmp4_, "text", 1);
-#line 1761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = combo;
-#line 1761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = gtk_combo_box_get_model (_tmp5_);
-#line 1761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = _tmp6_;
-#line 1761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, gtk_list_store_get_type ()) ? ((GtkListStore*) _tmp7_) : NULL);
-#line 1761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	model = _tmp8_;
-#line 1762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = g_new0 (gint, 6);
-#line 1762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_[0] = 75;
-#line 1762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_[1] = 150;
-#line 1762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_[2] = 300;
-#line 1762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_[3] = 600;
-#line 1762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_[4] = 1200;
-#line 1762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_[5] = 2400;
-#line 1762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	scan_resolutions = _tmp9_;
-#line 1762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	scan_resolutions_length1 = 6;
-#line 1762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_scan_resolutions_size_ = scan_resolutions_length1;
-#line 1763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = scan_resolutions;
-#line 1763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10__length1 = scan_resolutions_length1;
-#line 8626 "ui.c"
+#line 8171 "ui.c"
 	{
 		gint* dpi_collection = NULL;
 		gint dpi_collection_length1 = 0;
 		gint _dpi_collection_size_ = 0;
 		gint dpi_it = 0;
-#line 1763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		dpi_collection = _tmp10_;
-#line 1763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		dpi_collection_length1 = _tmp10__length1;
-#line 1763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		for (dpi_it = 0; dpi_it < _tmp10__length1; dpi_it = dpi_it + 1) {
-#line 8638 "ui.c"
+#line 8183 "ui.c"
 			gint dpi = 0;
-#line 1763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			dpi = dpi_collection[dpi_it];
-#line 8642 "ui.c"
+#line 8187 "ui.c"
 			{
 				gchar* label = NULL;
 				gint _tmp11_ = 0;
@@ -8666,133 +8211,133 @@ static void user_interface_set_dpi_combo (UserInterface* self, GtkComboBox* comb
 				const gchar* _tmp32_ = NULL;
 				gint _tmp33_ = 0;
 				gint _tmp34_ = 0;
-#line 1766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp11_ = dpi;
-#line 1766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp12_ = default_dpi;
-#line 1766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp11_ == _tmp12_) {
-#line 8662 "ui.c"
+#line 8207 "ui.c"
 					const gchar* _tmp13_ = NULL;
 					gint _tmp14_ = 0;
 					gchar* _tmp15_ = NULL;
-#line 1768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1775 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp13_ = _ ("%d dpi (default)");
-#line 1768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1775 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp14_ = dpi;
-#line 1768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1775 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp15_ = g_strdup_printf (_tmp13_, _tmp14_);
-#line 1768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1775 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_g_free0 (label);
-#line 1768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1775 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					label = _tmp15_;
-#line 8676 "ui.c"
+#line 8221 "ui.c"
 				} else {
 					gint _tmp16_ = 0;
-#line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp16_ = dpi;
-#line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					if (_tmp16_ == 75) {
-#line 8683 "ui.c"
+#line 8228 "ui.c"
 						const gchar* _tmp17_ = NULL;
 						gint _tmp18_ = 0;
 						gchar* _tmp19_ = NULL;
-#line 1771 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp17_ = _ ("%d dpi (draft)");
-#line 1771 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp18_ = dpi;
-#line 1771 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp19_ = g_strdup_printf (_tmp17_, _tmp18_);
-#line 1771 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_g_free0 (label);
-#line 1771 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						label = _tmp19_;
-#line 8697 "ui.c"
+#line 8242 "ui.c"
 					} else {
 						gint _tmp20_ = 0;
-#line 1772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp20_ = dpi;
-#line 1772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						if (_tmp20_ == 1200) {
-#line 8704 "ui.c"
+#line 8249 "ui.c"
 							const gchar* _tmp21_ = NULL;
 							gint _tmp22_ = 0;
 							gchar* _tmp23_ = NULL;
-#line 1774 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp21_ = _ ("%d dpi (high resolution)");
-#line 1774 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp22_ = dpi;
-#line 1774 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp23_ = g_strdup_printf (_tmp21_, _tmp22_);
-#line 1774 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_g_free0 (label);
-#line 1774 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							label = _tmp23_;
-#line 8718 "ui.c"
+#line 8263 "ui.c"
 						} else {
 							const gchar* _tmp24_ = NULL;
 							gint _tmp25_ = 0;
 							gchar* _tmp26_ = NULL;
-#line 1777 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1784 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp24_ = _ ("%d dpi");
-#line 1777 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1784 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp25_ = dpi;
-#line 1777 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1784 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp26_ = g_strdup_printf (_tmp24_, _tmp25_);
-#line 1777 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1784 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_g_free0 (label);
-#line 1777 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1784 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							label = _tmp26_;
-#line 8733 "ui.c"
+#line 8278 "ui.c"
 						}
 					}
 				}
-#line 1780 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp27_ = model;
-#line 1780 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				gtk_list_store_append (_tmp27_, &_tmp28_);
-#line 1780 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				iter = _tmp28_;
-#line 1781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp29_ = model;
-#line 1781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp30_ = iter;
-#line 1781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp31_ = dpi;
-#line 1781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp32_ = label;
-#line 1781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				gtk_list_store_set (_tmp29_, &_tmp30_, 0, _tmp31_, 1, _tmp32_, -1, -1);
-#line 1783 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp33_ = dpi;
-#line 1783 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp34_ = current_dpi;
-#line 1783 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp33_ == _tmp34_) {
-#line 8759 "ui.c"
+#line 8304 "ui.c"
 					GtkComboBox* _tmp35_ = NULL;
 					GtkTreeIter _tmp36_ = {0};
-#line 1784 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp35_ = combo;
-#line 1784 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp36_ = iter;
-#line 1784 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_combo_box_set_active_iter (_tmp35_, &_tmp36_);
-#line 8768 "ui.c"
+#line 8313 "ui.c"
 				}
-#line 1763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (label);
-#line 8772 "ui.c"
+#line 8317 "ui.c"
 			}
 		}
 	}
-#line 1755 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	scan_resolutions = (g_free (scan_resolutions), NULL);
-#line 1755 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (model);
-#line 1755 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (renderer);
-#line 8782 "ui.c"
+#line 8327 "ui.c"
 }
 
 
@@ -8813,257 +8358,257 @@ static void user_interface_needs_saving_cb (UserInterface* self, Book* book) {
 	gboolean _tmp13_ = FALSE;
 	gboolean _tmp14_ = FALSE;
 	GtkMenuItem* _tmp16_ = NULL;
-#line 1788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1795 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1795 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (book != NULL);
-#line 1790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->save_menuitem;
-#line 1790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book;
-#line 1790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = book_get_needs_saving (_tmp1_);
-#line 1790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 1790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp0_, _tmp3_);
-#line 1791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = self->priv->save_button;
-#line 1791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = book;
-#line 1791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = book_get_needs_saving (_tmp5_);
-#line 1791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = _tmp6_;
-#line 1791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp4_, _tmp7_);
-#line 1792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = self->priv->save_toolbutton;
-#line 1792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = book;
-#line 1792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = book_get_needs_saving (_tmp9_);
-#line 1792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = _tmp10_;
-#line 1792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp8_, _tmp11_);
-#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = book;
-#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = book_get_needs_saving (_tmp12_);
-#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = _tmp13_;
-#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp14_) {
-#line 8845 "ui.c"
+#line 8390 "ui.c"
 		GtkMenuItem* _tmp15_ = NULL;
-#line 1794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = self->priv->save_as_menuitem;
-#line 1794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_set_sensitive ((GtkWidget*) _tmp15_, TRUE);
-#line 8851 "ui.c"
+#line 8396 "ui.c"
 	}
-#line 1795 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1802 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = self->priv->copy_to_clipboard_menuitem;
-#line 1795 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1802 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp16_, TRUE);
-#line 8857 "ui.c"
+#line 8402 "ui.c"
 }
 
 
 static void _user_interface_info_bar_response_cb_gtk_info_bar_response (GtkInfoBar* _sender, gint response_id, gpointer self) {
-#line 1855 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_info_bar_response_cb ((UserInterface*) self, _sender, response_id);
-#line 8864 "ui.c"
+#line 8409 "ui.c"
 }
 
 
-static void __lambda14_ (UserInterface* self) {
+static void __lambda12_ (UserInterface* self) {
 	GSettings* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 1899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1906 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->settings;
-#line 1899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1906 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_text_dpi (self);
-#line 1899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1906 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp0_, "text-dpi", _tmp1_);
-#line 8877 "ui.c"
+#line 8422 "ui.c"
 }
 
 
-static void ___lambda14__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	__lambda14_ ((UserInterface*) self);
-#line 8884 "ui.c"
+static void ___lambda12__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+#line 1906 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__lambda12_ ((UserInterface*) self);
+#line 8429 "ui.c"
 }
 
 
-static void __lambda15_ (UserInterface* self) {
+static void __lambda13_ (UserInterface* self) {
 	GSettings* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 1904 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->settings;
-#line 1904 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_photo_dpi (self);
-#line 1904 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp0_, "photo-dpi", _tmp1_);
-#line 8897 "ui.c"
+#line 8442 "ui.c"
 }
 
 
-static void ___lambda15__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1904 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	__lambda15_ ((UserInterface*) self);
-#line 8904 "ui.c"
+static void ___lambda13__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+#line 1911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__lambda13_ ((UserInterface*) self);
+#line 8449 "ui.c"
 }
 
 
-static void __lambda16_ (UserInterface* self) {
+static void __lambda14_ (UserInterface* self) {
 	GSettings* _tmp0_ = NULL;
 	ScanType _tmp1_ = 0;
-#line 1914 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1921 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->settings;
-#line 1914 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1921 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_page_side (self);
-#line 1914 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1921 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_enum (_tmp0_, "page-side", (gint) _tmp1_);
-#line 8917 "ui.c"
+#line 8462 "ui.c"
 }
 
 
-static void ___lambda16__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1914 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	__lambda16_ ((UserInterface*) self);
-#line 8924 "ui.c"
+static void ___lambda14__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+#line 1921 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__lambda14_ ((UserInterface*) self);
+#line 8469 "ui.c"
 }
 
 
-static void __lambda17_ (UserInterface* self) {
+static void __lambda15_ (UserInterface* self) {
 	gint w = 0;
 	gint h = 0;
 	gint _tmp0_ = 0;
 	gint _tmp1_ = 0;
 	GSettings* _tmp2_ = NULL;
 	GSettings* _tmp3_ = NULL;
-#line 1925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_get_paper_size (self, &_tmp0_, &_tmp1_);
-#line 1925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	w = _tmp0_;
-#line 1925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	h = _tmp1_;
-#line 1926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = self->priv->settings;
-#line 1926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp2_, "paper-width", w);
-#line 1927 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->settings;
-#line 1927 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp3_, "paper-height", h);
-#line 8949 "ui.c"
+#line 8494 "ui.c"
 }
 
 
-static void ___lambda17__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	__lambda17_ ((UserInterface*) self);
-#line 8956 "ui.c"
+static void ___lambda15__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+#line 1929 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__lambda15_ ((UserInterface*) self);
+#line 8501 "ui.c"
 }
 
 
-static void __lambda18_ (UserInterface* self) {
+static void __lambda16_ (UserInterface* self) {
 	GSettings* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
-#line 1938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1945 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->settings;
-#line 1938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1945 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_brightness (self);
-#line 1938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1945 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1945 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp0_, "brightness", _tmp2_);
-#line 8972 "ui.c"
+#line 8517 "ui.c"
 }
 
 
-static void ___lambda18__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
-#line 1938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	__lambda18_ ((UserInterface*) self);
-#line 8979 "ui.c"
+static void ___lambda16__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
+#line 1945 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__lambda16_ ((UserInterface*) self);
+#line 8524 "ui.c"
 }
 
 
-static void __lambda19_ (UserInterface* self) {
+static void __lambda17_ (UserInterface* self) {
 	GSettings* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
-#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->settings;
-#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_contrast (self);
-#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp0_, "contrast", _tmp2_);
-#line 8995 "ui.c"
+#line 8540 "ui.c"
 }
 
 
-static void ___lambda19__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
-#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	__lambda19_ ((UserInterface*) self);
-#line 9002 "ui.c"
+static void ___lambda17__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
+#line 1955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__lambda17_ ((UserInterface*) self);
+#line 8547 "ui.c"
 }
 
 
-static void __lambda20_ (UserInterface* self) {
+static void __lambda18_ (UserInterface* self) {
 	GSettings* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
-#line 1958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->settings;
-#line 1958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_quality (self);
-#line 1958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp0_, "jpeg-quality", _tmp2_);
-#line 9018 "ui.c"
+#line 8563 "ui.c"
 }
 
 
-static void ___lambda20__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
-#line 1958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	__lambda20_ ((UserInterface*) self);
-#line 9025 "ui.c"
+static void ___lambda18__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
+#line 1965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__lambda18_ ((UserInterface*) self);
+#line 8570 "ui.c"
 }
 
 
 static void _user_interface_page_selected_cb_book_view_page_selected (BookView* _sender, Page* page, gpointer self) {
-#line 1967 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1974 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_selected_cb ((UserInterface*) self, _sender, page);
-#line 9032 "ui.c"
+#line 8577 "ui.c"
 }
 
 
 static void _user_interface_show_page_cb_book_view_show_page (BookView* _sender, Page* page, gpointer self) {
-#line 1968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_show_page_cb ((UserInterface*) self, _sender, page);
-#line 9039 "ui.c"
+#line 8584 "ui.c"
 }
 
 
 static void _user_interface_show_page_menu_cb_book_view_show_menu (BookView* _sender, gpointer self) {
-#line 1969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1976 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_show_page_menu_cb ((UserInterface*) self, _sender);
-#line 9046 "ui.c"
+#line 8591 "ui.c"
 }
 
 
 static void _user_interface_book_saving_cb_book_saving (Book* _sender, gint i, gpointer self) {
-#line 1988 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_book_saving_cb ((UserInterface*) self, i);
-#line 9053 "ui.c"
+#line 8598 "ui.c"
 }
 
 
@@ -9273,77 +8818,77 @@ static void user_interface_load (UserInterface* self) {
 	const gchar* _tmp238_ = NULL;
 	ProgressBarDialog* _tmp239_ = NULL;
 	Book* _tmp240_ = NULL;
-#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = gtk_icon_theme_get_default ();
-#line 1800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_icon_theme_append_search_path (_tmp0_, ICON_DIR);
-#line 1802 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_default_icon_name ("scanner");
-#line 1804 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1811 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_application_get_default ();
-#line 1804 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1811 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, gtk_application_get_type ()) ? ((GtkApplication*) _tmp1_) : NULL);
-#line 1804 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1811 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	app = _tmp2_;
-#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = user_interface_is_desktop (self, "Unity");
-#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp6_) {
-#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = TRUE;
-#line 9283 "ui.c"
+#line 8828 "ui.c"
 	} else {
 		gboolean _tmp7_ = FALSE;
-#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = user_interface_is_desktop (self, "XFCE");
-#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = _tmp7_;
-#line 9290 "ui.c"
+#line 8835 "ui.c"
 	}
-#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp5_) {
-#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = TRUE;
-#line 9296 "ui.c"
+#line 8841 "ui.c"
 	} else {
 		gboolean _tmp8_ = FALSE;
-#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = user_interface_is_desktop (self, "MATE");
-#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = _tmp8_;
-#line 9303 "ui.c"
+#line 8848 "ui.c"
 	}
-#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp4_) {
-#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = TRUE;
-#line 9309 "ui.c"
+#line 8854 "ui.c"
 	} else {
 		gboolean _tmp9_ = FALSE;
-#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_ = user_interface_is_desktop (self, "LXDE");
-#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = _tmp9_;
-#line 9316 "ui.c"
+#line 8861 "ui.c"
 	}
-#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp3_) {
-#line 9320 "ui.c"
+#line 8865 "ui.c"
 		GtkMenuBar* _tmp10_ = NULL;
 		GtkToolbar* _tmp11_ = NULL;
-#line 1808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1815 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_window_set_titlebar ((GtkWindow*) self, NULL);
-#line 1809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1816 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp10_ = self->priv->menubar;
-#line 1809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1816 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_set_visible ((GtkWidget*) _tmp10_, TRUE);
-#line 1810 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1817 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp11_ = self->priv->toolbar;
-#line 1810 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1817 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_set_visible ((GtkWidget*) _tmp11_, TRUE);
-#line 9333 "ui.c"
+#line 8878 "ui.c"
 	} else {
 		GtkApplication* _tmp12_ = NULL;
 		GMenu* appmenu = NULL;
@@ -9395,817 +8940,817 @@ static void user_interface_load (UserInterface* self) {
 		GtkApplication* _tmp56_ = NULL;
 		GtkApplication* _tmp57_ = NULL;
 		GtkApplication* _tmp58_ = NULL;
-#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1821 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp12_ = app;
-#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1821 "/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);
-#line 1816 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1823 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp13_ = g_menu_new ();
-#line 1816 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1823 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		appmenu = _tmp13_;
-#line 1817 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1824 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp14_ = g_menu_new ();
-#line 1817 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1824 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		section = _tmp14_;
-#line 1818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = appmenu;
-#line 1818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp16_ = section;
-#line 1818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append_section (_tmp15_, NULL, (GMenuModel*) _tmp16_);
-#line 1819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp17_ = section;
-#line 1819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp18_ = _ ("New Document");
-#line 1819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append (_tmp17_, _tmp18_, "app.new_document");
-#line 1821 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1828 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp19_ = g_menu_new ();
-#line 1821 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1828 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (section);
-#line 1821 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1828 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		section = _tmp19_;
-#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp20_ = appmenu;
-#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp21_ = section;
-#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append_section (_tmp20_, NULL, (GMenuModel*) _tmp21_);
-#line 1823 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp22_ = g_menu_new ();
-#line 1823 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		menu = _tmp22_;
-#line 1824 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp23_ = section;
-#line 1824 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp24_ = _ ("Document");
-#line 1824 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp25_ = menu;
-#line 1824 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append_submenu (_tmp23_, _tmp24_, (GMenuModel*) _tmp25_);
-#line 1825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1832 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp26_ = menu;
-#line 1825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1832 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp27_ = _ ("Reorder Pages");
-#line 1825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1832 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append (_tmp26_, _tmp27_, "app.reorder");
-#line 1826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp28_ = menu;
-#line 1826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp29_ = _ ("Save");
-#line 1826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append (_tmp28_, _tmp29_, "app.save");
-#line 1827 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1834 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp30_ = menu;
-#line 1827 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1834 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp31_ = _ ("Save As...");
-#line 1827 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1834 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append (_tmp30_, _tmp31_, "app.save_as");
-#line 1828 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1835 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp32_ = menu;
-#line 1828 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1835 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp33_ = _ ("Email...");
-#line 1828 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1835 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append (_tmp32_, _tmp33_, "app.email");
-#line 1829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1836 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp34_ = menu;
-#line 1829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1836 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp35_ = _ ("Print...");
-#line 1829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1836 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append (_tmp34_, _tmp35_, "app.print");
-#line 1831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp36_ = g_menu_new ();
-#line 1831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (section);
-#line 1831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		section = _tmp36_;
-#line 1832 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp37_ = appmenu;
-#line 1832 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp38_ = section;
-#line 1832 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append_section (_tmp37_, NULL, (GMenuModel*) _tmp38_);
-#line 1833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1840 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp39_ = section;
-#line 1833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1840 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp40_ = _ ("Preferences");
-#line 1833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1840 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append (_tmp39_, _tmp40_, "app.preferences");
-#line 1835 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp41_ = g_menu_new ();
-#line 1835 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (section);
-#line 1835 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		section = _tmp41_;
-#line 1836 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1843 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp42_ = appmenu;
-#line 1836 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1843 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp43_ = section;
-#line 1836 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1843 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append_section (_tmp42_, NULL, (GMenuModel*) _tmp43_);
-#line 1837 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp44_ = section;
-#line 1837 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp45_ = _ ("Help");
-#line 1837 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append (_tmp44_, _tmp45_, "app.help");
-#line 1838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp46_ = section;
-#line 1838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp47_ = _ ("About");
-#line 1838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append (_tmp46_, _tmp47_, "app.about");
-#line 1839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1846 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp48_ = section;
-#line 1839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1846 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp49_ = _ ("Quit");
-#line 1839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1846 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append (_tmp48_, _tmp49_, "app.quit");
-#line 1841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp50_ = app;
-#line 1841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp51_ = appmenu;
-#line 1841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_application_set_app_menu (_tmp50_, (GMenuModel*) _tmp51_);
-#line 1843 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1850 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp52_ = app;
-#line 1843 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1850 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_application_add_accelerator (_tmp52_, "<Ctrl>N", "app.new_document", NULL);
-#line 1844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1851 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp53_ = app;
-#line 1844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1851 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_application_add_accelerator (_tmp53_, "<Ctrl>S", "app.save", NULL);
-#line 1845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1852 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp54_ = app;
-#line 1845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1852 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_application_add_accelerator (_tmp54_, "<Shift><Ctrl>S", "app.save_as", NULL);
-#line 1846 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp55_ = app;
-#line 1846 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_application_add_accelerator (_tmp55_, "<Ctrl>E", "app.email", NULL);
-#line 1847 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1854 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp56_ = app;
-#line 1847 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1854 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_application_add_accelerator (_tmp56_, "<Ctrl>P", "app.print", NULL);
-#line 1848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1855 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp57_ = app;
-#line 1848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1855 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_application_add_accelerator (_tmp57_, "F1", "app.help", NULL);
-#line 1849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp58_ = app;
-#line 1849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_application_add_accelerator (_tmp58_, "<Ctrl>Q", "app.quit", NULL);
-#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (menu);
-#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (section);
-#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (appmenu);
-#line 9551 "ui.c"
+#line 9096 "ui.c"
 	}
-#line 1851 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1858 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp59_ = app;
-#line 1851 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1858 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_application_add_window (_tmp59_, (GtkWindow*) self);
-#line 1854 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp60_ = (GtkInfoBar*) gtk_info_bar_new ();
-#line 1854 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp60_);
-#line 1854 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar);
-#line 1854 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->info_bar = _tmp60_;
-#line 1855 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp61_ = self->priv->info_bar;
-#line 1855 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1862 "/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);
-#line 1856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp62_ = self->priv->main_vbox;
-#line 1856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp63_ = self->priv->info_bar;
-#line 1856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (_tmp62_, (GtkWidget*) _tmp63_, FALSE, TRUE, (guint) 0);
-#line 1857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp64_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
-#line 1857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp64_);
-#line 1857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	hbox = _tmp64_;
-#line 1858 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp65_ = self->priv->info_bar;
-#line 1858 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp66_ = gtk_info_bar_get_content_area (_tmp65_);
-#line 1858 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1865 "/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);
-#line 1858 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	content_area = _tmp67_;
-#line 1859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp68_ = content_area;
-#line 1859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp69_ = hbox;
-#line 1859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_container_add (_tmp68_, (GtkWidget*) _tmp69_);
-#line 1860 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp70_ = hbox;
-#line 1860 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp70_, TRUE);
-#line 1862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1869 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp71_ = (GtkImage*) gtk_image_new_from_icon_name ("dialog-warning", GTK_ICON_SIZE_DIALOG);
-#line 1862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1869 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp71_);
-#line 1862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1869 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar_image);
-#line 1862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1869 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->info_bar_image = _tmp71_;
-#line 1863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1870 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp72_ = hbox;
-#line 1863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1870 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp73_ = self->priv->info_bar_image;
-#line 1863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1870 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (_tmp72_, (GtkWidget*) _tmp73_, FALSE, TRUE, (guint) 0);
-#line 1864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp74_ = self->priv->info_bar_image;
-#line 1864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp74_, TRUE);
-#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp75_ = (GtkLabel*) gtk_label_new (NULL);
-#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp75_);
-#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar_label);
-#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->info_bar_label = _tmp75_;
-#line 1867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1874 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp76_ = self->priv->info_bar_label;
-#line 1867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1874 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_misc_set_alignment ((GtkMisc*) _tmp76_, 0.0f, 0.5f);
-#line 1868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp77_ = hbox;
-#line 1868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp78_ = self->priv->info_bar_label;
-#line 1868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (_tmp77_, (GtkWidget*) _tmp78_, TRUE, TRUE, (guint) 0);
-#line 1869 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1876 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp79_ = self->priv->info_bar_label;
-#line 1869 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1876 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp79_, TRUE);
-#line 1871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp80_ = self->priv->info_bar;
-#line 1871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp81_ = _ ("_Close");
-#line 1871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp82_ = gtk_info_bar_add_button (_tmp80_, _tmp81_, (gint) GTK_RESPONSE_CLOSE);
-#line 1871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1878 "/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);
-#line 1871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar_close_button);
-#line 1871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->info_bar_close_button = _tmp83_;
-#line 1872 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp84_ = self->priv->info_bar;
-#line 1872 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp85_ = _ ("Change _Scanner");
-#line 1872 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp86_ = gtk_info_bar_add_button (_tmp84_, _tmp85_, 1);
-#line 1872 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1879 "/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);
-#line 1872 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar_change_scanner_button);
-#line 1872 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->info_bar_change_scanner_button = _tmp87_;
-#line 1874 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1881 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp88_ = self->priv->info_bar;
-#line 1874 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1881 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp89_ = _ ("_Install Drivers");
-#line 1874 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1881 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp90_ = gtk_info_bar_add_button (_tmp88_, _tmp89_, 2);
-#line 1874 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1881 "/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);
-#line 1874 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1881 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar_install_button);
-#line 1874 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1881 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->info_bar_install_button = _tmp91_;
-#line 1878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp92_ = self->priv->paper_size_model;
-#line 1878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_append (_tmp92_, &_tmp93_);
-#line 1878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp93_;
-#line 1879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1886 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp94_ = self->priv->paper_size_model;
-#line 1879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1886 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp95_ = iter;
-#line 1879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1886 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp96_ = _ ("Automatic");
-#line 1879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1886 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_set (_tmp94_, &_tmp95_, 0, 0, 1, 0, 2, _tmp96_, -1, -1);
-#line 1882 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1889 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp97_ = self->priv->paper_size_model;
-#line 1882 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1889 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_append (_tmp97_, &_tmp98_);
-#line 1882 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1889 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp98_;
-#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp99_ = self->priv->paper_size_model;
-#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp100_ = iter;
-#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_set (_tmp99_, &_tmp100_, 0, 1050, 1, 1480, 2, "A6", -1, -1);
-#line 1884 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1891 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp101_ = self->priv->paper_size_model;
-#line 1884 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1891 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_append (_tmp101_, &_tmp102_);
-#line 1884 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1891 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp102_;
-#line 1885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1892 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp103_ = self->priv->paper_size_model;
-#line 1885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1892 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp104_ = iter;
-#line 1885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1892 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_set (_tmp103_, &_tmp104_, 0, 1480, 1, 2100, 2, "A5", -1, -1);
-#line 1886 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp105_ = self->priv->paper_size_model;
-#line 1886 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_append (_tmp105_, &_tmp106_);
-#line 1886 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp106_;
-#line 1887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp107_ = self->priv->paper_size_model;
-#line 1887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp108_ = iter;
-#line 1887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_set (_tmp107_, &_tmp108_, 0, 2100, 1, 2970, 2, "A4", -1, -1);
-#line 1888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp109_ = self->priv->paper_size_model;
-#line 1888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_append (_tmp109_, &_tmp110_);
-#line 1888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp110_;
-#line 1889 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp111_ = self->priv->paper_size_model;
-#line 1889 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp112_ = iter;
-#line 1889 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_set (_tmp111_, &_tmp112_, 0, 2159, 1, 2794, 2, "Letter", -1, -1);
-#line 1890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1897 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp113_ = self->priv->paper_size_model;
-#line 1890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1897 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_append (_tmp113_, &_tmp114_);
-#line 1890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1897 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp114_;
-#line 1891 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp115_ = self->priv->paper_size_model;
-#line 1891 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp116_ = iter;
-#line 1891 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_set (_tmp115_, &_tmp116_, 0, 2159, 1, 3556, 2, "Legal", -1, -1);
-#line 1892 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp117_ = self->priv->paper_size_model;
-#line 1892 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_append (_tmp117_, &_tmp118_);
-#line 1892 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp118_;
-#line 1893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp119_ = self->priv->paper_size_model;
-#line 1893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp120_ = iter;
-#line 1893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_set (_tmp119_, &_tmp120_, 0, 1016, 1, 1524, 2, "4×6", -1, -1);
-#line 1895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp121_ = self->priv->settings;
-#line 1895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp122_ = g_settings_get_int (_tmp121_, "text-dpi");
-#line 1895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	dpi = _tmp122_;
-#line 1896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1903 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp123_ = dpi;
-#line 1896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1903 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp123_ <= 0) {
-#line 1897 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1904 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		dpi = USER_INTERFACE_DEFAULT_TEXT_DPI;
-#line 9773 "ui.c"
+#line 9318 "ui.c"
 	}
-#line 1898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1905 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp124_ = self->priv->text_dpi_combo;
-#line 1898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1905 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp125_ = dpi;
-#line 1898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1905 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_set_dpi_combo (self, _tmp124_, USER_INTERFACE_DEFAULT_TEXT_DPI, _tmp125_);
-#line 1899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1906 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp126_ = self->priv->text_dpi_combo;
-#line 1899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp126_, "changed", (GCallback) ___lambda14__gtk_combo_box_changed, self, 0);
-#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1906 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_object (_tmp126_, "changed", (GCallback) ___lambda12__gtk_combo_box_changed, self, 0);
+#line 1907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp127_ = self->priv->settings;
-#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp128_ = g_settings_get_int (_tmp127_, "photo-dpi");
-#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	dpi = _tmp128_;
-#line 1901 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1908 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp129_ = dpi;
-#line 1901 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1908 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp129_ <= 0) {
-#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1909 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		dpi = USER_INTERFACE_DEFAULT_PHOTO_DPI;
-#line 9797 "ui.c"
+#line 9342 "ui.c"
 	}
-#line 1903 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1910 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp130_ = self->priv->photo_dpi_combo;
-#line 1903 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1910 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp131_ = dpi;
-#line 1903 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1910 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_set_dpi_combo (self, _tmp130_, USER_INTERFACE_DEFAULT_PHOTO_DPI, _tmp131_);
-#line 1904 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp132_ = self->priv->photo_dpi_combo;
-#line 1904 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp132_, "changed", (GCallback) ___lambda15__gtk_combo_box_changed, self, 0);
-#line 1906 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_object (_tmp132_, "changed", (GCallback) ___lambda13__gtk_combo_box_changed, self, 0);
+#line 1913 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp133_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 1906 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1913 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp133_);
-#line 1906 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1913 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	renderer = _tmp133_;
-#line 1907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1914 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp134_ = self->priv->device_combo;
-#line 1907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1914 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp135_ = renderer;
-#line 1907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1914 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp134_, (GtkCellRenderer*) _tmp135_, TRUE);
-#line 1908 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1915 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp136_ = self->priv->device_combo;
-#line 1908 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1915 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp137_ = renderer;
-#line 1908 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1915 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp136_, (GtkCellRenderer*) _tmp137_, "text", 1);
-#line 1910 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1917 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp138_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 1910 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1917 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp138_);
-#line 1910 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1917 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (renderer);
-#line 1910 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1917 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	renderer = _tmp138_;
-#line 1911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1918 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp139_ = self->priv->page_side_combo;
-#line 1911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1918 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp140_ = renderer;
-#line 1911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1918 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp139_, (GtkCellRenderer*) _tmp140_, TRUE);
-#line 1912 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1919 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp141_ = self->priv->page_side_combo;
-#line 1912 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1919 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp142_ = renderer;
-#line 1912 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1919 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp141_, (GtkCellRenderer*) _tmp142_, "text", 1);
-#line 1913 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp143_ = self->priv->settings;
-#line 1913 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp144_ = g_settings_get_enum (_tmp143_, "page-side");
-#line 1913 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_set_page_side (self, (ScanType) _tmp144_);
-#line 1914 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1921 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp145_ = self->priv->page_side_combo;
-#line 1914 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp145_, "changed", (GCallback) ___lambda16__gtk_combo_box_changed, self, 0);
-#line 1916 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1921 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_object (_tmp145_, "changed", (GCallback) ___lambda14__gtk_combo_box_changed, self, 0);
+#line 1923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp146_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 1916 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp146_);
-#line 1916 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (renderer);
-#line 1916 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	renderer = _tmp146_;
-#line 1917 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp147_ = self->priv->paper_size_combo;
-#line 1917 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp148_ = renderer;
-#line 1917 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp147_, (GtkCellRenderer*) _tmp148_, TRUE);
-#line 1918 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp149_ = self->priv->paper_size_combo;
-#line 1918 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp150_ = renderer;
-#line 1918 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp149_, (GtkCellRenderer*) _tmp150_, "text", 2);
-#line 1919 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp151_ = self->priv->settings;
-#line 1919 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp152_ = g_settings_get_int (_tmp151_, "paper-width");
-#line 1919 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	paper_width = _tmp152_;
-#line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1927 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp153_ = self->priv->settings;
-#line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1927 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp154_ = g_settings_get_int (_tmp153_, "paper-height");
-#line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1927 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	paper_height = _tmp154_;
-#line 1921 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp155_ = paper_width;
-#line 1921 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp156_ = paper_height;
-#line 1921 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_set_paper_size (self, _tmp155_, _tmp156_);
-#line 1922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1929 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp157_ = self->priv->paper_size_combo;
-#line 1922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp157_, "changed", (GCallback) ___lambda17__gtk_combo_box_changed, self, 0);
-#line 1930 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1929 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_object (_tmp157_, "changed", (GCallback) ___lambda15__gtk_combo_box_changed, self, 0);
+#line 1937 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp158_ = self->priv->brightness_adjustment;
-#line 1930 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1937 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp159_ = gtk_adjustment_get_lower (_tmp158_);
-#line 1930 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1937 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp160_ = _tmp159_;
-#line 1930 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1937 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	lower = _tmp160_;
-#line 1931 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp161_ = _ ("Darker");
-#line 1931 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp162_ = g_strdup_printf ("<small>%s</small>", _tmp161_);
-#line 1931 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	darker_label = _tmp162_;
-#line 1932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1939 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp163_ = self->priv->brightness_adjustment;
-#line 1932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1939 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp164_ = gtk_adjustment_get_upper (_tmp163_);
-#line 1932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1939 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp165_ = _tmp164_;
-#line 1932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1939 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	upper = _tmp165_;
-#line 1933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1940 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp166_ = _ ("Lighter");
-#line 1933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1940 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp167_ = g_strdup_printf ("<small>%s</small>", _tmp166_);
-#line 1933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1940 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	lighter_label = _tmp167_;
-#line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1941 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp168_ = self->priv->brightness_scale;
-#line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1941 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp169_ = lower;
-#line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1941 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp170_ = darker_label;
-#line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1941 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_scale_add_mark (_tmp168_, _tmp169_, GTK_POS_BOTTOM, _tmp170_);
-#line 1935 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp171_ = self->priv->brightness_scale;
-#line 1935 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_scale_add_mark (_tmp171_, (gdouble) 0, GTK_POS_BOTTOM, NULL);
-#line 1936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1943 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp172_ = self->priv->brightness_scale;
-#line 1936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1943 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp173_ = upper;
-#line 1936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1943 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp174_ = lighter_label;
-#line 1936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1943 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_scale_add_mark (_tmp172_, _tmp173_, GTK_POS_BOTTOM, _tmp174_);
-#line 1937 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp175_ = self->priv->settings;
-#line 1937 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp176_ = g_settings_get_int (_tmp175_, "brightness");
-#line 1937 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_set_brightness (self, _tmp176_);
-#line 1938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1945 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp177_ = self->priv->brightness_adjustment;
-#line 1938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp177_, "value-changed", (GCallback) ___lambda18__gtk_adjustment_value_changed, self, 0);
-#line 1940 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1945 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_object (_tmp177_, "value-changed", (GCallback) ___lambda16__gtk_adjustment_value_changed, self, 0);
+#line 1947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp178_ = self->priv->contrast_adjustment;
-#line 1940 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp179_ = gtk_adjustment_get_lower (_tmp178_);
-#line 1940 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp180_ = _tmp179_;
-#line 1940 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	lower = _tmp180_;
-#line 1941 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp181_ = _ ("Less");
-#line 1941 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp182_ = g_strdup_printf ("<small>%s</small>", _tmp181_);
-#line 1941 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	less_label = _tmp182_;
-#line 1942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp183_ = self->priv->contrast_adjustment;
-#line 1942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp184_ = gtk_adjustment_get_upper (_tmp183_);
-#line 1942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp185_ = _tmp184_;
-#line 1942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	upper = _tmp185_;
-#line 1943 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp186_ = _ ("More");
-#line 1943 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp187_ = g_strdup_printf ("<small>%s</small>", _tmp186_);
-#line 1943 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	more_label = _tmp187_;
-#line 1944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp188_ = self->priv->contrast_scale;
-#line 1944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp189_ = lower;
-#line 1944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp190_ = less_label;
-#line 1944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_scale_add_mark (_tmp188_, _tmp189_, GTK_POS_BOTTOM, _tmp190_);
-#line 1945 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp191_ = self->priv->contrast_scale;
-#line 1945 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_scale_add_mark (_tmp191_, (gdouble) 0, GTK_POS_BOTTOM, NULL);
-#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp192_ = self->priv->contrast_scale;
-#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp193_ = upper;
-#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp194_ = more_label;
-#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_scale_add_mark (_tmp192_, _tmp193_, GTK_POS_BOTTOM, _tmp194_);
-#line 1947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp195_ = self->priv->settings;
-#line 1947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp196_ = g_settings_get_int (_tmp195_, "contrast");
-#line 1947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_set_contrast (self, _tmp196_);
-#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp197_ = self->priv->contrast_adjustment;
-#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp197_, "value-changed", (GCallback) ___lambda19__gtk_adjustment_value_changed, self, 0);
-#line 1950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_object (_tmp197_, "value-changed", (GCallback) ___lambda17__gtk_adjustment_value_changed, self, 0);
+#line 1957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp198_ = self->priv->quality_adjustment;
-#line 1950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp199_ = gtk_adjustment_get_lower (_tmp198_);
-#line 1950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp200_ = _tmp199_;
-#line 1950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	lower = _tmp200_;
-#line 1951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp201_ = _ ("Minimum");
-#line 1951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp202_ = g_strdup_printf ("<small>%s</small>", _tmp201_);
-#line 1951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	minimum_label = _tmp202_;
-#line 1952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp203_ = self->priv->quality_adjustment;
-#line 1952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp204_ = gtk_adjustment_get_upper (_tmp203_);
-#line 1952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp205_ = _tmp204_;
-#line 1952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	upper = _tmp205_;
-#line 1953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp206_ = _ ("Maximum");
-#line 1953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp207_ = g_strdup_printf ("<small>%s</small>", _tmp206_);
-#line 1953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	maximum_label = _tmp207_;
-#line 1954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp208_ = self->priv->quality_scale;
-#line 1954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp209_ = lower;
-#line 1954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp210_ = minimum_label;
-#line 1954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_scale_add_mark (_tmp208_, _tmp209_, GTK_POS_BOTTOM, _tmp210_);
-#line 1955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp211_ = self->priv->quality_scale;
-#line 1955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_scale_add_mark (_tmp211_, (gdouble) 75, GTK_POS_BOTTOM, NULL);
-#line 1956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp212_ = self->priv->quality_scale;
-#line 1956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp213_ = upper;
-#line 1956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp214_ = maximum_label;
-#line 1956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_scale_add_mark (_tmp212_, _tmp213_, GTK_POS_BOTTOM, _tmp214_);
-#line 1957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp215_ = self->priv->settings;
-#line 1957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp216_ = g_settings_get_int (_tmp215_, "jpeg-quality");
-#line 1957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_set_quality (self, _tmp216_);
-#line 1958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp217_ = self->priv->quality_adjustment;
-#line 1958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp217_, "value-changed", (GCallback) ___lambda20__gtk_adjustment_value_changed, self, 0);
-#line 1960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_object (_tmp217_, "value-changed", (GCallback) ___lambda18__gtk_adjustment_value_changed, self, 0);
+#line 1967 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp218_ = self->priv->settings;
-#line 1960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1967 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp219_ = g_settings_get_string (_tmp218_, "document-type");
-#line 1960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1967 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	document_type = _tmp219_;
-#line 1961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp220_ = document_type;
-#line 1961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp220_ != NULL) {
-#line 10083 "ui.c"
+#line 9628 "ui.c"
 		const gchar* _tmp221_ = NULL;
-#line 1962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp221_ = document_type;
-#line 1962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_document_hint (self, _tmp221_, FALSE);
-#line 10089 "ui.c"
+#line 9634 "ui.c"
 	}
-#line 1964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp222_ = self->priv->_book;
-#line 1964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp223_ = book_view_new (_tmp222_);
-#line 1964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp223_);
-#line 1964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->book_view);
-#line 1964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->book_view = _tmp223_;
-#line 1965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp224_ = self->priv->book_view;
-#line 1965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_container_set_border_width ((GtkContainer*) _tmp224_, (guint) 18);
-#line 1966 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1973 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp225_ = self->priv->main_vbox;
-#line 1966 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1973 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp226_ = self->priv->book_view;
-#line 1966 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1973 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_end (_tmp225_, (GtkWidget*) _tmp226_, TRUE, TRUE, (guint) 0);
-#line 1967 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1974 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp227_ = self->priv->book_view;
-#line 1967 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1974 "/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);
-#line 1968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp228_ = self->priv->book_view;
-#line 1968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1975 "/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);
-#line 1969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1976 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp229_ = self->priv->book_view;
-#line 1969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1976 "/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);
-#line 1970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp230_ = self->priv->book_view;
-#line 1970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp230_, TRUE);
-#line 1972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1979 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp231_ = self->priv->authorize_dialog;
-#line 1972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1979 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_transient_for ((GtkWindow*) _tmp231_, (GtkWindow*) self);
-#line 1973 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp232_ = self->priv->preferences_dialog;
-#line 1973 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_transient_for ((GtkWindow*) _tmp232_, (GtkWindow*) self);
-#line 1976 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_load_state (self);
-#line 1979 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1986 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp233_ = self->priv->window_width;
-#line 1979 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1986 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp234_ = self->priv->window_height;
-#line 1979 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_debug ("ui.vala:1979: Restoring window to %dx%d pixels", _tmp233_, _tmp234_);
-#line 1980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1986 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_debug ("ui.vala:1986: Restoring window to %dx%d pixels", _tmp233_, _tmp234_);
+#line 1987 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp235_ = self->priv->window_width;
-#line 1980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1987 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp236_ = self->priv->window_height;
-#line 1980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1987 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_default_size ((GtkWindow*) self, _tmp235_, _tmp236_);
-#line 1981 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1988 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp237_ = self->priv->window_is_maximized;
-#line 1981 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1988 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp237_) {
-#line 1983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_debug ("ui.vala:1983: Restoring window to maximized");
-#line 1984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1990 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_debug ("ui.vala:1990: Restoring window to maximized");
+#line 1991 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_window_maximize ((GtkWindow*) self);
-#line 10157 "ui.c"
+#line 9702 "ui.c"
 	}
-#line 1987 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1994 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp238_ = _ ("Saving document...");
-#line 1987 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1994 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp239_ = progress_bar_dialog_new ((GtkApplicationWindow*) self, _tmp238_);
-#line 1987 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1994 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp239_);
-#line 1987 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1994 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->progress_dialog);
-#line 1987 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1994 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->progress_dialog = _tmp239_;
-#line 1988 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp240_ = self->priv->_book;
-#line 1988 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_object (_tmp240_, "saving", (GCallback) _user_interface_book_saving_cb_book_saving, self, 0);
-#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (document_type);
-#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (maximum_label);
-#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (minimum_label);
-#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (more_label);
-#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (less_label);
-#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (lighter_label);
-#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (darker_label);
-#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (renderer);
-#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (content_area);
-#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (hbox);
-#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (app);
-#line 10195 "ui.c"
+#line 9740 "ui.c"
 }
 
 
@@ -10218,89 +9763,89 @@ static gboolean user_interface_is_desktop (UserInterface* self, const gchar* nam
 	const gchar* _tmp3_ = NULL;
 	gchar** _tmp4_ = NULL;
 	gchar** _tmp5_ = NULL;
-#line 1991 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1998 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1991 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1998 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (name != NULL, FALSE);
-#line 1993 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2000 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = g_getenv ("XDG_CURRENT_DESKTOP");
-#line 1993 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2000 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1993 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2000 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	desktop_name_list = _tmp1_;
-#line 1994 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2001 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = desktop_name_list;
-#line 1994 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2001 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_ == NULL) {
-#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2002 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = FALSE;
-#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2002 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (desktop_name_list);
-#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2002 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 10228 "ui.c"
+#line 9773 "ui.c"
 	}
-#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2004 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = desktop_name_list;
-#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2004 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = _tmp4_ = g_strsplit (_tmp3_, ":", 0);
-#line 10234 "ui.c"
+#line 9779 "ui.c"
 	{
 		gchar** n_collection = NULL;
 		gint n_collection_length1 = 0;
 		gint _n_collection_size_ = 0;
 		gint n_it = 0;
-#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2004 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		n_collection = _tmp5_;
-#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2004 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		n_collection_length1 = _vala_array_length (_tmp4_);
-#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2004 "/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 10246 "ui.c"
+#line 9791 "ui.c"
 			gchar* _tmp6_ = NULL;
 			gchar* n = NULL;
-#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2004 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp6_ = g_strdup (n_collection[n_it]);
-#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2004 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			n = _tmp6_;
-#line 10253 "ui.c"
+#line 9798 "ui.c"
 			{
 				const gchar* _tmp7_ = NULL;
 				const gchar* _tmp8_ = NULL;
-#line 1998 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2005 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp7_ = n;
-#line 1998 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2005 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp8_ = name;
-#line 1998 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2005 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (g_strcmp0 (_tmp7_, _tmp8_) == 0) {
-#line 1999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2006 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					result = TRUE;
-#line 1999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2006 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_g_free0 (n);
-#line 1999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2006 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					n_collection = (_vala_array_free (n_collection, n_collection_length1, (GDestroyNotify) g_free), NULL);
-#line 1999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2006 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_g_free0 (desktop_name_list);
-#line 1999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2006 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					return result;
-#line 10273 "ui.c"
+#line 9818 "ui.c"
 				}
-#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2004 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (n);
-#line 10277 "ui.c"
+#line 9822 "ui.c"
 			}
 		}
-#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2004 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		n_collection = (_vala_array_free (n_collection, n_collection_length1, (GDestroyNotify) g_free), NULL);
-#line 10282 "ui.c"
+#line 9827 "ui.c"
 	}
-#line 2001 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
-#line 2001 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (desktop_name_list);
-#line 2001 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 10290 "ui.c"
+#line 9835 "ui.c"
 }
 
 
@@ -10328,363 +9873,363 @@ static void user_interface_load_state (UserInterface* self) {
 	gchar* _tmp26_ = NULL;
 	gchar* _tmp27_ = NULL;
 	GQuark _tmp29_ = 0U;
-#line 2033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	static GQuark _tmp28_label0 = 0;
-#line 2033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	static GQuark _tmp28_label1 = 0;
-#line 2033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	static GQuark _tmp28_label2 = 0;
-#line 10324 "ui.c"
+#line 9869 "ui.c"
 	GError * _inner_error_ = NULL;
-#line 2009 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2011 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = user_interface_get_state_filename (self);
-#line 2011 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _tmp0_;
-#line 2011 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 2011 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_debug ("ui.vala:2011: Loading state from %s", _tmp2_);
-#line 2011 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_debug ("ui.vala:2018: Loading state from %s", _tmp2_);
+#line 2018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (_tmp2_);
-#line 2013 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2020 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = g_key_file_new ();
-#line 2013 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2020 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	f = _tmp3_;
-#line 10342 "ui.c"
+#line 9887 "ui.c"
 	{
 		GKeyFile* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 2016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2023 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = f;
-#line 2016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2023 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = user_interface_get_state_filename (self);
-#line 2016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2023 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = _tmp5_;
-#line 2016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2023 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = _tmp6_;
-#line 2016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2023 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_key_file_load_from_file (_tmp4_, _tmp7_, G_KEY_FILE_NONE, &_inner_error_);
-#line 2016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2023 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_tmp7_);
-#line 2016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2023 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10362 "ui.c"
-			goto __catch23_g_error;
+#line 9907 "ui.c"
+			goto __catch22_g_error;
 		}
 	}
-	goto __finally23;
-	__catch23_g_error:
+	goto __finally22;
+	__catch22_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp8_ = NULL;
-#line 2014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2021 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 2014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2021 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 2020 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = e;
-#line 2020 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (!g_error_matches (_tmp8_, G_FILE_ERROR, G_FILE_ERROR_NOENT)) {
-#line 10379 "ui.c"
+#line 9924 "ui.c"
 			GError* _tmp9_ = NULL;
 			const gchar* _tmp10_ = NULL;
-#line 2021 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp9_ = e;
-#line 2021 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp10_ = _tmp9_->message;
-#line 2021 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			g_warning ("ui.vala:2021: Failed to load state: %s", _tmp10_);
-#line 10388 "ui.c"
+#line 2028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			g_warning ("ui.vala:2028: Failed to load state: %s", _tmp10_);
+#line 9933 "ui.c"
 		}
-#line 2014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2021 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 10392 "ui.c"
+#line 9937 "ui.c"
 	}
-	__finally23:
-#line 2014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__finally22:
+#line 2021 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2021 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_key_file_unref0 (f);
-#line 2014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2021 "/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 2014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2021 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 2014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2021 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 10405 "ui.c"
+#line 9950 "ui.c"
 	}
-#line 2023 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2030 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = f;
-#line 2023 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2030 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = user_interface_state_get_integer (self, _tmp11_, "window", "width", 600);
-#line 2023 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2030 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->window_width = _tmp12_;
-#line 2024 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2031 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = self->priv->window_width;
-#line 2024 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2031 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp13_ <= 0) {
-#line 2025 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2032 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->window_width = 600;
-#line 10419 "ui.c"
+#line 9964 "ui.c"
 	}
-#line 2026 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = f;
-#line 2026 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = user_interface_state_get_integer (self, _tmp14_, "window", "height", 400);
-#line 2026 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->window_height = _tmp15_;
-#line 2027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2034 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = self->priv->window_height;
-#line 2027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2034 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp16_ <= 0) {
-#line 2028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->window_height = 400;
-#line 10433 "ui.c"
+#line 9978 "ui.c"
 	}
-#line 2029 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp17_ = f;
-#line 2029 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = user_interface_state_get_boolean (self, _tmp17_, "window", "is-maximized", FALSE);
-#line 2029 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->window_is_maximized = _tmp18_;
-#line 2030 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2037 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp19_ = f;
-#line 2030 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2037 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp20_ = user_interface_state_get_integer (self, _tmp19_, "last-page", "width", 595);
-#line 2030 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2037 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_width = _tmp20_;
-#line 2031 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2038 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp21_ = f;
-#line 2031 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2038 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp22_ = user_interface_state_get_integer (self, _tmp21_, "last-page", "height", 842);
-#line 2031 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2038 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_height = _tmp22_;
-#line 2032 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2039 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp23_ = f;
-#line 2032 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2039 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp24_ = user_interface_state_get_integer (self, _tmp23_, "last-page", "dpi", 72);
-#line 2032 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2039 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_dpi = _tmp24_;
-#line 2033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp25_ = f;
-#line 2033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp26_ = user_interface_state_get_string (self, _tmp25_, "last-page", "scan-direction", "top-to-bottom");
-#line 2033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp27_ = _tmp26_;
-#line 2033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp29_ = (NULL == _tmp27_) ? 0 : g_quark_from_string (_tmp27_);
-#line 2033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_free (_tmp27_);
-#line 2033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp29_ == ((0 != _tmp28_label0) ? _tmp28_label0 : (_tmp28_label0 = g_quark_from_static_string ("bottom-to-top")))) {
-#line 2033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		switch (0) {
-#line 10473 "ui.c"
+#line 10018 "ui.c"
 			default:
 			{
-#line 2040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2047 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				self->priv->default_page_scan_direction = SCAN_DIRECTION_BOTTOM_TO_TOP;
-#line 2041 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 10480 "ui.c"
+#line 10025 "ui.c"
 			}
 		}
 	} else if (_tmp29_ == ((0 != _tmp28_label1) ? _tmp28_label1 : (_tmp28_label1 = g_quark_from_static_string ("left-to-right")))) {
-#line 2033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		switch (0) {
-#line 10486 "ui.c"
+#line 10031 "ui.c"
 			default:
 			{
-#line 2043 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				self->priv->default_page_scan_direction = SCAN_DIRECTION_LEFT_TO_RIGHT;
-#line 2044 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2051 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 10493 "ui.c"
+#line 10038 "ui.c"
 			}
 		}
 	} else if (_tmp29_ == ((0 != _tmp28_label2) ? _tmp28_label2 : (_tmp28_label2 = g_quark_from_static_string ("right-to-left")))) {
-#line 2033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		switch (0) {
-#line 10499 "ui.c"
+#line 10044 "ui.c"
 			default:
 			{
-#line 2046 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				self->priv->default_page_scan_direction = SCAN_DIRECTION_RIGHT_TO_LEFT;
-#line 2047 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 10506 "ui.c"
+#line 10051 "ui.c"
 			}
 		}
 	} else {
-#line 2033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		switch (0) {
-#line 10512 "ui.c"
+#line 10057 "ui.c"
 			default:
 			{
-#line 2037 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2044 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				self->priv->default_page_scan_direction = SCAN_DIRECTION_TOP_TO_BOTTOM;
-#line 2038 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2045 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 10519 "ui.c"
+#line 10064 "ui.c"
 			}
 		}
 	}
-#line 2009 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_key_file_unref0 (f);
-#line 10525 "ui.c"
+#line 10070 "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 2051 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2058 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 2051 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2058 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (f != NULL, 0);
-#line 2051 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2058 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (group_name != NULL, 0);
-#line 2051 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2058 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (key != NULL, 0);
-#line 10540 "ui.c"
+#line 10085 "ui.c"
 	{
 		gint _tmp0_ = 0;
 		GKeyFile* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
 		gint _tmp4_ = 0;
-#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2062 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = f;
-#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2062 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = group_name;
-#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2062 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = key;
-#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2062 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = g_key_file_get_integer (_tmp1_, _tmp2_, _tmp3_, &_inner_error_);
-#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2062 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = _tmp4_;
-#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2062 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10559 "ui.c"
-			goto __catch24_g_error;
+#line 10104 "ui.c"
+			goto __catch23_g_error;
 		}
-#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2062 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = _tmp0_;
-#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2062 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 10566 "ui.c"
+#line 10111 "ui.c"
 	}
-	goto __finally24;
-	__catch24_g_error:
+	goto __finally23;
+	__catch23_g_error:
 	{
 		gint _tmp5_ = 0;
-#line 2053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2060 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 2053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2060 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 2059 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = _default_;
-#line 2059 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = _tmp5_;
-#line 2059 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 10582 "ui.c"
+#line 10127 "ui.c"
 	}
-	__finally24:
-#line 2053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__finally23:
+#line 2060 "/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 2053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2060 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_clear_error (&_inner_error_);
-#line 2053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2060 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return 0;
-#line 10591 "ui.c"
+#line 10136 "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 2063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2070 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 2063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2070 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (f != NULL, FALSE);
-#line 2063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2070 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (group_name != NULL, FALSE);
-#line 2063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2070 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (key != NULL, FALSE);
-#line 10606 "ui.c"
+#line 10151 "ui.c"
 	{
 		gboolean _tmp0_ = FALSE;
 		GKeyFile* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
-#line 2067 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2074 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = f;
-#line 2067 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2074 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = group_name;
-#line 2067 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2074 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = key;
-#line 2067 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2074 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = g_key_file_get_boolean (_tmp1_, _tmp2_, _tmp3_, &_inner_error_);
-#line 2067 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2074 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = _tmp4_;
-#line 2067 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2074 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10625 "ui.c"
-			goto __catch25_g_error;
+#line 10170 "ui.c"
+			goto __catch24_g_error;
 		}
-#line 2067 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2074 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = _tmp0_;
-#line 2067 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2074 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 10632 "ui.c"
+#line 10177 "ui.c"
 	}
-	goto __finally25;
-	__catch25_g_error:
+	goto __finally24;
+	__catch24_g_error:
 	{
 		gboolean _tmp5_ = FALSE;
-#line 2065 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2072 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 2065 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2072 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 2071 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2078 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = _default_;
-#line 2071 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2078 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = _tmp5_;
-#line 2071 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2078 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 10648 "ui.c"
+#line 10193 "ui.c"
 	}
-	__finally25:
-#line 2065 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__finally24:
+#line 2072 "/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 2065 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2072 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_clear_error (&_inner_error_);
-#line 2065 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2072 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return FALSE;
-#line 10657 "ui.c"
+#line 10202 "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 2075 "/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, NULL);
-#line 2075 "/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, NULL);
-#line 2075 "/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, NULL);
-#line 2075 "/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, NULL);
-#line 2075 "/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 (_default_ != NULL, NULL);
-#line 10674 "ui.c"
+#line 10219 "ui.c"
 	{
 		gchar* _tmp0_ = NULL;
 		GKeyFile* _tmp1_ = NULL;
@@ -10692,83 +10237,83 @@ static gchar* user_interface_state_get_string (UserInterface* self, GKeyFile* f,
 		const gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 2079 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = f;
-#line 2079 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = group_name;
-#line 2079 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = key;
-#line 2079 "/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_string (_tmp1_, _tmp2_, _tmp3_, &_inner_error_);
-#line 2079 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = _tmp4_;
-#line 2079 "/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 10694 "ui.c"
-			goto __catch26_g_error;
+#line 10239 "ui.c"
+			goto __catch25_g_error;
 		}
-#line 2079 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = _tmp0_;
-#line 2079 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = NULL;
-#line 2079 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = _tmp5_;
-#line 2079 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_tmp0_);
-#line 2079 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 10707 "ui.c"
+#line 10252 "ui.c"
 	}
-	goto __finally26;
-	__catch26_g_error:
+	goto __finally25;
+	__catch25_g_error:
 	{
 		const gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 2077 "/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 2077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2084 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 2083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2090 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = _default_;
-#line 2083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2090 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = g_strdup (_tmp6_);
-#line 2083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2090 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = _tmp7_;
-#line 2083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2090 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 10726 "ui.c"
+#line 10271 "ui.c"
 	}
-	__finally26:
-#line 2077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__finally25:
+#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 2077 "/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 2077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2084 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return NULL;
-#line 10735 "ui.c"
+#line 10280 "ui.c"
 }
 
 
 static gboolean ___lambda11_ (UserInterface* self) {
 	gboolean result = FALSE;
-#line 2095 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_state (self, TRUE);
-#line 2096 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2103 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->save_state_timeout = (guint) 0;
-#line 2097 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
-#line 2097 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 10749 "ui.c"
+#line 10294 "ui.c"
 }
 
 
 static gboolean ____lambda11__gsource_func (gpointer self) {
 	gboolean result;
 	result = ___lambda11_ ((UserInterface*) self);
-#line 2093 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2100 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 10758 "ui.c"
+#line 10303 "ui.c"
 }
 
 
@@ -10793,145 +10338,145 @@ static void user_interface_save_state (UserInterface* self, gboolean force) {
 	gint _tmp19_ = 0;
 	ScanDirection _tmp20_ = 0;
 	GError * _inner_error_ = NULL;
-#line 2087 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2089 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2096 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = force;
-#line 2089 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2096 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp0_) {
-#line 10789 "ui.c"
+#line 10334 "ui.c"
 		guint _tmp1_ = 0U;
 		guint _tmp3_ = 0U;
-#line 2091 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2098 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = self->priv->save_state_timeout;
-#line 2091 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2098 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp1_ != ((guint) 0)) {
-#line 10796 "ui.c"
+#line 10341 "ui.c"
 			guint _tmp2_ = 0U;
-#line 2092 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2099 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp2_ = self->priv->save_state_timeout;
-#line 2092 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2099 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			g_source_remove (_tmp2_);
-#line 10802 "ui.c"
+#line 10347 "ui.c"
 		}
-#line 2093 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2100 "/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 2093 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2100 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->save_state_timeout = _tmp3_;
-#line 2099 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2106 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 10810 "ui.c"
+#line 10355 "ui.c"
 	}
-#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = user_interface_get_state_filename (self);
-#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = _tmp4_;
-#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = _tmp5_;
-#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_debug ("ui.vala:2102: Saving state to %s", _tmp6_);
-#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_debug ("ui.vala:2109: Saving state to %s", _tmp6_);
+#line 2109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (_tmp6_);
-#line 2104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = g_key_file_new ();
-#line 2104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	f = _tmp7_;
-#line 2105 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2112 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = f;
-#line 2105 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2112 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = self->priv->window_width;
-#line 2105 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2112 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_key_file_set_integer (_tmp8_, "window", "width", _tmp9_);
-#line 2106 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2113 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = f;
-#line 2106 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2113 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = self->priv->window_height;
-#line 2106 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2113 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_key_file_set_integer (_tmp10_, "window", "height", _tmp11_);
-#line 2107 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = f;
-#line 2107 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = self->priv->window_is_maximized;
-#line 2107 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_key_file_set_boolean (_tmp12_, "window", "is-maximized", _tmp13_);
-#line 2108 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2115 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = f;
-#line 2108 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2115 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = self->priv->default_page_width;
-#line 2108 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2115 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_key_file_set_integer (_tmp14_, "last-page", "width", _tmp15_);
-#line 2109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = f;
-#line 2109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp17_ = self->priv->default_page_height;
-#line 2109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_key_file_set_integer (_tmp16_, "last-page", "height", _tmp17_);
-#line 2110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2117 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = f;
-#line 2110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2117 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp19_ = self->priv->default_page_dpi;
-#line 2110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2117 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_key_file_set_integer (_tmp18_, "last-page", "dpi", _tmp19_);
-#line 2111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp20_ = self->priv->default_page_scan_direction;
-#line 2111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	switch (_tmp20_) {
-#line 2111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case SCAN_DIRECTION_TOP_TO_BOTTOM:
-#line 10868 "ui.c"
+#line 10413 "ui.c"
 		{
 			GKeyFile* _tmp21_ = NULL;
-#line 2114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2121 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp21_ = f;
-#line 2114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2121 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			g_key_file_set_value (_tmp21_, "last-page", "scan-direction", "top-to-bottom");
-#line 2115 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2122 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 10877 "ui.c"
+#line 10422 "ui.c"
 		}
-#line 2111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case SCAN_DIRECTION_BOTTOM_TO_TOP:
-#line 10881 "ui.c"
+#line 10426 "ui.c"
 		{
 			GKeyFile* _tmp22_ = NULL;
-#line 2117 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp22_ = f;
-#line 2117 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			g_key_file_set_value (_tmp22_, "last-page", "scan-direction", "bottom-to-top");
-#line 2118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 10890 "ui.c"
+#line 10435 "ui.c"
 		}
-#line 2111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case SCAN_DIRECTION_LEFT_TO_RIGHT:
-#line 10894 "ui.c"
+#line 10439 "ui.c"
 		{
 			GKeyFile* _tmp23_ = NULL;
-#line 2120 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp23_ = f;
-#line 2120 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			g_key_file_set_value (_tmp23_, "last-page", "scan-direction", "left-to-right");
-#line 2121 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 10903 "ui.c"
+#line 10448 "ui.c"
 		}
-#line 2111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case SCAN_DIRECTION_RIGHT_TO_LEFT:
-#line 10907 "ui.c"
+#line 10452 "ui.c"
 		{
 			GKeyFile* _tmp24_ = NULL;
-#line 2123 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp24_ = f;
-#line 2123 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			g_key_file_set_value (_tmp24_, "last-page", "scan-direction", "right-to-left");
-#line 2124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2131 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 10916 "ui.c"
+#line 10461 "ui.c"
 		}
 		default:
-#line 2111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 10921 "ui.c"
+#line 10466 "ui.c"
 	}
 	{
 		gchar* _tmp25_ = NULL;
@@ -10940,90 +10485,90 @@ static void user_interface_save_state (UserInterface* self, gboolean force) {
 		GKeyFile* _tmp28_ = NULL;
 		gchar* _tmp29_ = NULL;
 		gchar* _tmp30_ = NULL;
-#line 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2135 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp25_ = user_interface_get_state_filename (self);
-#line 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2135 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp26_ = _tmp25_;
-#line 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2135 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp27_ = _tmp26_;
-#line 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2135 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp28_ = f;
-#line 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2135 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp29_ = g_key_file_to_data (_tmp28_, NULL, NULL);
-#line 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2135 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp30_ = _tmp29_;
-#line 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2135 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_file_set_contents (_tmp27_, _tmp30_, (gssize) (-1), &_inner_error_);
-#line 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2135 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_tmp30_);
-#line 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2135 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_tmp27_);
-#line 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2135 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10950 "ui.c"
-			goto __catch27_g_error;
+#line 10495 "ui.c"
+			goto __catch26_g_error;
 		}
 	}
-	goto __finally27;
-	__catch27_g_error:
+	goto __finally26;
+	__catch26_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp31_ = NULL;
 		const gchar* _tmp32_ = NULL;
-#line 2126 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 2126 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 2132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp31_ = e;
-#line 2132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp32_ = _tmp31_->message;
-#line 2132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_warning ("ui.vala:2132: Failed to write state: %s", _tmp32_);
-#line 2126 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_warning ("ui.vala:2139: Failed to write state: %s", _tmp32_);
+#line 2133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 10972 "ui.c"
+#line 10517 "ui.c"
 	}
-	__finally27:
-#line 2126 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__finally26:
+#line 2133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2126 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_key_file_unref0 (f);
-#line 2126 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2133 "/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 2126 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 2126 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 10985 "ui.c"
+#line 10530 "ui.c"
 	}
-#line 2087 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_key_file_unref0 (f);
-#line 10989 "ui.c"
+#line 10534 "ui.c"
 }
 
 
-static gboolean ___lambda21_ (UserInterface* self) {
+static gboolean ___lambda19_ (UserInterface* self) {
 	gboolean result = FALSE;
 	ProgressBarDialog* _tmp0_ = NULL;
-#line 2147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2154 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->progress_dialog;
-#line 2147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2154 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp0_, FALSE);
-#line 2148 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
-#line 2148 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 11004 "ui.c"
+#line 10549 "ui.c"
 }
 
 
-static gboolean ____lambda21__gsource_func (gpointer self) {
+static gboolean ____lambda19__gsource_func (gpointer self) {
 	gboolean result;
-	result = ___lambda21_ ((UserInterface*) self);
-#line 2146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	result = ___lambda19_ ((UserInterface*) self);
+#line 2153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 11013 "ui.c"
+#line 10558 "ui.c"
 }
 
 
@@ -11046,97 +10591,97 @@ static void user_interface_book_saving_cb (UserInterface* self, gint page_number
 	ProgressBarDialog* _tmp12_ = NULL;
 	gdouble _tmp13_ = 0.0;
 	ProgressBarDialog* _tmp14_ = NULL;
-#line 2136 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	while (TRUE) {
-#line 11040 "ui.c"
+#line 10585 "ui.c"
 		gboolean _tmp0_ = FALSE;
-#line 2139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = gtk_events_pending ();
-#line 2139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (!_tmp0_) {
-#line 2139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 11048 "ui.c"
+#line 10593 "ui.c"
 		}
-#line 2140 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_main_iteration ();
-#line 11052 "ui.c"
+#line 10597 "ui.c"
 	}
-#line 2142 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->_book;
-#line 2142 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = book_get_n_pages (_tmp1_);
-#line 2142 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 2142 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	total = (gint) _tmp3_;
-#line 2143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2150 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page_number;
-#line 2143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2150 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = total;
-#line 2143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2150 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	fraction = (_tmp4_ + 1.0) / _tmp5_;
-#line 2144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2151 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = fraction;
-#line 2144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2151 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	complete = _tmp6_ == 1.0;
-#line 2145 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = complete;
-#line 2145 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp7_) {
-#line 2146 "/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 11078 "ui.c"
+#line 2153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 500, ____lambda19__gsource_func, g_object_ref (self), g_object_unref);
+#line 10623 "ui.c"
 	}
-#line 2150 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = _ ("Saving page %d out of %d");
-#line 2150 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = page_number;
-#line 2150 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = total;
-#line 2150 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = g_strdup_printf (_tmp8_, _tmp9_ + 1, _tmp10_);
-#line 2150 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	message = _tmp11_;
-#line 2152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = self->priv->progress_dialog;
-#line 2152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = fraction;
-#line 2152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	progress_bar_dialog_set_fraction (_tmp12_, _tmp13_);
-#line 2153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = self->priv->progress_dialog;
-#line 2153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	progress_bar_dialog_set_message (_tmp14_, message);
-#line 2136 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (message);
-#line 11102 "ui.c"
+#line 10647 "ui.c"
 }
 
 
 void user_interface_show_progress_dialog (UserInterface* self) {
 	ProgressBarDialog* _tmp0_ = NULL;
-#line 2156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2158 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->progress_dialog;
-#line 2158 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp0_, TRUE);
-#line 11114 "ui.c"
+#line 10659 "ui.c"
 }
 
 
 void user_interface_hide_progress_dialog (UserInterface* self) {
 	ProgressBarDialog* _tmp0_ = NULL;
-#line 2161 "/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 2163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->progress_dialog;
-#line 2163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp0_, FALSE);
-#line 11126 "ui.c"
+#line 10671 "ui.c"
 }
 
 
@@ -11146,46 +10691,46 @@ void user_interface_show_error (UserInterface* self, const gchar* error_title, c
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 2166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (error_title != NULL);
-#line 2166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (error_text != NULL);
-#line 2168 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->have_error = TRUE;
-#line 2169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = error_title;
-#line 2169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 2169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->error_title);
-#line 2169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->error_title = _tmp1_;
-#line 2170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2177 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = error_text;
-#line 2170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2177 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 2170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2177 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->error_text);
-#line 2170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2177 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->error_text = _tmp3_;
-#line 2171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2178 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = change_scanner_hint;
-#line 2171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2178 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->error_change_scanner_hint = _tmp4_;
-#line 2172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2179 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_info_bar (self);
-#line 11166 "ui.c"
+#line 10711 "ui.c"
 }
 
 
 void user_interface_start (UserInterface* self) {
-#line 2175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2182 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2177 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2184 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) self, TRUE);
-#line 11175 "ui.c"
+#line 10720 "ui.c"
 }
 
 
@@ -11200,14 +10745,14 @@ Book* user_interface_get_book (UserInterface* self) {
 	result = _tmp0_;
 #line 164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 11190 "ui.c"
+#line 10735 "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 11197 "ui.c"
+#line 10742 "ui.c"
 }
 
 
@@ -11226,7 +10771,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 11216 "ui.c"
+#line 10761 "ui.c"
 }
 
 
@@ -11247,7 +10792,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 11237 "ui.c"
+#line 10782 "ui.c"
 }
 
 
@@ -11264,7 +10809,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 11254 "ui.c"
+#line 10799 "ui.c"
 }
 
 
@@ -11279,7 +10824,7 @@ gboolean user_interface_get_scanning (UserInterface* self) {
 	result = _tmp0_;
 #line 193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 11269 "ui.c"
+#line 10814 "ui.c"
 }
 
 
@@ -11333,7 +10878,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 11323 "ui.c"
+#line 10868 "ui.c"
 }
 
 
@@ -11354,7 +10899,7 @@ gint user_interface_get_brightness (UserInterface* self) {
 	result = (gint) _tmp2_;
 #line 213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 11344 "ui.c"
+#line 10889 "ui.c"
 }
 
 
@@ -11371,7 +10916,7 @@ void user_interface_set_brightness (UserInterface* self, gint value) {
 	gtk_adjustment_set_value (_tmp0_, (gdouble) _tmp1_);
 #line 214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_notify ((GObject *) self, "brightness");
-#line 11361 "ui.c"
+#line 10906 "ui.c"
 }
 
 
@@ -11392,7 +10937,7 @@ gint user_interface_get_contrast (UserInterface* self) {
 	result = (gint) _tmp2_;
 #line 219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 11382 "ui.c"
+#line 10927 "ui.c"
 }
 
 
@@ -11409,7 +10954,7 @@ void user_interface_set_contrast (UserInterface* self, gint value) {
 	gtk_adjustment_set_value (_tmp0_, (gdouble) _tmp1_);
 #line 220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_notify ((GObject *) self, "contrast");
-#line 11399 "ui.c"
+#line 10944 "ui.c"
 }
 
 
@@ -11430,7 +10975,7 @@ gint user_interface_get_quality (UserInterface* self) {
 	result = (gint) _tmp2_;
 #line 225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 11420 "ui.c"
+#line 10965 "ui.c"
 }
 
 
@@ -11447,7 +10992,7 @@ void user_interface_set_quality (UserInterface* self, gint value) {
 	gtk_adjustment_set_value (_tmp0_, (gdouble) _tmp1_);
 #line 226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_notify ((GObject *) self, "quality");
-#line 11437 "ui.c"
+#line 10982 "ui.c"
 }
 
 
@@ -11467,7 +11012,7 @@ gchar* user_interface_get_selected_device (UserInterface* self) {
 	iter = _tmp1_;
 #line 235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 11457 "ui.c"
+#line 11002 "ui.c"
 		gchar* device = NULL;
 		GtkListStore* _tmp3_ = NULL;
 		GtkTreeIter _tmp4_ = {0};
@@ -11481,13 +11026,13 @@ gchar* user_interface_get_selected_device (UserInterface* self) {
 		result = device;
 #line 239 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 11471 "ui.c"
+#line 11016 "ui.c"
 	}
 #line 242 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = NULL;
 #line 242 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 11477 "ui.c"
+#line 11022 "ui.c"
 }
 
 
@@ -11510,7 +11055,7 @@ void user_interface_set_selected_device (UserInterface* self, const gchar* value
 	if (!_tmp2_) {
 #line 249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 11500 "ui.c"
+#line 11045 "ui.c"
 	}
 #line 251 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->device_combo;
@@ -11522,7 +11067,7 @@ void user_interface_set_selected_device (UserInterface* self, const gchar* value
 	self->priv->user_selected_device = TRUE;
 #line 245 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_notify ((GObject *) self, "selected-device");
-#line 11512 "ui.c"
+#line 11057 "ui.c"
 }
 
 
@@ -11530,17 +11075,17 @@ static gchar* user_interface_get_state_filename (UserInterface* self) {
 	gchar* result;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 2006 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2013 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 2006 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2013 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = g_get_user_cache_dir ();
-#line 2006 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2013 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_build_filename (_tmp0_, "simple-scan", "state", NULL);
-#line 2006 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2013 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = _tmp1_;
-#line 2006 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2013 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 11530 "ui.c"
+#line 11075 "ui.c"
 }
 
 
@@ -11559,19 +11104,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 11549 "ui.c"
+#line 11094 "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 11555 "ui.c"
+#line 11100 "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 11561 "ui.c"
+#line 11106 "ui.c"
 }
 
 
@@ -11590,19 +11135,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 11580 "ui.c"
+#line 11125 "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 11586 "ui.c"
+#line 11131 "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 11592 "ui.c"
+#line 11137 "ui.c"
 }
 
 
@@ -11826,7 +11371,7 @@ static void user_interface_class_init (UserInterfaceClass * klass) {
 	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "simple_scan_window_window_state_event_cb", G_CALLBACK(_user_interface_simple_scan_window_window_state_event_cb_gtk_widget_window_state_event));
 #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 11816 "ui.c"
+#line 11361 "ui.c"
 }
 
 
@@ -11846,7 +11391,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 11836 "ui.c"
+#line 11381 "ui.c"
 }
 
 
@@ -12022,7 +11567,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 12012 "ui.c"
+#line 11557 "ui.c"
 }
 
 
@@ -12085,13 +11630,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 12075 "ui.c"
+#line 11620 "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 12081 "ui.c"
+#line 11626 "ui.c"
 	}
 }
 
@@ -12143,13 +11688,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 12133 "ui.c"
+#line 11678 "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 12139 "ui.c"
+#line 11684 "ui.c"
 	}
 }
 
@@ -12168,92 +11713,92 @@ ProgressBarDialog* progress_bar_dialog_construct (GType object_type, GtkApplicat
 	const gchar* _tmp7_ = NULL;
 	GtkApplicationWindow* _tmp8_ = NULL;
 	GtkProgressBar* _tmp9_ = NULL;
-#line 2197 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (parent != NULL, NULL);
-#line 2197 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (title != NULL, NULL);
-#line 2197 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = (ProgressBarDialog*) g_object_new (object_type, NULL);
-#line 2199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2206 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = (GtkProgressBar*) gtk_progress_bar_new ();
-#line 2199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2206 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp0_);
-#line 2199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2206 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->bar);
-#line 2199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2206 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->bar = _tmp0_;
-#line 2200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2207 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
-#line 2200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2207 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp1_);
-#line 2200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2207 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	hbox = _tmp1_;
-#line 2201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2208 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-#line 2201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2208 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp2_);
-#line 2201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2208 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	vbox = _tmp2_;
-#line 2202 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2209 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_hexpand ((GtkWidget*) hbox, TRUE);
-#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2211 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->bar;
-#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2211 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_progress_bar_set_text (_tmp3_, "");
-#line 2205 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2212 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = self->priv->bar;
-#line 2205 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2212 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_progress_bar_set_show_text (_tmp4_, TRUE);
-#line 2206 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = self->priv->bar;
-#line 2206 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_size_request ((GtkWidget*) _tmp5_, 225, 25);
-#line 2207 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_size_request ((GtkWidget*) self, 250, 50);
-#line 2209 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = self->priv->bar;
-#line 2209 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (vbox, (GtkWidget*) _tmp6_, TRUE, FALSE, (guint) 0);
-#line 2210 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2217 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (hbox, (GtkWidget*) vbox, TRUE, FALSE, (guint) 0);
-#line 2211 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2218 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_container_add ((GtkContainer*) self, (GtkWidget*) hbox);
-#line 2212 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = title;
-#line 2212 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_title ((GtkWindow*) self, _tmp7_);
-#line 2214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2221 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = parent;
-#line 2214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2221 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_transient_for ((GtkWindow*) self, (GtkWindow*) _tmp8_);
-#line 2215 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2222 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_position ((GtkWindow*) self, GTK_WIN_POS_CENTER_ON_PARENT);
-#line 2216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2223 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_modal ((GtkWindow*) self, TRUE);
-#line 2217 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2224 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_resizable ((GtkWindow*) self, FALSE);
-#line 2219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) hbox, TRUE);
-#line 2220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2227 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) vbox, TRUE);
-#line 2221 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2228 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = self->priv->bar;
-#line 2221 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2228 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp9_, TRUE);
-#line 2197 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (vbox);
-#line 2197 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (hbox);
-#line 2197 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self;
-#line 12236 "ui.c"
+#line 11781 "ui.c"
 }
 
 
 ProgressBarDialog* progress_bar_dialog_new (GtkApplicationWindow* parent, const gchar* title) {
-#line 2197 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return progress_bar_dialog_construct (TYPE_PROGRESS_BAR_DIALOG, parent, title);
-#line 12243 "ui.c"
+#line 11788 "ui.c"
 }
 
 
@@ -12262,36 +11807,36 @@ gdouble progress_bar_dialog_get_fraction (ProgressBarDialog* self) {
 	GtkProgressBar* _tmp0_ = NULL;
 	gdouble _tmp1_ = 0.0;
 	gdouble _tmp2_ = 0.0;
-#line 2187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, 0.0);
-#line 2187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->bar;
-#line 2187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_progress_bar_get_fraction (_tmp0_);
-#line 2187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 2187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = _tmp2_;
-#line 2187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 12264 "ui.c"
+#line 11809 "ui.c"
 }
 
 
 void progress_bar_dialog_set_fraction (ProgressBarDialog* self, gdouble value) {
 	GtkProgressBar* _tmp0_ = NULL;
 	gdouble _tmp1_ = 0.0;
-#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->bar;
-#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = value;
-#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_progress_bar_set_fraction (_tmp0_, _tmp1_);
-#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_notify ((GObject *) self, "fraction");
-#line 12281 "ui.c"
+#line 11826 "ui.c"
 }
 
 
@@ -12300,74 +11845,74 @@ const gchar* progress_bar_dialog_get_message (ProgressBarDialog* self) {
 	GtkProgressBar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
-#line 2193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 2193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->bar;
-#line 2193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_progress_bar_get_text (_tmp0_);
-#line 2193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 2193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = _tmp2_;
-#line 2193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 12302 "ui.c"
+#line 11847 "ui.c"
 }
 
 
 void progress_bar_dialog_set_message (ProgressBarDialog* self, const gchar* value) {
 	GtkProgressBar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 2194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->bar;
-#line 2194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = value;
-#line 2194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_progress_bar_set_text (_tmp0_, _tmp1_);
-#line 2194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_notify ((GObject *) self, "message");
-#line 12319 "ui.c"
+#line 11864 "ui.c"
 }
 
 
 static void progress_bar_dialog_class_init (ProgressBarDialogClass * klass) {
-#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	progress_bar_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_type_class_add_private (klass, sizeof (ProgressBarDialogPrivate));
-#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (klass)->get_property = _vala_progress_bar_dialog_get_property;
-#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (klass)->set_property = _vala_progress_bar_dialog_set_property;
-#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (klass)->finalize = progress_bar_dialog_finalize;
-#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2188 "/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 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2188 "/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 12338 "ui.c"
+#line 11883 "ui.c"
 }
 
 
 static void progress_bar_dialog_instance_init (ProgressBarDialog * self) {
-#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv = PROGRESS_BAR_DIALOG_GET_PRIVATE (self);
-#line 12345 "ui.c"
+#line 11890 "ui.c"
 }
 
 
 static void progress_bar_dialog_finalize (GObject* obj) {
 	ProgressBarDialog * self;
-#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PROGRESS_BAR_DIALOG, ProgressBarDialog);
-#line 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2190 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->bar);
-#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (progress_bar_dialog_parent_class)->finalize (obj);
-#line 12357 "ui.c"
+#line 11902 "ui.c"
 }
 
 
@@ -12386,27 +11931,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 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	switch (property_id) {
-#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case PROGRESS_BAR_DIALOG_FRACTION:
-#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_value_set_double (value, progress_bar_dialog_get_fraction (self));
-#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case PROGRESS_BAR_DIALOG_MESSAGE:
-#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_value_set_string (value, progress_bar_dialog_get_message (self));
-#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 12390 "ui.c"
+#line 11935 "ui.c"
 		default:
-#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 12396 "ui.c"
+#line 11941 "ui.c"
 	}
 }
 
@@ -12414,27 +11959,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 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	switch (property_id) {
-#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case PROGRESS_BAR_DIALOG_FRACTION:
-#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		progress_bar_dialog_set_fraction (self, g_value_get_double (value));
-#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case PROGRESS_BAR_DIALOG_MESSAGE:
-#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		progress_bar_dialog_set_message (self, g_value_get_string (value));
-#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 12418 "ui.c"
+#line 11963 "ui.c"
 		default:
-#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 12424 "ui.c"
+#line 11969 "ui.c"
 	}
 }
 
@@ -12447,96 +11992,96 @@ gchar* get_temporary_filename (const gchar* prefix, const gchar* extension) {
 	gchar* _tmp2_ = NULL;
 	gchar* path = NULL;
 	GError * _inner_error_ = NULL;
-#line 2226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2233 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (prefix != NULL, NULL);
-#line 2226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2233 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (extension != NULL, NULL);
-#line 2231 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2238 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = prefix;
-#line 2231 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2238 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = extension;
-#line 2231 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2238 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = g_strdup_printf ("%sXXXXXX.%s", _tmp0_, _tmp1_);
-#line 2231 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2238 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	filename = _tmp2_;
-#line 12449 "ui.c"
+#line 11994 "ui.c"
 	{
 		gint fd = 0;
 		const gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
-#line 2235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2242 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = filename;
-#line 2235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2242 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = g_file_open_tmp (_tmp3_, &_tmp4_, &_inner_error_);
-#line 2235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2242 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 2235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2242 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		path = _tmp4_;
-#line 2235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2242 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		fd = _tmp5_;
-#line 2235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2242 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12468 "ui.c"
-			goto __catch28_g_error;
+#line 12013 "ui.c"
+			goto __catch27_g_error;
 		}
-#line 2236 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2243 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = fd;
-#line 2236 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2243 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		close (_tmp6_);
-#line 12475 "ui.c"
+#line 12020 "ui.c"
 	}
-	goto __finally28;
-	__catch28_g_error:
+	goto __finally27;
+	__catch27_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp7_ = NULL;
 		const gchar* _tmp8_ = NULL;
-#line 2233 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 2233 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_inner_error_ = NULL;
 #line 2240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_inner_error_ = NULL;
+#line 2247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = e;
-#line 2240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = _tmp7_->message;
-#line 2240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_warning ("ui.vala:2240: Error saving email attachment: %s", _tmp8_);
-#line 2241 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_warning ("ui.vala:2247: Error saving email attachment: %s", _tmp8_);
+#line 2248 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = NULL;
-#line 2241 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2248 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 2241 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2248 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 2241 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2248 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (filename);
-#line 2241 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2248 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 12503 "ui.c"
+#line 12048 "ui.c"
 	}
-	__finally28:
-#line 2233 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__finally27:
+#line 2240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2233 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 2233 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (filename);
-#line 2233 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2240 "/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 2233 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 2233 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return NULL;
-#line 12518 "ui.c"
+#line 12063 "ui.c"
 	}
-#line 2244 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2251 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = path;
-#line 2244 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2251 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (filename);
-#line 2244 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2251 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 12526 "ui.c"
+#line 12071 "ui.c"
 }
 
 
@@ -12547,40 +12092,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 2255 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2262 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (text != NULL, NULL);
-#line 2255 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2262 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = (PageIcon*) g_object_new (object_type, NULL);
-#line 2257 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = text;
-#line 2257 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 2257 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->text);
-#line 2257 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->text = _tmp1_;
-#line 2258 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = r;
-#line 2258 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->r = _tmp2_;
-#line 2259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2266 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = g;
-#line 2259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2266 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->g = _tmp3_;
-#line 2260 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = b;
-#line 2260 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->b = _tmp4_;
-#line 2255 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2262 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self;
-#line 12563 "ui.c"
+#line 12108 "ui.c"
 }
 
 
 PageIcon* page_icon_new (const gchar* text, gdouble r, gdouble g, gdouble b) {
-#line 2255 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2262 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return page_icon_construct (TYPE_PAGE_ICON, text, r, g, b);
-#line 12570 "ui.c"
+#line 12115 "ui.c"
 }
 
 
@@ -12588,23 +12133,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 2263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = (PageIcon*) base;
-#line 2265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2272 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_natural_width = PAGE_ICON_MINIMUM_WIDTH;
-#line 2265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2272 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_minimum_width = _vala_natural_width;
-#line 2263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (minimum_width) {
-#line 2263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*minimum_width = _vala_minimum_width;
-#line 12588 "ui.c"
+#line 12133 "ui.c"
 	}
-#line 2263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (natural_width) {
-#line 2263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*natural_width = _vala_natural_width;
-#line 12594 "ui.c"
+#line 12139 "ui.c"
 	}
 }
 
@@ -12614,25 +12159,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 2268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2275 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = (PageIcon*) base;
-#line 2270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = round (PAGE_ICON_MINIMUM_WIDTH * G_SQRT2);
-#line 2270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_natural_height = (gint) _tmp0_;
-#line 2270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_minimum_height = _vala_natural_height;
-#line 2268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2275 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (minimum_height) {
-#line 2268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2275 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*minimum_height = _vala_minimum_height;
-#line 12616 "ui.c"
+#line 12161 "ui.c"
 	}
-#line 2268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2275 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (natural_height) {
-#line 2268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2275 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*natural_height = _vala_natural_height;
-#line 12622 "ui.c"
+#line 12167 "ui.c"
 	}
 }
 
@@ -12642,25 +12187,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 2273 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = (PageIcon*) base;
-#line 2275 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = width;
-#line 2275 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_natural_height = (gint) (_tmp0_ * G_SQRT2);
-#line 2275 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_minimum_height = _vala_natural_height;
-#line 2273 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (minimum_height) {
-#line 2273 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*minimum_height = _vala_minimum_height;
-#line 12644 "ui.c"
+#line 12189 "ui.c"
 	}
-#line 2273 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (natural_height) {
-#line 2273 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*natural_height = _vala_natural_height;
-#line 12650 "ui.c"
+#line 12195 "ui.c"
 	}
 }
 
@@ -12670,25 +12215,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 2278 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2285 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = (PageIcon*) base;
-#line 2280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = height;
-#line 2280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_natural_width = (gint) (_tmp0_ / G_SQRT2);
-#line 2280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_minimum_width = _vala_natural_width;
-#line 2278 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2285 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (minimum_width) {
-#line 2278 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2285 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*minimum_width = _vala_minimum_width;
-#line 12672 "ui.c"
+#line 12217 "ui.c"
 	}
-#line 2278 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2285 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (natural_width) {
-#line 2278 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2285 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*natural_width = _vala_natural_width;
-#line 12678 "ui.c"
+#line 12223 "ui.c"
 	}
 }
 
@@ -12731,166 +12276,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 2283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = (PageIcon*) base;
-#line 2283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (c != NULL, FALSE);
-#line 2285 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = gtk_widget_get_allocated_width ((GtkWidget*) self);
-#line 2285 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	w = _tmp0_;
-#line 2286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2293 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_widget_get_allocated_height ((GtkWidget*) self);
-#line 2286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2293 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	h = _tmp1_;
-#line 2287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = w;
-#line 2287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = h;
-#line 2287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if ((_tmp2_ * G_SQRT2) > ((gdouble) _tmp3_)) {
-#line 12739 "ui.c"
+#line 12284 "ui.c"
 		gint _tmp4_ = 0;
 		gdouble _tmp5_ = 0.0;
-#line 2288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = h;
-#line 2288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = round (_tmp4_ / G_SQRT2);
-#line 2288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		w = (gint) _tmp5_;
-#line 12748 "ui.c"
+#line 12293 "ui.c"
 	} else {
 		gint _tmp6_ = 0;
 		gdouble _tmp7_ = 0.0;
-#line 2290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = w;
-#line 2290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = round (_tmp6_ * G_SQRT2);
-#line 2290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		h = (gint) _tmp7_;
-#line 12758 "ui.c"
+#line 12303 "ui.c"
 	}
-#line 2292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = c;
-#line 2292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = gtk_widget_get_allocated_width ((GtkWidget*) self);
-#line 2292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = w;
-#line 2292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = gtk_widget_get_allocated_height ((GtkWidget*) self);
-#line 2292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = h;
-#line 2292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_translate (_tmp8_, (gdouble) ((_tmp9_ - _tmp10_) / 2), (gdouble) ((_tmp11_ - _tmp12_) / 2));
-#line 2294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = c;
-#line 2294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = w;
-#line 2294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = h;
-#line 2294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_rectangle (_tmp13_, 0.5, 0.5, (gdouble) (_tmp14_ - 1), (gdouble) (_tmp15_ - 1));
-#line 2296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = c;
-#line 2296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp17_ = self->priv->r;
-#line 2296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = self->priv->g;
-#line 2296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp19_ = self->priv->b;
-#line 2296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_set_source_rgb (_tmp16_, _tmp17_, _tmp18_, _tmp19_);
-#line 2297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp20_ = c;
-#line 2297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_fill_preserve (_tmp20_);
-#line 2299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2306 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp21_ = c;
-#line 2299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2306 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_set_line_width (_tmp21_, 1.0);
-#line 2300 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp22_ = c;
-#line 2300 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_set_source_rgb (_tmp22_, 0.0, 0.0, 0.0);
-#line 2301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp23_ = c;
-#line 2301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_stroke (_tmp23_);
-#line 2304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp24_ = c;
-#line 2304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp25_ = self->priv->text;
-#line 2304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_text_extents (_tmp24_, _tmp25_, &_tmp26_);
-#line 2304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	extents = _tmp26_;
-#line 2305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2312 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp27_ = c;
-#line 2305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2312 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp28_ = w;
-#line 2305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2312 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp29_ = extents;
-#line 2305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2312 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp30_ = _tmp29_.width;
-#line 2305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2312 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp31_ = h;
-#line 2305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2312 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp32_ = extents;
-#line 2305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2312 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp33_ = _tmp32_.height;
-#line 2305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2312 "/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 2306 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2313 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp34_ = c;
-#line 2306 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2313 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp35_ = self->priv->text;
-#line 2306 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2313 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_show_text (_tmp34_, _tmp35_);
-#line 2308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2315 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = TRUE;
-#line 2308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2315 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 12840 "ui.c"
+#line 12385 "ui.c"
 }
 
 
 static void page_icon_class_init (PageIconClass * klass) {
-#line 2247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2254 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page_icon_parent_class = g_type_class_peek_parent (klass);
-#line 2247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2254 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_type_class_add_private (klass, sizeof (PageIconPrivate));
-#line 2247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2254 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	((GtkWidgetClass *) klass)->get_preferred_width = page_icon_real_get_preferred_width;
-#line 2247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2254 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	((GtkWidgetClass *) klass)->get_preferred_height = page_icon_real_get_preferred_height;
-#line 2247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2254 "/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 2247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2254 "/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 2247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2254 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	((GtkWidgetClass *) klass)->draw = page_icon_real_draw;
-#line 2247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2254 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (klass)->finalize = page_icon_finalize;
-#line 12861 "ui.c"
+#line 12406 "ui.c"
 }
 
 
 static void page_icon_instance_init (PageIcon * self) {
-#line 2247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2254 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv = PAGE_ICON_GET_PRIVATE (self);
-#line 12868 "ui.c"
+#line 12413 "ui.c"
 }
 
 
 static void page_icon_finalize (GObject* obj) {
 	PageIcon * self;
-#line 2247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2254 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PAGE_ICON, PageIcon);
-#line 2249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2256 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->text);
-#line 2247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2254 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (page_icon_parent_class)->finalize (obj);
-#line 12880 "ui.c"
+#line 12425 "ui.c"
 }
 
 
diff --git a/src/ui.vala b/src/ui.vala
index ab1cfd4..a66db50 100644
--- a/src/ui.vala
+++ b/src/ui.vala
@@ -1639,6 +1639,7 @@ public class UserInterface : Gtk.ApplicationWindow
 
         if (packages_to_install.length > 0)
         {
+#if HAVE_PACKAGEKIT
             stack.visible = true;
             spinner.active = true;
             instructions_label.set_text (/* Label shown while installing drivers */
@@ -1671,12 +1672,17 @@ public class UserInterface : Gtk.ApplicationWindow
                 }
                 instructions_label.set_text (result_text);
             });
+#else
+            instructions_label.set_text (/* Label shown to prompt user to install packages (when PackageKit not available) */
+                                         _("You need to install the %s package(s).").printf (string.joinv (", ", packages_to_install)));
+#endif
         }
 
         dialog.run ();
         dialog.destroy ();
     }
 
+#if HAVE_PACKAGEKIT
     private async Pk.Results? install_packages (string[] packages, Pk.ProgressCallback progress_callback) throws GLib.Error
     {
         var task = new Pk.Task ();
@@ -1693,6 +1699,7 @@ public class UserInterface : Gtk.ApplicationWindow
 
         return yield task.install_packages_async (package_ids, null, progress_callback);
     }
+#endif
 
     [GtkCallback]
     private bool simple_scan_window_window_state_event_cb (Gtk.Widget widget, Gdk.EventWindowState event)
author	Jörg Frings-Fürst <debian@jff-webhosting.net>	2015-11-03 12:10:06 +0100
committer	Jörg Frings-Fürst <debian@jff-webhosting.net>	2015-11-03 12:10:06 +0100
commit	02cc3d8088c307a26f9b52e294fb932d1e40ee4d (patch)
tree	c7e987a1421f4c7db08c1aa4bf17107185dca4d0
parent	f64f5d0c9e37828bc1a42f8e69bbc4d3d8c549f5 (diff)