Imported Upstream version 3.18.0upstream/3.18.0

author: Jörg Frings-Fürst <debian@jff-webhosting.net> 2015-09-27 14:23:15 +0200
committer: Jörg Frings-Fürst <debian@jff-webhosting.net> 2015-09-27 14:23:15 +0200
commit: f64f5d0c9e37828bc1a42f8e69bbc4d3d8c549f5 (patch)
tree: 4b288591003df04deea71d2acfb71f81849ea2f2
parent: 05e2631353c9f9522564ca06efc8fc5ba3a863cb (diff)
84 files changed, 8220 insertions, 8035 deletions
diff --git a/NEWS b/NEWS
index 6757345..8c753c5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,16 @@
+Overview of changes in simple-scan 3.18.0
+
+  * Show error message when fail to install drivers
+  * Bump copyright dates
+
+Overview of changes in simple-scan 3.17.92
+
+  * Correctly select the previous device after the device list is updated
+
+Overview of changes in simple-scan 3.17.91
+
+  * Updated translations
+
 Overview of changes in simple-scan 3.17.90
 
   * Default to PDF when saving in all cases.
diff --git a/configure b/configure
index 0d56a07..4df72b8 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.17.90.
+# Generated by GNU Autoconf 2.69 for simple-scan 3.18.0.
 #
 #
 # 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.17.90'
-PACKAGE_STRING='simple-scan 3.17.90'
+PACKAGE_VERSION='3.18.0'
+PACKAGE_STRING='simple-scan 3.18.0'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1396,7 +1396,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures simple-scan 3.17.90 to adapt to many kinds of systems.
+\`configure' configures simple-scan 3.18.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1462,7 +1462,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of simple-scan 3.17.90:";;
+     short | recursive ) echo "Configuration of simple-scan 3.18.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1578,7 +1578,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-simple-scan configure 3.17.90
+simple-scan configure 3.18.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1830,7 +1830,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.17.90, which was
+It was created by simple-scan $as_me 3.18.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2693,7 +2693,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='simple-scan'
- VERSION='3.17.90'
+ VERSION='3.18.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6366,7 +6366,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.17.90, which was
+This file was extended by simple-scan $as_me 3.18.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6423,7 +6423,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.17.90
+simple-scan config.status 3.18.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index e1d19a5..d53c561 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.17.90)
+AC_INIT(simple-scan, 3.18.0)
 AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign])
 AM_SILENT_RULES([yes])
 AM_MAINTAINER_MODE
diff --git a/po/af.po b/po/af.po
index 6116fa1..be24ea9 100644
--- a/po/af.po
+++ b/po/af.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:39+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:13+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Terug"
 
 #. 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 "Eenvoudige Skandeer"
 
@@ -87,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:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,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:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "Stoor"
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr "Insny"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "Voorkeure"
 
@@ -295,7 +296,7 @@ msgstr ""
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Skandeer dokumente"
 
@@ -452,7 +453,7 @@ msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Skandering het misluk"
 
@@ -462,60 +463,61 @@ msgid "Scanned Document"
 msgstr "Geskandeerde dokument"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr "Geskandeerde dokument.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../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:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "Stoor as..."
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr "Beeldlêers"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "Alle lêers"
 
@@ -525,77 +527,77 @@ msgid "Select File _Type"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../src/ui.vala:649
 msgid "Failed to save file"
 msgstr "Kon nie die leêr stoor nie"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:670
+#: ../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:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -612,16 +614,16 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "Aangaande Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -634,106 +636,106 @@ msgstr ""
 "  Willem van der Colff https://launchpad.net/~wilalla"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (verstek resolusie)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, 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:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "Verander _skandeerder"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/am.po b/po/am.po
index fc31f5e..f1d6656 100644
--- a/po/am.po
+++ b/po/am.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:39+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:13+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ 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 "ቀላል ማሰሻ"
 
@@ -87,7 +88,7 @@ msgstr "ፎቶ"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr "ገጾች መመዝገቢያ"
 
@@ -205,7 +206,7 @@ msgstr "ማሰሻ"
 msgid "Save document to a file"
 msgstr "ሰነድ ወደ ፋይል ማስቀመጫ"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "ማስቀመጫ"
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr "መከርከሚያ"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "ምርጫዎች"
 
@@ -295,7 +296,7 @@ msgstr "ጥራት:"
 msgid "Document Scanner"
 msgstr "ሰነድ ማሰሻ"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "ሰነድ ማሰሻ"
 
@@ -446,7 +447,7 @@ msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "ማሰስ አልተቻለም"
 
@@ -456,60 +457,61 @@ msgid "Scanned Document"
 msgstr "የታሰሰው ሰነድ"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "ያስኪዱ '%s --እርዳታ'  ዝግጁ የሆኑ የትእዛዝ መስመሮችን ለማየት"
 
-#: ../src/ui.vala:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr "_መዝጊያ"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "የተጠቃሚ ስም እና የመግቢያ ቃል ያስፈልጋል እዚህ ጋር ለመድረስ '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr "ምንም ማሰሻ አልተገኘም"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "ማስቀመጫ እንደ..."
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr "_መሰረዣ"
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr "_ማሰቀመጫ"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr "የምስል ፋይሎች"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "ሁሉንም ፋይሎች"
 
@@ -519,77 +521,77 @@ msgid "Select File _Type"
 msgstr "የ ፋይል _አይነት ይምረጡ"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr "PDF (በርካት-ገጽ ሰነድ)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr "JPEG (የታመቀ)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr "PNG (ያልታመቀ)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../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:670
+#: ../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:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr "የ አሁኑን ሰነድ ላስቀምጠው?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr "ለውጦቹን ማስወገጃ"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -606,122 +608,122 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "ሰለ ቀላል ማሰሻ"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "የ ቀላል ሰነድ ማሰሻ መሳሪያ"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  samson https://launchpad.net/~sambelet"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (ነባር)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr "አዲስ ሰነድ"
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr "ሰነድ"
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr "ኢሜይል..."
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr "ማተሚያ..."
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr "እርዳታ"
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr "ስለ"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr "ማጥፊያ"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "_ማሰሻ መቀየሪያ"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "ራሱ በራሱ"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr "ትንሽ"
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr "ተጨማሪ"
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr "አነስተኛ"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/ar.po b/po/ar.po
index 5c0bcb1..68b3508 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:39+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:13+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ 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 "الماسحة الضوئية"
 
@@ -87,7 +88,7 @@ msgstr "صورة"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +206,7 @@ msgstr "امسح"
 msgid "Save document to a file"
 msgstr "احفظ المستند في ملف"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "احفظ"
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr "اقتصاص"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "التفضيلات"
 
@@ -295,7 +296,7 @@ msgstr ""
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "امسح المستندات"
 
@@ -448,7 +449,7 @@ msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "أصلح ملفات PDF المولدة باستخدام إصدارات قديمة من الماسحة الضوئية"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "فشل المسح"
 
@@ -458,60 +459,61 @@ msgid "Scanned Document"
 msgstr "مستند ممسوح"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[جهاز...] - أداة مسح ضوئي"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../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:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr "مستند ممسوح.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "اسم مستخدم وكلمة سر مطلوبين للنفاذ إلى '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr "لم يُعثر على أي ماسحة"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr "يرجى التحقق من أنّ الماسحة متصلة وتعمل"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "احفظ كـ..."
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr "ملفات الصور"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "كل الملفات"
 
@@ -521,77 +523,77 @@ msgid "Select File _Type"
 msgstr "اختر _نوع الملف"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr "PDF‏ (مستند متعدد الصفحات)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr "‏JPEG (مضغوط)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr "‏PNG (غير فقود)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../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:670
+#: ../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:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr "أأحفظ المستند الحالي؟"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr "ارفض التغيرات"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr "تعذّر حفظ الصورة للمعاينة"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr "تعذر فتح معاين الصور"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr "تعذّر فتح ملف المساعدة"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -618,16 +620,16 @@ msgstr ""
 "إذا لم يحدث هذا فانظر <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "عن \"الماسحة الضوئية\""
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "أداة بسيطة لمسح المستندات"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -644,106 +646,106 @@ msgstr ""
 "  rashed alhazimi https://launchpad.net/~linex"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr "هل ترغب بحفظ المستند قبل الخروج؟"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr "أُخرج دون حفظ"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d نقطة\\بوصة (مبدئي)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d نقطة\\بوصة (مسودة)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, 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:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr "%d نقطة\\بوصة"
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "غيّر _الماسحة"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "آلي"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr "يحفظ المستند..."
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "يحفظ الصفحة %d من أصل %d"
diff --git a/po/ast.po b/po/ast.po
index 68b66c4..fd719c7 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:39+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ 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 "Simple Scan"
 
@@ -87,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:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr "Reordenar les páxines"
 
@@ -205,7 +206,7 @@ msgstr ""
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr ""
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "Preferencies"
 
@@ -295,7 +296,7 @@ msgstr "Calidá:"
 msgid "Document Scanner"
 msgstr "Escáner de documentos"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr ""
 
@@ -448,7 +449,7 @@ msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "Iguar ficheros PDF con versiones anteriores de Simple Scan"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Falló al escanerr"
 
@@ -458,62 +459,63 @@ msgid "Scanned Document"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[PRESÉU...] - Utilidá d'escanéu"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Executa '%s --help' pa ver una llista completa de les opciones disponibles "
 "na llinia de comandos."
 
-#: ../src/ui.vala:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr "Documentu Escaneáu.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr "_Zarrar"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Requierse nome d'usuariu y contraseña p'acceder a '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr "Nun se deteutó dengún escáner"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr "Por favor comprueba que l'escáner ta coneutáu y activáu"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "Guardar como..."
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr "_Encaboxar"
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr "_Guardar"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr ""
 
@@ -523,77 +525,77 @@ msgid "Select File _Type"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../src/ui.vala:649
 msgid "Failed to save file"
 msgstr "Falló al guardar el ficheru"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:670
+#: ../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:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr "Nun pudo guardase la imaxe de previsualización"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr "Combinar llaos"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr "Combinar llaos (inversu)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr "Inversu"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr "Caltener ensin cambeos"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -622,16 +624,16 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "Tocante a Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "Una cenciella ferramienta pa escanear documentos"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -641,106 +643,106 @@ msgstr ""
 "  ivarela https://launchpad.net/~ivarela"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr "Documentu nuevu"
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr "Documentu"
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr "Corréu-e..."
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr "Imprentar..."
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr "Ayuda"
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr "Tocante a"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr "Quitar"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr "Más escuru"
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr "Más claru"
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr "Menos"
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr "Más"
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr "Mínimu"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr "Máximu"
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr "Guardando documentu..."
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, 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 6c11a8e..e61a3d8 100644
--- a/po/az.po
+++ b/po/az.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:39+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Arxa"
 
 #. 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 ""
 
@@ -87,7 +88,7 @@ msgstr ""
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +206,7 @@ msgstr ""
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr ""
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr "Kəs"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr ""
 
@@ -295,7 +296,7 @@ msgstr ""
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr ""
 
@@ -446,7 +447,7 @@ msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr ""
 
@@ -456,60 +457,61 @@ msgid "Scanned Document"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../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:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr ""
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr ""
 
@@ -519,77 +521,77 @@ msgid "Select File _Type"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../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:670
+#: ../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:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -606,16 +608,16 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -623,106 +625,106 @@ msgstr ""
 "  Nicat Məmmədov https://launchpad.net/~nicat455"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/bg.po b/po/bg.po
index 867acd1..03ad2b5 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:39+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ 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 "Опростено сканиране"
 
@@ -87,7 +88,7 @@ msgstr "Снимка"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +206,7 @@ msgstr "Сканирай"
 msgid "Save document to a file"
 msgstr "Съхрани документа като файл"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "Съхрани"
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr "Изрежи"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "Настройки"
 
@@ -295,7 +296,7 @@ msgstr "Качество:"
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Сканиране на документи"
 
@@ -452,7 +453,7 @@ msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "Поправи PDF файловете, създадени с по-стари версии на Simple Scan"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Неусшно сканиране"
 
@@ -462,61 +463,62 @@ msgid "Scanned Document"
 msgstr "Сканиран документ"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Инструмент за сканиране"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../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:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr "Сканиран документ.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr "_Затвори"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Необходими са потребителско име и парола за достъп до '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr "Не са открити скенери"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr "Моля проверете дали скенерът ви е свързан и включен"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "Съхрани като..."
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr "_Отмени"
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr "_Съхрани"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr "Файлове с изображения"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "Всички файлове"
 
@@ -526,77 +528,77 @@ msgid "Select File _Type"
 msgstr "Избор на _тип файл"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr "PDF (документ с много страници)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr "JPEG (компресирани)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr "PNG (без загуби на качеството)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../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:670
+#: ../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:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr "Да съхраним ли текущия документ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr "Откажи промените"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr "Изображението не може да бъде запазено за предварителен преглед"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr "Невъзможно е отварянето на приложение за преглед на изображението"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr "Помощния файл не може да бъде отворен"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -627,16 +629,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "За програмата"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "Инструмент за опростено сканиране на документи"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -650,106 +652,106 @@ msgstr ""
 "  Филип Андонов https://launchpad.net/~vonodna"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr "Да съхраня ли документа, преди да затворите програмата?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr "Излез без запазване"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (по подразбиране)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (чернова)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, 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:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "Смени _скенера"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "Автоматично"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr "Тъмно"
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr "Светло"
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr "Малко"
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr "Много"
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr "Минимално"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr "Максимално"
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr "Съхраняване на документа..."
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Съхраняване на страница %d от %d"
diff --git a/po/bo.po b/po/bo.po
index f6853e2..e928646 100644
--- a/po/bo.po
+++ b/po/bo.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:40+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ 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 "པར་བཤུ་དཀྱུས་མ"
 
@@ -87,7 +88,7 @@ msgstr "པར"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +206,7 @@ msgstr "པར་བཤུ"
 msgid "Save document to a file"
 msgstr "ཡི་གེ་ཡིག་ཆའི་ནང་གསོག་ཉར"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "གསོག་ཉར"
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr "གཅད"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "རང་མོས་སྒྲིག་བཟོ"
 
@@ -295,7 +296,7 @@ msgstr ""
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "ཡིག་གེ་པར་བཤུ"
 
@@ -448,7 +449,7 @@ msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "པར་བཤུ་བྱེད་མ་ཐུབ་པ"
 
@@ -458,60 +459,61 @@ msgid "Scanned Document"
 msgstr "པར་བཤུ་ཚར་བའི་ཡི་གེ"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr "པར་བཤུས་ཡིག་ཆ.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "'%s'མཁོ་སྤྱོད་བྱེད་པར་སྤྱོད་མཁན་མིང་དང་གསང་གྲངས་དགོས་པ"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr "པར་བཤུ་ཆས་རྙེད་མ་བྱུང་"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr "ཁྱོད་ཀྱི་པར་བཤུ་ཆས་སྦྲེལ་ཡོད་པ་དང་གློག་བཏང་ཡོད་པར་དག་བཤེར་བྱེད་རོགས"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "ཉར་སྟངས་་་"
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr "གཟུགས་བརྙན་ཡིག་ཆ"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "ཡིག་ཆ་ཡོངས་རྫོགས"
 
@@ -521,77 +523,77 @@ msgid "Select File _Type"
 msgstr "ཡིག་ཆའི་རིགས་གདམ་པ_T"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr "PDF(ཤོག་ལེབ་མང་པོའི་ཡིག་ཆ)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr "JPEG (བསྡུ་འཇུག)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr "PNG (བོར་བརླག་མ་ཤོར་བ)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../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:670
+#: ../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:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr "དང་ཐོག་གི་ཡིག་ཆ་ཉར་ཚགས"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr "བཟོ་བཅོས་རྣམས་འདོར་བ"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr "སྔོན་ལྟ་ཉེར་སྤྱོད་ཁ་ཕྱེ་མ་ཐུབ་པ"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr "རོགས་འདེགས་ཡིག་ཆ་ཁ་ཕྱེ་མ་ཐུབ"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -620,122 +622,122 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "པར་བཤུ་བ་དཀྱུས་མའི་སྐོར"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "ཡིག་ཆ་པར་བཤུ་ཆས་དཀྱུས་མ"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Tennom https://launchpad.net/~tennomyathog"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr "ཕྱིར་འཐེན་མ་བྱས་གོང་གསོག་འཇོག་བྱེད་པ"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr "གསོག་འཇོག་མ་བྱས་པར་ཕྱིར་འཐེན"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (སྔོན་འཛུགས)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (ཟིན་བྲིས)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, 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:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "པར་བཤུ་ཆས་བརྗེ་བ_S"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "ར་ང་འགུལ་ངང"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 701374b..7cbec33 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:39+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Revers de la pàgina"
 
 #. 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 "Escaneig senzill"
 
@@ -87,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:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr "Reordena les pàgines"
 
@@ -205,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:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "Desa"
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr "Escapça"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "Preferències"
 
@@ -295,7 +296,7 @@ msgstr "Qualitat:"
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Escanegeu documents"
 
@@ -455,7 +456,7 @@ msgstr ""
 "Arregla els fitxers PDF generats amb versions anteriors de l'Escaneig senzill"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Ha fallat l'escaneig"
 
@@ -465,62 +466,63 @@ msgid "Scanned Document"
 msgstr "Document escanejat"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DISPOSITIU...] - Utilitat d'escaneig"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Executeu «%s --help» per veure la llista completa d'opcions disponibles de "
 "la línia d'ordres."
 
-#: ../src/ui.vala:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr "Document escanejat.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr "_Tanca"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Cal un usuari i contrasenya per a accedir a «%s»"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr "No s'ha detectat cap escàner"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr "Comproveu que l'escàner està connectat i engegat"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "Anomena i desa..."
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr "_Cancel·la"
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr "De_sa"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr "Fitxers d'imatge"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "Tots els fitxers"
 
@@ -530,77 +532,77 @@ msgid "Select File _Type"
 msgstr "Seleccioneu el _tipus de fitxer"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr "PDF (document multipàgina)."
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimit)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr "PNG (sense pèrdua)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../src/ui.vala:649
 msgid "Failed to save file"
 msgstr "No s'ha pogut desar el fitxer"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:670
+#: ../src/ui.vala:672
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Si no ho deseu, els canvis es perdran per sempre més."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr "Voleu desar el document actual?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr "Descarta els canvis"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr "No s'ha pogut desar la imatge per previsualitzar-la"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr "No s'ha pogut obrir l'aplicació de previsualització d'imatges"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr "No s'ha pogut obrir el fitxer d'ajuda"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -632,16 +634,16 @@ msgstr ""
 "juntament amb aquest programa. Si no, mireu <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "Quant a l'escaneig senzill"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "Eina senzilla d'escaneig de documents"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -656,106 +658,106 @@ msgstr ""
 "  pancake https://launchpad.net/~pancake"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr "Voleu desar el document abans de sortir?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr "Surt sense desar"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (predeterminat)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (esborrany)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, 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:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr "Document nou"
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr "Document"
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr "Envia per correu electrònic..."
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr "Imprimeix..."
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr "Ajuda"
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "Canvia l'e_scàner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "Automàtic"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr "Més fosc"
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr "Més clar"
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr "Menys"
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr "Més"
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr "Mínim"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr "Màxim"
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr "S'està desant el document..."
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "S'està desant la pàgina %d de %d"
diff --git a/po/ca@valencia.po b/po/ca@valencia.po
index 5bbc5e3..1452a85 100644
--- a/po/ca@valencia.po
+++ b/po/ca@valencia.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:40+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Revers de la pàgina"
 
 #. 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 "Escaneig senzill"
 
@@ -87,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:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,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:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "Guarda"
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr "Escapça"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "Preferències"
 
@@ -295,7 +296,7 @@ msgstr "Qualitat:"
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Escanegeu documents"
 
@@ -455,7 +456,7 @@ msgstr ""
 "Arregla els fitxers PDF generats amb versions anteriors de l'Escaneig senzill"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Ha fallat l'escaneig"
 
@@ -465,62 +466,63 @@ msgid "Scanned Document"
 msgstr "Document escanejat"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DISPOSITIU...] - Utilitat d'escaneig"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Executeu «%s --help» per veure la llista completa d'opcions disponibles de "
 "la línia d'ordes."
 
-#: ../src/ui.vala:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr "Document escanejat.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr "_Tanca"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Cal un usuari i contrasenya per a accedir a «%s»"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr "No s'ha detectat cap escàner"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr "Comproveu que l'escàner està connectat i engegat"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "Anomena i guarda..."
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr "_Cancel·la"
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr "Al_ça"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr "Fitxers d'imatge"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "Tots els fitxers"
 
@@ -530,77 +532,77 @@ msgid "Select File _Type"
 msgstr "Seleccioneu el _tipus de fitxer"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr "PDF (document multipàgina)."
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimit)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr "PNG (sense pèrdua)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../src/ui.vala:649
 msgid "Failed to save file"
 msgstr "No s'ha pogut guardar el fitxer"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:670
+#: ../src/ui.vala:672
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Si no ho guardeu, els canvis es perdran per sempre més."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr "Voleu guardar el document actual?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr "Descarta els canvis"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr "No s'ha pogut guardar la imatge per previsualitzar-la"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr "No s'ha pogut obrir l'aplicació de previsualització d'imatges"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr "No s'ha pogut obrir el fitxer d'ajuda"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -632,16 +634,16 @@ msgstr ""
 "juntament amb este programa. Si no, mireu <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "Quant a l'escaneig senzill"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "Eina senzilla d'escaneig de documents"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -649,106 +651,106 @@ msgstr ""
 "  Joan Duran https://launchpad.net/~jodufi"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr "Voleu guardar el document abans d'eixir?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr "Ix sense guardar"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (predeterminat)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (esborrany)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, 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:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "Canvia l'e_scàner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "Automàtic"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr "Més fosc"
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr "Més clar"
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr "Menys"
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr "Més"
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr "Mínim"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr "Màxim"
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr "S'està guardant el document..."
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "S'està guardant la pàgina %d de %d"
diff --git a/po/ce.po b/po/ce.po
index 9c54371..647a01a 100644
--- a/po/ce.po
+++ b/po/ce.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:39+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ 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 ""
 
@@ -87,7 +88,7 @@ msgstr ""
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +206,7 @@ msgstr ""
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr ""
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr ""
 
@@ -295,7 +296,7 @@ msgstr ""
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr ""
 
@@ -446,7 +447,7 @@ msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr ""
 
@@ -456,60 +457,61 @@ msgid "Scanned Document"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../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:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr ""
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr ""
 
@@ -519,77 +521,77 @@ msgid "Select File _Type"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../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:670
+#: ../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:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -606,120 +608,120 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/cs.po b/po/cs.po
index 9fd29f9..52d7d19 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:39+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Zadní"
 
 #. 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 "Jednoduché skenování"
 
@@ -87,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:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,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:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "Uložit"
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr "Oříznout"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "Předvolby"
 
@@ -295,7 +296,7 @@ msgstr "Kvalita:"
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Naskenovat dokumenty"
 
@@ -453,7 +454,7 @@ msgstr ""
 "Oprava PDF souborů generovaných se starší verzí nástroje Jednoduché skenování"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Skenování selhalo"
 
@@ -463,62 +464,63 @@ msgid "Scanned Document"
 msgstr "Skenovaný dokument"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ZAŘÍZENÍ...] - Nástroj pro skenování"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Spustit příkaz „%s --help“ k zobrazení úplného seznamu dostupných přepínačů "
 "příkazové řádky."
 
-#: ../src/ui.vala:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr "Naskenovaný dokument.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr "Z_avřít"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Pro přístup k '%s' je vyžadováno uživatelské jméno a heslo"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr "Nenalezen žádný skener"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr "Zkontrolujte prosím, že je váš skener připojen a zapnut"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "Uložit jako..."
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr "_Zrušit"
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr "_Uložit"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr "Soubory obrázků"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "Všechny soubory"
 
@@ -528,77 +530,77 @@ msgid "Select File _Type"
 msgstr "Zvolit _typ souboru"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr "PDF (vícestránkový dokument)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr "JPEG (komprimovaný)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr "PNG (bezeztrátový)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../src/ui.vala:649
 msgid "Failed to save file"
 msgstr "Uložení souboru selhalo"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:670
+#: ../src/ui.vala:672
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Pokud neuložíte, změny budou nenávratně ztraceny."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr "Uložit stávající dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr "Zahodit změny"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr "Nezdařilo se uložit obrázek pro náhled"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr "Nelze otevřít aplikaci s náhledem obrázku"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr "Nelze otevřít soubor s nápovědou"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -628,16 +630,16 @@ msgstr ""
 "Pokud ne, přečtěte si ji na stránce <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "O aplikaci Jednoduché skenování"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "Jednoduchý nástroj pro skenování dokumentů"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -655,106 +657,106 @@ msgstr ""
 "  la_serpe https://launchpad.net/~tom-mil"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr "Uložit dokument před ukončením?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr "Ukončit bez uložení"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (výchozí)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (náčrt)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, 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:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "Změnit _skener"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "Automaticky"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr "Tmavší"
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr "Světlejší"
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr "Méně"
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr "Více"
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr "Maximum"
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr "Ukládání dokumentu..."
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Ukládání strany %d z %d"
diff --git a/po/da.po b/po/da.po
index bfc1bac..688067e 100644
--- a/po/da.po
+++ b/po/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:39+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Bagside"
 
 #. 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 "Simpel skanning"
 
@@ -87,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:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr "Sortér sider påny"
 
@@ -205,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:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "Gem"
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr "Beskær"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "Indstillinger"
 
@@ -295,7 +296,7 @@ msgstr "Kvalitet:"
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Skan dokumenter"
 
@@ -453,7 +454,7 @@ msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "Ret PDF-filer oprettet med ældre versioner af Simple Scan"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Skanning mislykkedes"
 
@@ -463,62 +464,63 @@ msgid "Scanned Document"
 msgstr "Skannet dokument"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ENHED...] - Skanningsredskab"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Udfør \"%s --help\" for at se den fulde liste af tilgængelige "
 "kommandolinjetilvalg."
 
-#: ../src/ui.vala:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr "Skannet dokument.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr "_Luk"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Brugernavn og adgangskode er krævet for at tilgå \"%s\""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr "Ingen skannere fundet"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr "Kontrollér venligst at skanneren er tændt og sluttet til"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "Gem som..."
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr "_Annullér"
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr "_Gem"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr "Billedfiler"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "Alle filer"
 
@@ -528,77 +530,77 @@ msgid "Select File _Type"
 msgstr "Vælg fil_type"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr "PDF (flersidet dokument)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr "JPEG (komprimeret)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr "PNG (tabsfri)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../src/ui.vala:649
 msgid "Failed to save file"
 msgstr "Kunne ikke gemme fil"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:670
+#: ../src/ui.vala:672
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Hvis du ikke gemmer, vil ændringer gå permanent tabt."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr "Gem nuværende dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr "Kassér ændringer"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr "Kan ikke gemme billede for forhåndsvisning"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr "Kunne ikke åbne programmet til forhåndsvisning af billeder"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr "Kombinér sider"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr "Kombinér sider (omvendt)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr "Omvendt"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr "Bevar uændret"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr "Kan ikke åbne hjælpefil"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -627,16 +629,16 @@ msgstr ""
 "sammen med dette program. Hvis ikke, se <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "Om Simpel skanning"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "Simpelt dokumentskanningsværktøj"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -653,106 +655,106 @@ msgstr ""
 "  Torben Gundtofte-Bruun https://launchpad.net/~torbengb"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr "Gem dokumentet før der afsluttes?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr "Afslut uden at gemme"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (standard)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (udkast)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, 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:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr "Nyt dokument"
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr "Dokument"
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr "E-post..."
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr "Udskriv..."
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr "Hjælp"
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr "Om"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr "Afslut"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "Skift _skanner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr "Mørkere"
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr "Lysere"
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr "Mindre"
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr "Mere"
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr "Maksimum"
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr "Gemmer dokument ..."
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Gemmer side %d ud af %d"
diff --git a/po/de.po b/po/de.po
index a1bcd7a..6a10a9b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:39+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Rückseite"
 
 #. 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 "Simple Scan"
 
@@ -87,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:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr "Seiten umsortieren"
 
@@ -205,7 +206,7 @@ msgstr "Scannen"
 msgid "Save document to a file"
 msgstr "Als Datei speichern"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "Speichern"
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr "Zuschneiden"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "Einstellungen"
 
@@ -295,7 +296,7 @@ msgstr "Qualität:"
 msgid "Document Scanner"
 msgstr "Dokument-Scanner"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Dokumente scannen"
 
@@ -310,6 +311,11 @@ msgid ""
 "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 ""
@@ -456,7 +462,7 @@ msgstr ""
 "wurden"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Scannen fehlgeschlagen"
 
@@ -466,64 +472,65 @@ msgid "Scanned Document"
 msgstr "Gescanntes Dokument"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[GERÄT …] - Scan-Werkzeug"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Rufen Sie »%s --help« auf, um eine vollständige Liste der verfügbaren "
 "Befehlszeileoptionen zu erhalten."
 
-#: ../src/ui.vala:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr "Gescanntes Dokument.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr "S_chließen"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 "Für den Zugriff auf »%s« werden ein Benutzername und ein Passwort benötigt"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr "Kein Scanner gefunden"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 "Bitte überprüfen Sie, ob Ihr Scanner angeschlossen und eingeschaltet ist"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "Speichern unter …"
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr "Abbre_chen"
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr "_Speichern"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr "Bilddateien"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "Alle Dateitypen"
 
@@ -533,78 +540,78 @@ msgid "Select File _Type"
 msgstr "_Dateityp auswählen"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr "PDF (Mehrseitiges Dokument)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr "JPEG (Verlustbehaftet)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr "PNG (Verlustfrei)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../src/ui.vala:649
 msgid "Failed to save file"
 msgstr "Datei konnte nicht gespeichert werden"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:670
+#: ../src/ui.vala:672
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 "Wenn Sie nicht speichern, werden die Änderungen unwiderruflich verworfen."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr "Aktuelles Dokument speichern?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr "Änderungen verwerfen"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr "Vorschaubild kann nicht gespeichert werden"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr "Bildvorschauanwendung konnte nicht gestartet werden"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr "Seiten zusammenfügen"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr "Seiten zusammenfügen (umgekehrte Reihenfolge)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr "Vertauschen"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr "Unverändert lassen"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr "Die Hilfedatei konnte nicht geöffnet werden"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -638,16 +645,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "Über Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "Einfaches Werkzeug zum Scannen von Dokumenten"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -688,111 +695,112 @@ msgstr ""
 "  UweS https://launchpad.net/~uwes\n"
 "  Webschiff https://launchpad.net/~webschiff\n"
 "  William Glover https://launchpad.net/~williamglover\n"
+"  schuko24 https://launchpad.net/~gerd-saenger\n"
 "  simon danner https://launchpad.net/~simondanner\n"
 "  staedtler-przyborski https://launchpad.net/~staedtler-przyborski\n"
 "  tlue https://launchpad.net/~tlueber"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr "Dokument vor dem Beenden speichern?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr "Beenden ohne zu speichern"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (Vorgabe)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (Entwurf)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, 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:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr "Neues Dokument"
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr "Dokument"
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr "E-Mail …"
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr "Drucken …"
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr "Hilfe"
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr "Über"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr "Beenden"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "_Scanner wechseln"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr "Dunkler"
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr "Heller"
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr "Weniger"
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr "Mehr"
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr "Niedrig"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr "Hoch"
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr "Dokument wird gespeichert …"
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Seite %d von %d wird gespeichert"
diff --git a/po/el.po b/po/el.po
index 87dd582..27b69f8 100644
--- a/po/el.po
+++ b/po/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:39+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ 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 "Σάρωση"
 
@@ -87,7 +88,7 @@ msgstr "Φωτογραφία"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr "Επαναδιάταξη σελίδων"
 
@@ -205,7 +206,7 @@ msgstr "Σάρωση"
 msgid "Save document to a file"
 msgstr "Αποθήκευση εγγράφου σε αρχείο"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "Αποθήκευση"
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr "Περικοπή"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "Προτιμήσεις"
 
@@ -295,7 +296,7 @@ msgstr "Ποιότητα:"
 msgid "Document Scanner"
 msgstr "Σαρωτής εγγράφων"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Σάρωση εγγράφων"
 
@@ -459,7 +460,7 @@ msgstr ""
 "λογισμικού Simple Scan"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Η σάρωση απέτυχε"
 
@@ -469,64 +470,65 @@ msgid "Scanned Document"
 msgstr "Σαρωμένο"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ΣΥΣΚΕΥΗ…] - Εφαρμογή σάρωσης"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../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:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr "Σαρωμένο.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr "_Κλείσιμο"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Απαιτείται όνομα χρήστη και κωδικός για την πρόσβαση στο '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr "Δεν ανιχνεύθηκαν σαρωτές"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 "Παρακαλούμε βεβαιωθείτε ότι ο σαρωτής σας είναι συνδεδεμένος και σε "
 "λειτουργία"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "Αποθήκευση ως..."
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr "_Ακύρωση"
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr "Απο_θήκευση"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr "Αρχεία εικόνων"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "Όλα τα αρχεία"
 
@@ -536,77 +538,77 @@ msgid "Select File _Type"
 msgstr "Επιλογή _τύπου αρχείου"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr "PDF (έγγραφο πολλαπλών σελίδων)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr "JPEG (συμπιεσμένο)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr "PNG (δίχως συμπίεση)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../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:670
+#: ../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:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr "Αποθήκευση του τρέχοντος εγγράφου;"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr "Απόρριψη αλλαγών"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr "Αδυναμία αποθήκευσης σελίδας για προεπισκόπηση"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr "Αδύνατο το άνοιγμα της εφαρμογής προβολής εικόνων"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr "Διατήρηση αμετάβλητων"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr "Αδύνατο το άνοιγμα του αρχείου βοήθειας"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -638,16 +640,16 @@ msgstr ""
 "εδώ: <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "Περί Σάρωσης"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "Απλό εργαλείο σάρωσης εγγράφων"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -667,106 +669,106 @@ msgstr ""
 "  trix https://launchpad.net/~panelc"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr "Αποθήκευση του εγγράφου πριν την έξοδο;"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr "Έξοδος χωρίς Αποθήκευση"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (προεπιλογή)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (πρόχειρο)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, 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:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr "Νέο έγγραφο"
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr "Έγγραφο"
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr "Ηλεκτρονική αλληλογραφία..."
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr "Εκτύπωση..."
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr "Βοήθεια"
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr "Περί"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr "'Εξοδος"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "Αλλαγή _σαρωτή"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "Αυτόματο"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr "Σκοτεινότερο"
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr "Φωτεινότερο"
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr "Λιγότερο"
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr "Περισσότερο"
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr "Ελάχιστο"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr "Μέγιστο"
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr "Αποθήκευση εγγράφου..."
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Αποθήκευση σελίδας %d από %d"
diff --git a/po/en_GB.po b/po/en_GB.po
index b5149d2..fa8b314 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:40+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Back"
 
 #. 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 "Simple Scan"
 
@@ -87,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:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr "Reorder Pages"
 
@@ -205,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:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "Save"
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr "Crop"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "Preferences"
 
@@ -295,7 +296,7 @@ msgstr "Quality:"
 msgid "Document Scanner"
 msgstr "Document Scanner"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Scan Documents"
 
@@ -457,7 +458,7 @@ msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "Fix PDF files generated with older versions of Simple Scan"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Failed to scan"
 
@@ -467,61 +468,62 @@ msgid "Scanned Document"
 msgstr "Scanned Document"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Scanning utility"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Run '%s --help' to see a full list of available command line options."
 
-#: ../src/ui.vala:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr "Scanned Document.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr "_Close"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Username and password required to access '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr "No scanners detected"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr "Please check your scanner is connected and powered on"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "Save As..."
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr "_Cancel"
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr "_Save"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr "Image Files"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "All Files"
 
@@ -531,77 +533,77 @@ msgid "Select File _Type"
 msgstr "Select File _Type"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr "PDF (multi-page document)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr "JPEG (compressed)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr "PNG (lossless)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../src/ui.vala:649
 msgid "Failed to save file"
 msgstr "Failed to save file"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:670
+#: ../src/ui.vala:672
 msgid "If you don't save, changes will be permanently lost."
 msgstr "If you don't save, changes will be permanently lost."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr "Save current document?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr "Discard Changes"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr "Unable to save image for preview"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr "Unable to open image preview application"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr "Combine sides"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr "Combine sides (reverse)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr "Reverse"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr "Keep unchanged"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr "Unable to open help file"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -630,23 +632,23 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "About Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "Simple document scanning tool"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Alex Denvir https://launchpad.net/~coldfff\n"
 "  Andi Chandler https://launchpad.net/~bing\n"
 "  Anthony Harrington https://launchpad.net/~untaintableangel\n"
-"  GeorgeB https://launchpad.net/~solar.george\n"
+"  GeorgeB https://launchpad.net/~solar.george-deactivatedaccount\n"
 "  James Thorrold https://launchpad.net/~jthorrold\n"
 "  Jonathon Hodges https://launchpad.net/~jonblondie\n"
 "  Kaustav Das Modak https://launchpad.net/~kaustav-dasmodak\n"
@@ -654,106 +656,106 @@ msgstr ""
 "  Tomasz Chabowski https://launchpad.net/~tomasz-chabowski-googlemail"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr "Save document before quitting?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr "Quit without Saving"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (default)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (draft)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, 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:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr "New Document"
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr "Document"
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr "E-mail..."
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr "Print..."
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr "Help"
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr "About"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr "Quit"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "Change _Scanner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "Automatic"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr "Darker"
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr "Lighter"
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr "Less"
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr "More"
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr "Maximum"
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr "Saving document..."
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Saving page %d out of %d"
diff --git a/po/eo.po b/po/eo.po
index 9c1669b..0b27613 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:39+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 "Language: eo\n"
 
 #. Button to submit authorization dialog
@@ -50,6 +50,7 @@ msgstr "Dorso"
 
 #. 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 "Simpla skano"
 
@@ -88,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:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr "Reordigi paĝojn"
 
@@ -206,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:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "Konservi"
 
@@ -248,7 +249,7 @@ msgid "Crop"
 msgstr "Stuci"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "Agordoj"
 
@@ -296,7 +297,7 @@ msgstr "Kvalito:"
 msgid "Document Scanner"
 msgstr "Dokumentoskanilo"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Skani dokumentojn"
 
@@ -453,7 +454,7 @@ msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "Ripari PDF-dosierojn generitajn per antaŭaj versioj de Simple Scan"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Ne sukcesi skani"
 
@@ -463,61 +464,62 @@ msgid "Scanned Document"
 msgstr "Skanita Dokumento"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[APARATO...] - Skanutilaĵo"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Lanĉu '%s --help' por vidi plenan liston da disponeblaj komandliniaj opcioj."
 
-#: ../src/ui.vala:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr "Skanita Dokumento.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr "_Fermi"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Salutnomo kaj pasvorto estas necesa aliri '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr "Neniuj skaniloj eltrovis"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr "Bonvolu kontrolas ke via skanilo estas kenekta kaj kurentŝalta"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "Konservi kiel..."
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr "_Nuligi"
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr "Kon_servi"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr "Bildo-dosieroj"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "Ĉiuj dosieroj"
 
@@ -527,77 +529,77 @@ msgid "Select File _Type"
 msgstr "Elekti speco de dosieron"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr "PDF (multpaĝa dokumento)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr "JPEG (densigita)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr "PNG (senperda)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../src/ui.vala:649
 msgid "Failed to save file"
 msgstr "Ne sukcesis konservi la dosieron"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:670
+#: ../src/ui.vala:672
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Se vi ne konservas, ŝanĝoj estos perditaj permanente."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr "Konservi la nunan dokumenton?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr "Forlasi Ŝanĝojn"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr "Ne eblas konservi bildon por antaŭrigardo"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr "Ne eblis malfermi bild-dosieron"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr "Kombini flankojn"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr "Kombini flankojn"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr "Inversigi"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr "Konservi senŝanĝa"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr "Ne eblis malfermi help-dosieron"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -627,16 +629,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "Pri simpla skani"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "Simpla ilo por skanantaj dokumentoj"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -650,106 +652,106 @@ msgstr ""
 "  Tiffany Antopolski https://launchpad.net/~mimico-tiffany"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr "Konservi dokumenton antaŭe ĉesanta?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr "Fini sen konservanta"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, 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:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d punktoj en colo (malneto)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, 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:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr "%d punktoj en colo"
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "Ŝanĝi _Skanilo"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "Aŭtomata"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr "Pli malhele"
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr "Pli hele"
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr "Malpli"
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr "Pli"
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr "Minimume"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr "Maksimume"
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr "Konservado de dokumento..."
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Konservado de paĝo %d el %d"
diff --git a/po/es.po b/po/es.po
index ae402b2..da8371e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:40+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Reverso"
 
 #. 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 "Simple Scan"
 
@@ -87,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:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr "Reordenar las páginas"
 
@@ -205,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:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "Guardar"
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr "Recortar"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "Preferencias"
 
@@ -295,7 +296,7 @@ msgstr "Calidad:"
 msgid "Document Scanner"
 msgstr "Escáner de documentos"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Escanear documentos"
 
@@ -460,7 +461,7 @@ msgstr ""
 "Arreglar archivos PDF generados con versiones anteriores de Simple Scan"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Falló al escanear"
 
@@ -470,62 +471,63 @@ msgid "Scanned Document"
 msgstr "Documento escaneado"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DISPOSITIVO…] - Utilidad de escaneo"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Ejecute «%s --help» para ver una lista completa de las opciones de línea de "
 "órdenes disponibles."
 
-#: ../src/ui.vala:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr "Documento.pdf escaneado"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr "_Cerrar"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Usuario y contraseña necesarios para acceder a «%s»"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr "No se detectó ningún escáner"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr "Compruebe que su escáner está encendido y conectado"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "Guardar como…"
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr "_Guardar"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr "Archivos de imagen"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "Todos los archivos"
 
@@ -535,77 +537,77 @@ msgid "Select File _Type"
 msgstr "Seleccione el _tipo de archivo"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr "PDF (documento multipágina)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimido)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr "PNG (sin pérdida)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../src/ui.vala:649
 msgid "Failed to save file"
 msgstr "Falló al guardar el archivo"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:670
+#: ../src/ui.vala:672
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Los cambios se perderán permanentemente si no los guarda."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr "¿Guardar el documento actual?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr "Descartar cambios"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr "No se pudo guardar la imagen para previsualización"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr "No se puede abrir la aplicación de previsualización de imágenes"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr "Combinar lados"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr "Combinar lados (invertido)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr "Invertir"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr "Mantener sin cambios"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr "No se pudo abrir el archivo de ayuda"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -634,16 +636,16 @@ msgstr ""
 "con este programa. Si no fuera así, vea <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "Acerca de Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "Herramienta sencilla para escanear documentos"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -675,106 +677,106 @@ msgstr ""
 "  hhlp https://launchpad.net/~hhlp-deactivatedaccount"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr "¿Guardar el documento antes de salir?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr "Salir sin guardar"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (predeterminado)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (borrador)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, 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:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr "Documento nuevo"
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr "Documento"
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr "Correo..."
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr "Imprimir…"
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr "Ayuda"
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr "Acerca de"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr "Salir"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "Cambiar _escáner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr "Más oscuro"
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr "Más claro"
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr "Menos"
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr "Más"
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr "Mínima"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr "Máxima"
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr "Guardando el documento…"
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Guardando la página %d de %d"
diff --git a/po/et.po b/po/et.po
index 380ee3a..de39413 100644
--- a/po/et.po
+++ b/po/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:39+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Tagakülg"
 
 #. 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 "Lihtne skannija"
 
@@ -87,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:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +206,7 @@ msgstr "Skanni"
 msgid "Save document to a file"
 msgstr "Dokumendi salvestamine faili"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "Salvesta"
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr "Kärbi"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "Eelistused"
 
@@ -295,7 +296,7 @@ msgstr ""
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Dokumentide skannimine"
 
@@ -449,7 +450,7 @@ msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Skannimine nurjus"
 
@@ -459,60 +460,61 @@ msgid "Scanned Document"
 msgstr "Skannitud dokument"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "Käivita '%s --help', et näha kõiki käsurea valikuid."
 
-#: ../src/ui.vala:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr "Skannitud dokument.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "'%s' ligipääsuks on vajalik kasutajanimi ja parool"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr "Ühtegi skannerit ei tuvastatud"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr "Kontrolli, kas skanner on ühendatud ja sisse lülitatud"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "Salvesta kui..."
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr "Pildifailid"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "Kõik failid"
 
@@ -522,77 +524,77 @@ msgid "Select File _Type"
 msgstr "Vali faili _tüüp"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr "PDF (mitmeleheküljeline dokument)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr "JPEG (tihendatud)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr "PNG (kadudeta)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../src/ui.vala:649
 msgid "Failed to save file"
 msgstr "Faili salvestamine nurjus"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:670
+#: ../src/ui.vala:672
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Kui sa ei salvesta, lähevad muudatused jäädavalt kaotsi."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr "Kas salvestada see dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr "Tühista muudatused"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr "Eelvaate pildi salvestamine ebaõnnestus"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr "Pildi eelvaatluse rakendust ei suudetud käivitada"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr "Abiteabe faili pole võimalik avada"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -622,16 +624,16 @@ msgstr ""
 "<http://www.gnu.org/licences/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "Lihtsast skannijast lähemalt"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "Lihtne dokumendi skaneerimise tööriist"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -640,106 +642,106 @@ msgstr ""
 "  mahfiaz https://launchpad.net/~mahfiaz"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr "Kas salvestada dokument enne väljumist?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr "Välju ilma salvestamata"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (vaikimisi)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (mustand)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, 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:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "_Skanneri vahetamine"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "Automaatne"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr "Dokumendi salvestamine..."
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/eu.po b/po/eu.po
index c3159d7..6d54a67 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:39+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Atzealdea"
 
 #. 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 "Simple Scan"
 
@@ -87,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:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr "Berrordenatu orrialdeak"
 
@@ -205,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:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "Gorde"
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr "Moztu"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "Hobespenak"
 
@@ -295,7 +296,7 @@ msgstr "Kalitatea:"
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Eskaneatu dokumentuak"
 
@@ -455,7 +456,7 @@ msgstr ""
 "Konpondu Simple Scan-en bertsio zaharragoekin sortutako PDF fitxategiak"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Ezin izan da eskaneatu"
 
@@ -465,60 +466,61 @@ msgid "Scanned Document"
 msgstr "Eskaneatutako dokumentua"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Eskaneatze-aplikazioa"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "Exekutatu '%s --help' komando-lerroko aukera guztiak zerrendatzeko."
 
-#: ../src/ui.vala:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr "Dokumentu.pdf eskaneatuta"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr "_Itxi"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Erabiltzaile-izena eta pasahitza behar dira '%s' atzitzeko"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr "Ez da eskanerrik detektatu"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr "Egiaztatu zure eskanerra konektatuta eta piztuta dagoela"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "Gorde honela..."
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr "_Utzi"
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr "_Gorde"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr "Irudi-fitxategiak"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "Fitxategi guztiak"
 
@@ -528,77 +530,77 @@ msgid "Select File _Type"
 msgstr "Hautatu fit_xategi-mota"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr "PDF (orrialde anitzeko dokumentua)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr "JPEG (konprimitua)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr "PNG (galerarik gabea)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../src/ui.vala:649
 msgid "Failed to save file"
 msgstr "Ezin izan da fitxategia gorde"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:670
+#: ../src/ui.vala:672
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Gordetzen ez baduzu, aldaketak betiko galduko dira."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr "Gorde uneko dokumentua?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr "Baztertu aldaketak"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr "Ezin izan da aurrebistarako irudia gorde"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr "Ezin izan da ireki irudiaren aurrebistarako aplikazioa"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr "Konbinatu aldeak"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr "Konbinatu aldeak (alderantziz)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr "Alderantziz"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr "Mantendu aldatu gabe"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr "Ezin izan da ireki laguntza-fitxategia"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -627,16 +629,16 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "Simple Scan-i buruz"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "Dokumentuak eskaneatzeko tresna sinplea"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -652,106 +654,106 @@ msgstr ""
 "  gorkaazk https://launchpad.net/~gorkaazkarate"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr "Gorde dokumentua irten baino lehen?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr "Irten gorde gabe"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (lehenetsia)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (zirriborroa)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, 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:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr "Dokumentu berria"
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr "Dokumentua"
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr "Bidali postaz..."
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr "Inprimatu..."
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr "Laguntza"
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr "Honi buruz"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr "Irten"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "Aldatu e_skanerra"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "Automatikoa"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr "Ilunago"
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr "Argiago"
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr "Gutxiago"
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr "Gehiago"
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr "Minimoa"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr "Maximoa"
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr "Dokumentua gordetzen..."
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "%d orria (%d-etik) gordetzen"
diff --git a/po/fi.po b/po/fi.po
index fe8f355..d886102 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:39+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Takapuoli"
 
 #. 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 "Kuvanluku"
 
@@ -87,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:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr "Järjestä sivut"
 
@@ -205,7 +206,7 @@ msgstr "Lue"
 msgid "Save document to a file"
 msgstr "Tallenna asiakirja tiedostoon"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "Tallenna"
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr "Rajaa"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "Asetukset"
 
@@ -295,7 +296,7 @@ msgstr "Laatu:"
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Lue asiakirjoja kuvanlukijalta"
 
@@ -453,7 +454,7 @@ msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "Korjaa vanhemmilla Kuvanlukijan versioilla luodut PDF-tiedostot"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Kuvanluku epäonnistui"
 
@@ -463,60 +464,61 @@ msgid "Scanned Document"
 msgstr "Kuvanlukuasiakirja"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[LAITE...] - Skannaus apuohjelma"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "Näet kaikki komentorivivalitsimet komennolla \"%s --help\""
 
-#: ../src/ui.vala:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr "Asiakirja kuvanlukijasta.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr "_Sulje"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Käyttäjänimi ja salasana vaaditaan laitteelle ”%s” pääsemiseksi"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr "Kuvanlukijoita ei havaittu"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr "Varmista että kuvanlukijasi on yhdistetty ja kytketty päälle"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "Tallenna nimellä..."
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr "_Peru"
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr "_Tallenna"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr "Kuvatiedostot"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "Kaikki tiedostot"
 
@@ -526,77 +528,77 @@ msgid "Select File _Type"
 msgstr "Valitse tiedosto_tyyppi"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr "PDF (monisivuinen asiakirja)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr "JPEG (pakattu)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr "PNG (häviötön)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../src/ui.vala:649
 msgid "Failed to save file"
 msgstr "Tiedoston tallennus epäonnistui"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:670
+#: ../src/ui.vala:672
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Jos et tallenna, muutokset katoavat pysyvästi."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr "Tallennetaanko nykyinen asiakirja?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr "Hylkää muutokset"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr "Esikatselun tallennus epäonnistui"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr "Esikatselusovelluksen avaus epäonnistui"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr "Yhdistä puolet"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr "Yhdistä puolet (käänteinen)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr "Käänteinen"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr "Säilytä muuttumattomana"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr "Ohjetiedostoa ei voi avata"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -627,16 +629,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "Tietoja sovelluksesta"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "Yksinkertainen asiakirjojen kuvanlukutyökalu"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -651,106 +653,106 @@ msgstr ""
 "  Ville Pilvio https://launchpad.net/~vpilvio"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr "Tallennetaanko asiakirja ennen sovelluksen sulkemista?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr "Sulje tallentamatta"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (oletus)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (vedos)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, 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:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr "Uusi asiakirja"
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr "Asiakirja"
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr "Sähköposti..."
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr "Tulosta..."
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr "Ohje"
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr "Tietoja"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr "Lopeta"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "Muuta _kuvanlukijaa"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "Automaattinen"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr "Tummempi"
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr "Vaaleampi"
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr "Vähemmän"
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr "Enemmän"
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr "Heikompi"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr "Parempi"
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr "Tallennetaan asiakirjaa..."
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Tallennetaan sivua %d/%d"
diff --git a/po/fr.po b/po/fr.po
index e31e2d5..146d601 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:39+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Verso"
 
 #. 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 "Outil de numérisation Simple Scan"
 
@@ -87,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:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr "Réorganiser les pages"
 
@@ -205,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:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "Enregistrer"
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr "Recadrer"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "Préférences"
 
@@ -295,7 +296,7 @@ msgstr "Qualité :"
 msgid "Document Scanner"
 msgstr "Numériseur de documents"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Numériser des documents"
 
@@ -466,7 +467,7 @@ msgstr ""
 "Corriger les fichiers PDF générés avec les anciennes versions de Simple Scan"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Échec de la numérisation"
 
@@ -476,64 +477,65 @@ msgid "Scanned Document"
 msgstr "Document numérisé"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Outil de numérisation"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Exécutez « %s --help » pour voir la liste complète des options disponibles "
 "en ligne de commande."
 
-#: ../src/ui.vala:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr "Document.pdf numérisé"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr "_Fermer"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Nom d'utilisateur et mot de passe nécessaires pour accéder à « %s »"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr "Aucun périphérique de numérisation n'a été détecté."
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 "Veuillez vérifier que votre périphérique de numérisation est connecté et "
 "sous tension."
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "Enregistrer sous..."
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr "_Annuler"
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr "_Enregistrer"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr "Fichiers image"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "Tous les fichiers"
 
@@ -543,78 +545,78 @@ msgid "Select File _Type"
 msgstr "Sélectionner le _type de fichier"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr "PDF (document multipage)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr "JPEG (compressé)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr "PNG (sans perte)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../src/ui.vala:649
 msgid "Failed to save file"
 msgstr "Impossible d'enregistrer le fichier"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:670
+#: ../src/ui.vala:672
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 "Si vous n'enregistrez pas, les modifications seront définitivement perdues."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr "Enregistrer le document actuel ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr "Abandonner les modifications"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr "Impossible d'enregistrer l'image pour la prévisualiser"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr "Impossible d'ouvrir l'aperçu de l'image"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr "Associer les côtés"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr "Associer les côtés (inverser)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr "Inverser"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr "Maintenir inchangé"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr "Impossible d'ouvrir le fichier d'aide"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -644,16 +646,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "À propos de Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "Numériser simplement vos documents"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -661,7 +663,6 @@ msgstr ""
 "  Alexandre Franke https://launchpad.net/~afranke\n"
 "  Alexandre Pliarchopoulos https://launchpad.net/~al-pliar\n"
 "  Antoine Pernot https://launchpad.net/~antoinepernot\n"
-"  Audiger Jeremy https://launchpad.net/~tankypon\n"
 "  Bruno Patri https://launchpad.net/~bruno666-deactivatedaccount\n"
 "  Christophe Herot https://launchpad.net/~tictoc-free\n"
 "  Darknautilus https://launchpad.net/~darknautilus\n"
@@ -684,9 +685,10 @@ msgstr ""
 "  Pierre Slamich https://launchpad.net/~pierre-slamich\n"
 "  RemiJ https://launchpad.net/~remij\n"
 "  Robert Ancell https://launchpad.net/~robert-ancell\n"
-"  Simon THOBY https://launchpad.net/~simonthoby\n"
+"  Simon THOBY https://launchpad.net/~simonthoby-deactivatedaccount\n"
 "  Stanislas Michalak https://launchpad.net/~stanislas-michalak\n"
 "  Sylvie Gallet https://launchpad.net/~sylvie-gallet\n"
+"  Tankypon https://launchpad.net/~tankypon\n"
 "  Xavier Verne https://launchpad.net/~xavier-verne\n"
 "  YannUbuntu https://launchpad.net/~yannubuntu\n"
 "  beudbeud https://launchpad.net/~beudbeud\n"
@@ -696,106 +698,106 @@ msgstr ""
 "  torglut https://launchpad.net/~torglut"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr "Enregistrer le document avant de quitter ?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr "Quitter sans enregistrer"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (par défaut)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (brouillon)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, 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:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr "Nouveau document"
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr "Document"
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr "Courriel..."
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr "Imprimer..."
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr "Aide"
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr "À propos"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr "Quitter"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "Changer de _périphérique de numérisation"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "Automatique"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr "Plus foncé"
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr "Plus clair"
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr "Moins"
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr "Plus"
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr "Maximum"
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr "Enregistrement du document..."
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Enregistrement de la page %d sur %d"
diff --git a/po/gd.po b/po/gd.po
index a267674..9ca87fb 100644
--- a/po/gd.po
+++ b/po/gd.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:39+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "A cùl"
 
 #. 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 "Sganadh simplidh"
 
@@ -87,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:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr "Atharraich òrdugh nan duilleagan"
 
@@ -205,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:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "Sàbhail"
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr "Bearr"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "Roghainnean"
 
@@ -295,7 +296,7 @@ msgstr "Càileachd:"
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Sganaich sgrìobhainnean"
 
@@ -464,7 +465,7 @@ msgstr ""
 "Simple Scan"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Dh'fhàillig an sganadh"
 
@@ -474,28 +475,29 @@ msgid "Scanned Document"
 msgstr "Sgrìobhainn sganaichte"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Goireas sganaidh"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Ruith \"%s --help\" airson liosta shlàn dhe na roghainnean command line a "
 "tha ri làimh fhaicinn."
 
-#: ../src/ui.vala:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr "Sgrìobhainn sganaichte.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr "_Dùin"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
@@ -503,35 +505,35 @@ msgstr ""
 "\"%s\""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr "Cha deach sganair sam bith a lorg"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr "Dèan cinnteach gu bheil sganair ceangailte ris agus gu bheil e air"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "Sàbhail mar..."
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr "_Sguir dheth"
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr "_Sàbhail"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr "Faidhlichean deilbh"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "Na h-uile faidhle"
 
@@ -541,78 +543,78 @@ msgid "Select File _Type"
 msgstr "Tagh _seòrsa an fhaidhle"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr "PDF {sgrìobhainn ioma-dhuilleagach}"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr "JPEG (dùmhlaichte)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr "PNG (gun chall càileachd)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../src/ui.vala:649
 msgid "Failed to save file"
 msgstr "Cha b' urrainn dhuinn a shàbhaladh ann am faidhle"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:670
+#: ../src/ui.vala:672
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 "Mur an sàbhail thu e, thèid atharrachadh sam bith a rinn thu air chall."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr "A bheil thu airson an sgrìobhainn làithreach a shàbhaladh?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr "Tilg air falbh na h-atharraichean"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr "Cha ghabh an ìomhaigh a shàbhaladh airson a ro-shealladh"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr "Chan urrainn dhuinn an aplacaid fhosgladh a ro-sheallas an ìomhaigh"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr "Cuir còmhla na duilleagan"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr "Cuir còmhla na duilleagan (ann an òrdugh contrarra)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr "Contrarra"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr "Cum gun atharrachadh"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr "Chan urrainn dhuinn faidhle na cobharach fhosgladh"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -641,16 +643,16 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "Mu dhèidhinn gleus simplidh nan sgana"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "Inneal simplidh airson sganadh sgrìobhainnean"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -658,106 +660,106 @@ msgstr ""
 "  alasdair caimbeul https://launchpad.net/~alexd-deactivatedaccount"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr "A bheil thu airson an sgrìobhainn a shàbhaladh mus dèan sinn fàgail?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr "Fàg gun a shàbhaladh"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (bun-roghainn)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (dreachd)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, 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:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr "Sgrìobhainn ùr"
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr "Sgrìobhainn"
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr "Post-d..."
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr "Clò-bhuail..."
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr "Cobhair"
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr "Mu dhèidhinn"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr "Fàg an-seo"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "Atharraich an _sganair"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "Gu fèin-obrachail"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr "Nas duirche"
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr "Nas soilleire"
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr "Nas lugha"
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr "Barrrachd"
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr "As lugha"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr "As motha"
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr "A' sàbhaladh na sgrìobhainn..."
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "A' sàbhaladh duilleag %d a-mach à %d"
diff --git a/po/gl.po b/po/gl.po
index ee0f2e2..3a758f7 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:39+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,8 +49,9 @@ msgstr "Atrás"
 
 #. 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 "Escaner sinxelo"
+msgstr "Escáner sinxelo"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:16
@@ -87,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:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr "Reordenar as páxinas"
 
@@ -193,7 +194,7 @@ msgstr "Novo"
 #. Tooltip for scan toolbar button
 #: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
-msgstr "Escanear unha única páxina desde o escaner"
+msgstr "Escanear unha única páxina co escáner"
 
 #. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:71
@@ -205,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:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "Gardar"
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr "Recortar"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "Preferencias"
 
@@ -295,7 +296,7 @@ msgstr "Calidade:"
 msgid "Document Scanner"
 msgstr "Escáner de documentos"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Escanear documentos"
 
@@ -310,11 +311,16 @@ msgid ""
 "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"
@@ -454,7 +460,7 @@ msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "Arranxar ficheiros PDF xerados con versións antigas de Simple Scan"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Produciuse un fallo ao escanear"
 
@@ -464,62 +470,63 @@ msgid "Scanned Document"
 msgstr "Documento escaneado"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DISPOSITIVO...] - Utilidade de escaneado"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Ejecute «%s --help» para ver unha lista completa das opcións de liña de "
 "ordes dispoñíbeis."
 
-#: ../src/ui.vala:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr "Document.pdf escaneado"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr "_Pechar"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Requírese o nome de usuario e o contrasinal para acceder a «%s»"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr "Non se detectou ningún escáner"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr "Verifique que o seu escáner está conectado e aceso"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "Gardar como..."
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr "_Gardar"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr "Ficheiros de imaxes"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "Todos os ficheiros"
 
@@ -529,77 +536,77 @@ msgid "Select File _Type"
 msgstr "Elixa o _tipo de ficheiro"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr "PDF (documento de múltiples páxinas)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimido)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr "PNG (sen perdas)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../src/ui.vala:649
 msgid "Failed to save file"
 msgstr "Produciuse un fallo ao gardar o ficheiro"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:670
+#: ../src/ui.vala:672
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Se non garda o ficheiro, os seus cambios perderanse permanentemente."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr "Gardar o documento actual?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr "Rexeitar os cambios"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr "Non foi posíbel gardar a imaxe da miniatura"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr "Non se pode abrir o aplicativo de vista previa da imaxe"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr "Combinar lados"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr "Combinar lados (inverso)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr "Inverter"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr "Manter sen cambios"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr "Non é posíbel abrir o ficheiro de axuda"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -628,16 +635,16 @@ msgstr ""
 "con este programa. Si no fuera así, vea <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "Acerca de Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "Ferramenta sinxela de escaneado de documentos"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -648,106 +655,106 @@ msgstr ""
 "  Robert Ancell https://launchpad.net/~robert-ancell"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr "Gardar o documento antes de saír?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr "Saír sen gardar"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (predeterminada)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (borrador)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, 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:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr "Novo documento"
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr "Documento"
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr "Correo electrónico..."
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr "Axuda"
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr "Sobre"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr "Saír"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "Cambiar o _escáner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr "Máis escuro"
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr "Máis claro"
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr "Menos"
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr "Máis"
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr "Mínimo"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr "Máximo"
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr "Gardando o documento..."
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Gardando páxina %d de %d"
diff --git a/po/he.po b/po/he.po
index c7911e1..a0bb8a2 100644
--- a/po/he.po
+++ b/po/he.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:39+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ 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 "סריקה פשוטה"
 
@@ -87,7 +88,7 @@ msgstr "צילום"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr "סידור הדפים מחדש"
 
@@ -205,7 +206,7 @@ msgstr "סריקה"
 msgid "Save document to a file"
 msgstr "שמירת המסמך לקובץ"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "שמירה"
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr "חיתוך"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "העדפות"
 
@@ -295,7 +296,7 @@ msgstr "איכות:"
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "סריקת מסמכים"
 
@@ -453,7 +454,7 @@ msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "תיקון קובצי PDF שנוצרו באמצעות גרסאות ישנות יותר של Simple Scan"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "הסריקה נכשלה"
 
@@ -463,61 +464,62 @@ msgid "Scanned Document"
 msgstr "מסמך שנסרק"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Scanning utility"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Run '%s --help' to see a full list of available command line options."
 
-#: ../src/ui.vala:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr "מסמך סרוק.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr "ס_גירה"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "נדרשים שם משתמש וססמה כדי לגשת אל '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr "לא נמצאו סורקים"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr "יש לבדוק כי הסורק מחובר ומופעל"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "שמירה בשם..."
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr "_ביטול"
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr "_שמירה"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr "קובצי תמונה"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "כל הקבצים"
 
@@ -527,77 +529,77 @@ msgid "Select File _Type"
 msgstr "בחירת _סוג הקובץ"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr "PDF (מסמך מרובה עמודים)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr "JPEG (דחוס)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr "PNG (ללא אבדן נתונים)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../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:670
+#: ../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:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr "האם לשמור את המסמך הנוכחי?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr "התעלמות מהשינויים"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr "לא ניתן לשמור את התמונה לתצוגה מקדימה"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr "לא ניתן לפתוח את היישום להצגה מקדימה של תמונות"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr "שילוב צדדים"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr "שילוב צדדים (הפוך)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr "היפוך"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr "להשאיר ללא שינוי"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr "לא ניתן לפתוח את קובץ העזרה"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -624,16 +626,16 @@ msgstr ""
 "ניתן לעיין ב־<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "על אודות Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "כלי פשוט לסריקת מסמכים"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -646,106 +648,106 @@ msgstr ""
 "  Yaron https://launchpad.net/~sh-yaron"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr "האם לשמור את המסמך בטרם היציאה?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr "לצאת ללא שמירה"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (בררת מחדל)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (טיוטה)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, 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:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr "מסמך חדש"
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr "מסמך"
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr "דוא״ל…"
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr "הדפסה…"
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr "עזרה"
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr "על אודות"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr "יציאה"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "ב_חירה בסורק אחר"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "אוטומטי"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr "כהה יותר"
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr "בהיר יותר"
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr "פחות"
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr "יותר"
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr "מזערי"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr "מרבי"
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr "המסמך נשמר...‏"
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "נשמר העמוד %d מתוך %d"
diff --git a/po/hr.po b/po/hr.po
index f259e00..74bbd9b 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:39+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Stražnja"
 
 #. 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 "Skeniranje dokumenata"
 
@@ -87,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:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr "Presloži stranice"
 
@@ -205,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:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "Spremi"
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr "Izreži"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "Osobitosti"
 
@@ -295,7 +296,7 @@ msgstr "Kvaliteta:"
 msgid "Document Scanner"
 msgstr "Skener dokumenta"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Skenirajte dokumente"
 
@@ -455,7 +456,7 @@ msgstr ""
 "Popravi PDF datoteke generirane starijom inačicom Skeniranja dokumenata"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Neuspjelo skeniranje"
 
@@ -465,62 +466,63 @@ msgid "Scanned Document"
 msgstr "Skenirani dokument"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[UREĐAJ...] - Alat za skeniranje"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Pokrenite '%s --help'  kako biste vidjeli potpuni popis dostupnih mogućnosti "
 "naredbenog retka."
 
-#: ../src/ui.vala:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr "Skenirani dokument.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr "_Zatvori"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Korisničko ime i lozinka su potrebni za pristup '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr "Nema otkrivenih skenera"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr "Provjerite je li vaš skener spojen i uključen"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "Spremi kao..."
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr "_Odustani"
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr "_Spremi"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr "Slikovne datoteke"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "Sve datoteke"
 
@@ -530,77 +532,77 @@ msgid "Select File _Type"
 msgstr "Odaberi _vrstu datoteke"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr "PDF (dokument od više stranica)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr "JPEG (sažeto)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr "PNG (bez gubitaka)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../src/ui.vala:649
 msgid "Failed to save file"
 msgstr "Neuspjelo spremanje datoteke"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:670
+#: ../src/ui.vala:672
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Ako ne spremite, promjene će biti trajno izgubljene."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr "Spremi trenutni dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr "Odbaci promjene"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr "Neuspjelo spremanje slike za pregled"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr "Nemoguće otvaranje aplikacije pregleda slike"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr "Kombiniraj strane"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr "Kombiniraj strane (obrnuto)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr "Obrnuto"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr "Zadrži nepromijenjeno"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr "Nemoguće otvaranje datoteke pomoći"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -629,16 +631,16 @@ msgstr ""
 "program. Ako niste pogledajte <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "O skeniranju dokumenata"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "Alat za jednostavno skeniranje"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -652,106 +654,106 @@ msgstr ""
 "  student4 https://launchpad.net/~iputnik-msn"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr "Spremi dokument prije zatvaranja?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr "Zatvori bez spremanja"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (zadano)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (skica)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, 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:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr "Novi dokument"
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr "Dokument"
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr "E-pošta..."
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr "Ispiši…"
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr "Pomoć"
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr "O programu"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr "Zatvori"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "Promijeni _skener"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "Automatska"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr "Tamnije"
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr "Svjetlije"
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr "Manje"
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr "Više"
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr "Najmanje"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr "Najviše"
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr "Spremanje dokumenta..."
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Spremanje stranice %d od %d"
diff --git a/po/hu.po b/po/hu.po
index e0d44c0..5d874b8 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:39+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Hátlap"
 
 #. 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 "Simple Scan"
 
@@ -87,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:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr "Oldalak újrarendezése"
 
@@ -205,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:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "Mentés"
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr "Vágás"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "Beállítások"
 
@@ -295,7 +296,7 @@ msgstr "Minőség:"
 msgid "Document Scanner"
 msgstr "Dokumentumbeolvasó"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Dokumentumok szkennelése"
 
@@ -452,7 +453,7 @@ msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "A Simple Scan régebbi verzióival készült PDF fájlok javítása"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "A szkennelés meghiúsult"
 
@@ -462,62 +463,63 @@ msgid "Scanned Document"
 msgstr "Beszkennelt dokumentum"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ESZKÖZ…] – Szkennelő segédprogram"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Futtassa a(z) „%s --help” parancsot a parancssori kapcsolók listájáért."
 
-#: ../src/ui.vala:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr "Szkennelt dokumentum.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr "_Bezárás"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "A(z) „%s” eléréséhez felhasználónév és jelszó szükséges"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr "Nem található szkenner"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 "Ellenőrizze, hogy a szkenner csatlakoztatva van, és be van-e kapcsolva"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "Mentés másként…"
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr "_Mégse"
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr "_Mentés"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr "Képfájlok"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "Minden fájl"
 
@@ -527,77 +529,77 @@ msgid "Select File _Type"
 msgstr "Válasszon fájl_típust"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr "PDF (többoldalas dokumentum)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr "JPEG (tömörített)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr "PNG (veszteségmentes)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../src/ui.vala:649
 msgid "Failed to save file"
 msgstr "A fájl mentése sikertelen"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:670
+#: ../src/ui.vala:672
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Ha nem ment, akkor a változtatások véglegesen elvesznek."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr "Mentse az aktuális dokumentumot?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr "Módosítások eldobása"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr "A képfájlt nem lehet elmenteni előnézethez"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr "Nem nyitható meg az előnézetet megjelenítő alkalmazás"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr "Oldalak egyesítése"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr "Oldalak egyesítése (fordított)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr "Fordított"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr "Maradjon változatlan"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr "A súgófájl nem nyitható meg"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -625,16 +627,16 @@ msgstr ""
 "meg, itt elolvashatja: <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "Simple Scan névjegye"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "Egyszerű dokumentumszkennelés"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -651,106 +653,106 @@ msgstr ""
 "  Úr Balázs https://launchpad.net/~urbalazs"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr "Menti a dokumentumot kilépés előtt?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr "Kilépés mentés nélkül"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (alapértelmezett)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (vázlat)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, 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:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr "Új dokumentum"
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr "Dokumentum"
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr "E-mail…"
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr "Nyomtatás…"
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr "Súgó"
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr "Névjegy"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr "Kilépés"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "_Szkennerváltás"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "Automatikus"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr "Sötétebb"
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr "Világosabb"
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr "Kevesebb"
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr "Több"
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr "Maximum"
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr "Dokumentum mentése..."
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "%d. oldal mentése, összesen %d"
diff --git a/po/hy.po b/po/hy.po
index d009e96..bc3e79e 100644
--- a/po/hy.po
+++ b/po/hy.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:39+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ 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 ""
 
@@ -87,7 +88,7 @@ msgstr ""
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +206,7 @@ msgstr ""
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr ""
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr ""
 
@@ -295,7 +296,7 @@ msgstr ""
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr ""
 
@@ -446,7 +447,7 @@ msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr ""
 
@@ -456,60 +457,61 @@ msgid "Scanned Document"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../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:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr ""
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr ""
 
@@ -519,77 +521,77 @@ msgid "Select File _Type"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../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:670
+#: ../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:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -606,122 +608,122 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Serj Safarian https://launchpad.net/~safarian"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index ccc8a7b..7261457 100644
--- a/po/id.po
+++ b/po/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:39+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Belakang"
 
 #. 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 "Pemindai Ringkas"
 
@@ -87,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:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr "Atur Ulang Halaman"
 
@@ -205,7 +206,7 @@ msgstr "Pindai"
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr ""
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "Preferensi"
 
@@ -295,7 +296,7 @@ msgstr "Kualitas:"
 msgid "Document Scanner"
 msgstr "Pelarik Dokumen"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Pindai Dokumen"
 
@@ -452,7 +453,7 @@ msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "Perbaiki berkas PDF yang dibuat dengan Simple Scan versi lawas"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Gagal memindai"
 
@@ -462,61 +463,62 @@ msgid "Scanned Document"
 msgstr "Dokumen Terpindai"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[PERANGKAT...] - Utilitas pemindaian"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "Jalankan '%s --help' untuk daftar lengkap opsi yang tersedia."
 
-#: ../src/ui.vala:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr "Dokumen Hasil Pindai.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr "_Tutup"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Nama pengguna dan kata sandi dibutuhkan untuk mengakses '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr "Tidak ada pemindai yang terdeteksi"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 "Mohon periksa apakah pemindai Anda terhubung dan dalam keadaan menyala"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "Simpan Sebagai..."
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr "_Batal"
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr "_Simpan"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr "Berkas Citra"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "Semua Berkas"
 
@@ -526,77 +528,77 @@ msgid "Select File _Type"
 msgstr "Pilih _Tipe Berkas"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr "PDF (dokumen multi-halaman)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr "JPEG (terkompresi)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr "PNG (lossless)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../src/ui.vala:649
 msgid "Failed to save file"
 msgstr "Gagal menyimpan berkas"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:670
+#: ../src/ui.vala:672
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Jika Anda tidak menyimpan, perubahan akan hilang secara permanen."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr "Simpan dokumen saat ini?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr "Buang Perubahan"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr "Tak dapat menyimpan gambar untuk pratinjau"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr "Tidak dapat membuka aplikasi pratinjau gambar"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr "Kombinasikan sisi-sisi"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr "Kombinasikan sisi-sisi (balik)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr "Balikkan"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr "Biarkan tak berubah"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr "Tak dapat membuka berkas bantuan"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -624,16 +626,16 @@ msgstr ""
 "bersama program ini. Bila tidak, lihat <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "Tentang Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "Alat pemindai dokumen sederhana"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -654,106 +656,106 @@ msgstr ""
 "  jemmy surya https://launchpad.net/~jemmy"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr "Simpan dokumen sebelum keluar"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr "Keluar tanpa menyimpan"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (default)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (draft)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, 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:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr "Dokumen Baru"
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr "Dokumen"
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr "Surel..."
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr "Cetak..."
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr "Bantuan"
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr "Perihal"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr "Keluar"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "Ganti _Pemindai"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "Otomatis"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr "Lebih Gelap"
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr "Lebih Terang"
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr "Kurang"
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr "Lebih"
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr "Maksimum"
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr "Menyimpan dokumen..."
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Menyimpan halaman %d dari %d"
diff --git a/po/it.po b/po/it.po
index 544e1a4..d4498ab 100644
--- a/po/it.po
+++ b/po/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:39+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Retro"
 
 #. 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 "Simple Scan"
 
@@ -87,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:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr "Riordina pagine"
 
@@ -205,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:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "Salva"
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr "Ritaglia"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "Preferenze"
 
@@ -295,7 +296,7 @@ msgstr "Qualità:"
 msgid "Document Scanner"
 msgstr "Scansiona documenti"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Acquisisci documenti"
 
@@ -310,11 +311,17 @@ msgid ""
 "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"
@@ -456,7 +463,7 @@ msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "Corregge file PDF generati con una vecchia versione di Simple Scan"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Acquisizione non riuscita"
 
@@ -466,62 +473,63 @@ msgid "Scanned Document"
 msgstr "Documento acquisito"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DISPOSITIVO...] - Strumento per l'acquisizione"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Eseguire \"%s --help\" per l'elenco completo delle opzioni disponibili a "
 "riga di comando."
 
-#: ../src/ui.vala:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr "Documento-acquisito.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr "_Chiudi"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Sono richiesti nome utente e password per accedere a «%s»"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr "Nessuno scanner rilevato"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr "Controllare che lo scanner sia collegato e acceso"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "Salva come..."
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr "A_nnulla"
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr "_Salva"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr "File immagine"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "Tutti i file"
 
@@ -531,78 +539,78 @@ msgid "Select File _Type"
 msgstr "Seziona il _tipo di file"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr "PDF (documento multi-pagina)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr "JPEG (compresso)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr "PNG (senza perdita di qualità)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../src/ui.vala:649
 msgid "Failed to save file"
 msgstr "Salvataggio file non riuscito"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:670
+#: ../src/ui.vala:672
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Se non si salva le modifiche andranno perse per sempre."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr "Salvare il documento corrente?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr "Scarta le modifiche"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr "Impossibile salvare l'immagine per l'anteprima"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr ""
 "Impossibile aprire l'applicazione per la visualizzazione delle anteprime"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr "Unisci lati"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr "Unisci lati (inverso)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr "Inverso"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr "Mantieni non modificato"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr "Impossibile aprire il file di aiuto"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -633,16 +641,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "Informazioni su Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "Semplice strumento per l'acquisizione di documenti"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -669,106 +677,106 @@ msgstr ""
 "  phede92 https://launchpad.net/~phede92"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr "Salvare il documento prima di uscire?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr "Esci senza salvare"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (predefinita)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (bozza)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, 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:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr "Nuovo documento"
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr "Documento"
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr "Email..."
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr "Stampa..."
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr "Aiuto"
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr "Informazioni"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr "Esci"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "Cambia _scanner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "Automatico"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr "Più scura"
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr "Più chiara"
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr "Minore"
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr "Maggiore"
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr "Minima"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr "Massima"
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr "Salvataggio del documento..."
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Salvataggio pagina %d di %d"
diff --git a/po/ja.po b/po/ja.po
index bb507b7..d3e7155 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:39+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ 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 "シンプルスキャン"
 
@@ -87,7 +88,7 @@ msgstr "写真"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr "ページを再整列"
 
@@ -205,7 +206,7 @@ msgstr "スキャン"
 msgid "Save document to a file"
 msgstr "ドキュメントをファイルに保存"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "保存"
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr "切り抜き"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "設定"
 
@@ -295,7 +296,7 @@ msgstr "品質:"
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "ドキュメントをスキャンします"
 
@@ -446,7 +447,7 @@ msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "古いバージョンの Simple Scan によって生成されたPDFファイルを修復する"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "スキャンに失敗しました"
 
@@ -456,60 +457,61 @@ msgid "Scanned Document"
 msgstr "スキャン済みドキュメント"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[デバイス...] - スキャンユーティリティ"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../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:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr "スキャンされたドキュメント.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr "閉じる(_C)"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "'%s' にアクセスするにはユーザ名とパスワードが必要です"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr "スキャナが検出されていません"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr "スキャナが接続されて電源が入っているか確認してください"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "名前を付けて保存..."
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr "キャンセル(_C)"
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr "保存(_S)"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr "画像ファイル"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "すべてのファイル"
 
@@ -519,77 +521,77 @@ msgid "Select File _Type"
 msgstr "ファイルタイプの選択(_T)"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr "PDF (複数ページ)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr "JPEG (圧縮済み)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr "PNG (ロスレス)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../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:670
+#: ../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:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr "現在のドキュメントを保存しますか?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr "変更を破棄"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr "プレビュー用の画像を保存できません"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr "画像プレビューアプリケーションを開けませんでした"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr "面を結合"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr "面を結合(逆順)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr "逆順"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr "無変更を維持"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr "ヘルプファイルを開くことができません"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -618,16 +620,16 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "Simple Scan について"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "ドキュメントのスキャンを行うシンプルなツールです"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -643,106 +645,106 @@ msgstr ""
 "  Tosiki Iga https://launchpad.net/~tosiki-iga"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr "終了する前にドキュメントを保存しますか?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr "保存せずに終了"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (標準)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (ドラフト)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, 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:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr "新しいドキュメント"
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr "ドキュメント"
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr "メール..."
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr "印刷..."
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr "ヘルプ"
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr "このプログラムについて"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr "終了"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "スキャナを変更(_S)"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "自動"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr "暗く"
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr "明るく"
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr "弱く"
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr "強く"
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr "最小"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr "最大"
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr "ドキュメントを保存しています..."
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "%2$dページ中%1$dページを保存しています"
diff --git a/po/kk.po b/po/kk.po
index 4b9f6eb..591418c 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:39+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ 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 ""
 
@@ -87,7 +88,7 @@ msgstr "Фото"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +206,7 @@ msgstr "Іздеу"
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "Сақтау"
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr "Қиып жіберу"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "Баптаулары"
 
@@ -295,7 +296,7 @@ msgstr ""
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr ""
 
@@ -446,7 +447,7 @@ msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr ""
 
@@ -456,60 +457,61 @@ msgid "Scanned Document"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../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:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "Қалайша сақтау..."
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "Бүкіл файлдар"
 
@@ -519,77 +521,77 @@ msgid "Select File _Type"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../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:670
+#: ../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:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr "Өзгерістерді ысырып тастау"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr "Көмек ақпараты файлын ашу мүмкін емес"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -606,16 +608,16 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -623,106 +625,106 @@ msgstr ""
 "  jmb_kz https://launchpad.net/~jmb-kz"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "Авто"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/km.po b/po/km.po
index 1e0fa6b..ea41bec 100644
--- a/po/km.po
+++ b/po/km.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:39+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ 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 "ស្កេនធម្មតា"
 
@@ -87,7 +88,7 @@ msgstr "រូបថត"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr "ការរៀបចំទំព័រ"
 
@@ -205,7 +206,7 @@ msgstr "ស្កេន"
 msgid "Save document to a file"
 msgstr "រក្សាទុកឯកសារទៅឯកសារ"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "រក្សាទុក"
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr "ច្រឹប"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "ចំណូលចិត្ត"
 
@@ -295,7 +296,7 @@ msgstr "គុណភាព ៖"
 msgid "Document Scanner"
 msgstr "ម៉ាស៊ីនស្កេនឯកសារ"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "ស្កេនឯកសារ"
 
@@ -456,7 +457,7 @@ msgstr ""
 "ជួសជុលឯកសារ PDF ដែលបានបង្កើតជាមួយកំណែចាស់របស់ម៉ាស៊ីនស្កេនធម្មតា"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "បានបរាជ័យក្នុងការស្កេន"
 
@@ -466,63 +467,64 @@ msgid "Scanned Document"
 msgstr "ឯកសារដែលបានស្កេន"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ឧបករណ៍...] - ការស្កេនឧបករណ៍ប្រើប្រាស់"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../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:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr "Document.pdf ដែលបានស្កេន"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr "បិទ"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "ទាមទារឈ្មោះអ្នកប្រើ និងពាក្យសម្ងាត់ដើម្បីចូលដំណើរការ '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr "រកមិនឃើញម៉ាស៊ីនស្កេន"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 "សូមពិនិត្យមើលម៉ាស៊ីនស្កេនរបស់អ្នកថាតើបានតភ្ជាប់ "
 "និងបើកកុងតាក់ហើយឬនៅ"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "រក្សាទុកជា..."
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr "បោះបង់"
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr "រក្សាទុក"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr "ឯកសាររូបភាព"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "ឯកសារទាំងអស់"
 
@@ -532,79 +534,79 @@ msgid "Select File _Type"
 msgstr "ជ្រើសប្រភេទឯកសារ"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr "PDF (ឯកសារច្រើនទំព័រ)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr "JPEG (បានបង្ហាប់)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr "PNG (គ្មានការបាត់បង់)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../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:670
+#: ../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:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr "រក្សាទុកឯកសារបច្ចុប្បន្ន ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr "បោះបង់ការផ្លាស់ប្ដូរ"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr "មិនអាចរក្សាទុករូបភាពសម្រាប់ការមើលជាមុនបានទេ"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr "មិនអាចបើកកម្មវិធីមើលរូបភាពជាមុនបានទេ"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr "ផ្សំភាគី"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr "ផ្សំភាគី (បញ្ច្រាស)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr "បញ្ច្រាស"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr "រក្សាឱ្យមិនមានការផ្លាស់ប្តូរ"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr "មិនអាចបើកឯកសារជំនួយបានទេ"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -634,16 +636,16 @@ msgstr ""
 "សូមមើល<http://www.gnu.org/licenses/> ។"
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "អំពីការស្កេនធម្មតា"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "ឧបករណ៍ស្កេនធម្មតា"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -653,106 +655,106 @@ msgstr ""
 "  Seng Sutha https://launchpad.net/~sutha"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr "រក្សាទុកឯកសារមុនពេលបិទឬ ?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr "បិទដោយមិនរក្សាទុក"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (លំនាំដើម)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (ពង្រាង)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, 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:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr "ឯកសារថ្មី"
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr "ឯកសារ"
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr "អ៊ីមេល..."
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr "បោះពុម្ព..."
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr "ជំនួយ"
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr "អំពី"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr "ចេញ"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "ប្ដូរម៉ាស៊ីនស្កេន"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "ស្វ័យប្រវត្តិ"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr "ងងឹត"
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr "ស្រាល"
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr "តិចជាង"
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr "ផ្សេងទៀត"
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr "អប្បបរមា"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr "អតិបរមា"
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr "កំពុងរក្សាទុកឯកសារ..."
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "រក្សាទុកទំព័រ %d ផុតសម័យ %d"
diff --git a/po/ky.po b/po/ky.po
index 445bd7c..9fabd75 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:39+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ 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 ""
 
@@ -87,7 +88,7 @@ msgstr ""
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +206,7 @@ msgstr ""
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr ""
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr ""
 
@@ -295,7 +296,7 @@ msgstr ""
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr ""
 
@@ -446,7 +447,7 @@ msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr ""
 
@@ -456,60 +457,61 @@ msgid "Scanned Document"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../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:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr ""
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr ""
 
@@ -519,77 +521,77 @@ msgid "Select File _Type"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../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:670
+#: ../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:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -606,122 +608,122 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Saltanat Osmonova https://launchpad.net/~salta007"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/lt.po b/po/lt.po
index c7df6e2..107017e 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:39+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ 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 ""
 
@@ -87,7 +88,7 @@ msgstr ""
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +206,7 @@ msgstr ""
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr ""
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr ""
 
@@ -295,7 +296,7 @@ msgstr "Kokybė:"
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr ""
 
@@ -450,7 +451,7 @@ msgstr ""
 "versijomis"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr ""
 
@@ -460,61 +461,62 @@ msgid "Scanned Document"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ĮTAISAS...] - skaitymo paslaugų programa"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Norėdami pamatyti komandų eilutės parametrų sąrašą, paleiskite „%s --help“."
 
-#: ../src/ui.vala:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr "_Užverti"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../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:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr ""
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr "_Atsisakyti"
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr "Į_rašyti"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr ""
 
@@ -524,77 +526,77 @@ msgid "Select File _Type"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../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:670
+#: ../src/ui.vala:672
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Jeigu neišsaugosite, pakeitimai bus nesugrąžinamai prarasti."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr "Išsaugoti šį dokumentą?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr "Atmesti pakeitimus"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr "Nepavyko išsaugoti paveikslo peržiūrai"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -611,16 +613,16 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -633,106 +635,106 @@ msgstr ""
 "  romasg https://launchpad.net/~romasg"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr "Išsaugoti dokumentą prieš išeinant iš programos?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr "Išeiti neišsaugant"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "Automatinis"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr "Tamsesnis"
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr "Šviesesnis"
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr "Mažiau"
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr "Daugiau"
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr "Mažiausia"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr "Didžiausia"
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr "Saugomas dokumentas..."
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, 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 7cfee3b..8a329c2 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:39+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Aizmugure"
 
 #. 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 "Vienkārša skenēšana"
 
@@ -87,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:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,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:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "Saglabāt"
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr "Apcirst"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "Iestatījumi"
 
@@ -295,7 +296,7 @@ msgstr "Kvalitāte:"
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Skenēt dokumentus"
 
@@ -453,7 +454,7 @@ msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "Salabot PDF datnes, kas ir veidotas ar vecākām Simple Scan versijām"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Neizdevās skenēt"
 
@@ -463,62 +464,63 @@ msgid "Scanned Document"
 msgstr "Skenēts dokuments"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[IERĪCE...] - skenēšanas utilītprogramma"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Palaidiet “%s --help”, lai redzētu pilnu pieejamo komandrindas opciju "
 "sarakstu."
 
-#: ../src/ui.vala:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr "Ieskenēts Dokuments.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr "_Aizvērt"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Lai piekļūtu “%s”, ir vajadzīgs lietotājvārds un parole"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr "Nav atrasts neviens skeneris"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr "Lūdzu, pārbaudiet, vai skeneris ir pievienots un ieslēgts"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "Saglabāt kā..."
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr "At_celt"
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr "_Saglabāt"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr "Attēlu datnes"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "Visas datnes"
 
@@ -528,77 +530,77 @@ msgid "Select File _Type"
 msgstr "Norādīt datnes _tipu"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr "PDF (vairāku lapu dokuments)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr "JPEG (saspiests)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr "PNG (bez zudumiem)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../src/ui.vala:649
 msgid "Failed to save file"
 msgstr "Neizdevās saglabāt datni"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:670
+#: ../src/ui.vala:672
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Ja nesaglabāsiet, izmaiņas neatgriezeniski pazudīs."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr "Saglabāt šo dokumentu?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr "Izmest izmaiņas"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr "Nevar saglabāt attēlu priekšskatīšanai"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr "Neizdevās atvērt attēlu priekšskatīšanas lietotni"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr "Pagriezt"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr "Paturēt nemainīti"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr "Nevar atvērt palīdzības datni"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -624,16 +626,16 @@ msgstr ""
 "nesaņēmāt, skatiet <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "Par Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "Vienkāršs dokumentu skenēšanas rīks"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -643,106 +645,106 @@ msgstr ""
 "  Rūdolfs Mazurs https://launchpad.net/~rudolfs-mazurs"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr "Pirms iziešanas saglabāt dokumentu?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr "Iziet nesaglabājot"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (noklusējuma)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (melraksts)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, 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:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr "Jauns dokuments"
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr "Dokuments"
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr "Epasts..."
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr "Drukāt..."
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr "Palīdzība"
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr "Par"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr "Iziet"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "Mainīt _skeneri"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "Automātiski"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr "Tumšāks"
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr "Gaišāks"
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr "Mazāk"
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr "Vairāk"
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr "Minimums"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr "Maksimums"
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr "Saglabā dokumentu..."
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Saglabā lapu %d no %d"
diff --git a/po/mhr.po b/po/mhr.po
index 8be75bb..9a33ddc 100644
--- a/po/mhr.po
+++ b/po/mhr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:40+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ 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 "Simple Scan"
 
@@ -87,7 +88,7 @@ msgstr "Фотосӱрет"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +206,7 @@ msgstr ""
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "Аныклаш"
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr "Лектыш"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "Келыштарымаш-влак"
 
@@ -295,7 +296,7 @@ msgstr "Ыштыш-кучыш:"
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr ""
 
@@ -446,7 +447,7 @@ msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr ""
 
@@ -456,60 +457,61 @@ msgid "Scanned Document"
 msgstr "Сканироватлыме документ"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../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:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr ""
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr ""
 
@@ -519,77 +521,77 @@ msgid "Select File _Type"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../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:670
+#: ../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:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -606,16 +608,16 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -623,106 +625,106 @@ msgstr ""
 "  Снежана https://launchpad.net/~snezhana-yandemerova-94"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr "Пычкемышрак"
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/ms.po b/po/ms.po
index 808fd06..9fcdc80 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:39+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Ke belakang"
 
 #. 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 "Pengimbas Ringkas"
 
@@ -87,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:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr "Tertib Semula Halaman"
 
@@ -205,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:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "Simpan"
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr "Kerat"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "Keutamaan"
 
@@ -295,7 +296,7 @@ msgstr "Kualiti:"
 msgid "Document Scanner"
 msgstr "Pengimbas dokumen"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Imbas Dokumen"
 
@@ -454,7 +455,7 @@ msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "Baiki fail PDF yang dijana dengan versi lama Simple Scan"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Gagal mengimbas"
 
@@ -464,62 +465,63 @@ msgid "Scanned Document"
 msgstr "Dokumen Terimbas"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Utiliti mengimbas"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Jalankan '%s --help' untuk melihat senarai penuh pilihan baris perintah yang "
 "ada."
 
-#: ../src/ui.vala:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr "Dokumen Diimbas.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr "_Tutup"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Nama pengguna dan kata laluan diperlukan untuk mencapai '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr "Tiada pengimbas dikesan"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr "Sila semak pengimbas anda sama ada ia bersambung dan dihidupkan"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "Simpan Sebagai..."
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr "_Batal"
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr "_Simpan"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr "Fail Imej"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "Semua Fail"
 
@@ -529,77 +531,77 @@ msgid "Select File _Type"
 msgstr "Pilih Jenis _Fail"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr "PDF (dokumen berbilang-halaman)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr "JPEG (termampat)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr "PNG (tidak hilang)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../src/ui.vala:649
 msgid "Failed to save file"
 msgstr "Gagal menyimpan fail"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:670
+#: ../src/ui.vala:672
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Jika anda tidak simpan, semua perubahan akan hilang."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr "Simpan dokumen semasa"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr "Abai Perubahan"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr "Tidak boleh menyimpan imej untuk pratonton"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr "Tidak boleh membuka aplikasi partonton imej"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr "Gabung sisi"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr "Gabung sisi (songsang)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr "Songsang"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr "Kekal tidak berubah"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr "Tidak boleh membuka fail bantuan"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -628,16 +630,16 @@ msgstr ""
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "Mengenai Pengimbas Ringkas"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "Alat mengimbas dokumen mudah"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -649,106 +651,106 @@ msgstr ""
 "  dequan https://launchpad.net/~dequan"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr "Simpan dokumen sebelum keluar?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr "Keluar tanpa Menyimpan"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (tersedia)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (draf)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, 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:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr "Dokumen Baharu"
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr "Dokumen"
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr "Emel..."
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr "Cetak..."
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr "Bantuan"
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr "Perihal"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr "Keluar"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "Ubah _Pengimbas"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "Automatik"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr "Lebih Gelap"
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr "Lebih Cerah"
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr "Kurang"
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr "Lagi"
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr "Maksimum"
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr "Menyimpan dokumen..."
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Menyimpan halaman %d daripada %d"
diff --git a/po/my.po b/po/my.po
index 3b90430..49f669b 100644
--- a/po/my.po
+++ b/po/my.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:39+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ 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 "ရိုးရိုး Scan ဖတ်ခြင်း"
 
@@ -87,7 +88,7 @@ msgstr "ဓာတ်ပုံ"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +206,7 @@ msgstr "Scan"
 msgid "Save document to a file"
 msgstr "ဖိုင် တစ်ခုထဲသို့ စာရွက်စာတမ်း ကိုသိမ်းပါ။"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "သိမ်းဆည်းပါ"
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr "ဖြတ်ပါ။"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "Preferences"
 
@@ -295,7 +296,7 @@ msgstr ""
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Scan Documents"
 
@@ -453,7 +454,7 @@ msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "Fix PDF files generated with older versions of Simple Scan"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Scan မဖတ်ဖြစ်ပါ။"
 
@@ -463,62 +464,63 @@ msgid "Scanned Document"
 msgstr "Scan ဖတ်ပြီးသော စာရွက်စာတမ်း"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Scanning utility"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../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:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr "Scanned Document.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "'%s' ကိုသုံးရန်အတွက်သုံးစွဲသူအမည်နှင့် စကားဝှက်လိုအပ်ပါသည်။"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr "Scanner ရှာမတွေ့ပါ။"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 "သင်၏ Scanner ကိုချိတ်ဆက်ပြီးကြောင်း၊ "
 "ပါဝါဖွင့်ထားကြောင်းသေချာအောင်ပြန်လည်စစ်ဆေးပါ။"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "Save As..."
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr "Image Files"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "ဖိုင်အလုံးစုံ"
 
@@ -528,77 +530,77 @@ msgid "Select File _Type"
 msgstr "_T ဖိုင်အမျိုးအစားရွေးပါ။"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr "PDF (multi-page document)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr "JPEG (compressed)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr "PNG (lossless)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../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:670
+#: ../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:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr "ယခုစာရွက်စာတမ်းကိုသိမ်းမလား။"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr "Discard Changes"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr "ကြည့်ရူရန်အတွက် ပုံများကိုမသိမ်းနိုင်ပါ။"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr "Unable to open image preview application"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr "အကူအညီဖိုင်ကို မဖွင့်နိုင်ပါ။"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -627,16 +629,16 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "ရိုးရှင်းစွာ Scan ဖတ်ခြင်းအကြောင်း"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "Simple document scanning tool"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -644,106 +646,106 @@ msgstr ""
 "  Pyae Sone https://launchpad.net/~gipsyhnh"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr "မပိတ်ခင် စာရွက်စာတမ်းများကိုသိမ်းမလား။"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr "မသိမ်းပဲနှင့်ထွက်မည်။"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (default)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (draft)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, 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:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "Change _Scanner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "အလိုအလျှောက်"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/nb.po b/po/nb.po
index 61f34ac..9709088 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:39+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Bakside"
 
 #. 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 "Simple Scan"
 
@@ -87,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:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr "Omplasser sider"
 
@@ -205,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:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "Lagre"
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr "Beskjær"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "Innstillinger"
 
@@ -295,7 +296,7 @@ msgstr "Kvalitet:"
 msgid "Document Scanner"
 msgstr "Dokumentskanner"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Skann dokumenter"
 
@@ -453,7 +454,7 @@ msgstr ""
 "Reparer PDF-filer som er opprettet med eldre versjoner av Simple Scan"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Klarte ikke å utføre skanningen"
 
@@ -463,61 +464,62 @@ msgid "Scanned Document"
 msgstr "Skannet dokument"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ENHET...] - Scanneutstyr"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Kjør «%s --help» for å se en full liste over tilgjengelige kommandolinjevalg."
 
-#: ../src/ui.vala:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr "Skannet_dokument.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr "_Lukk"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Behøver brukernavn og passord for å få tilgang til '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr "Fant ingen skannere"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr "Undersøk om skanneren er riktig tilkoblet, og at den er slått på"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "Lagre som..."
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr "_Lagre"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr "Bildefiler"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "Alle Filer"
 
@@ -527,77 +529,77 @@ msgid "Select File _Type"
 msgstr "Velg fil_type"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr "PDF (flersidig dokument)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr "JPEG (komprimert)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr "PNG (tapsfri)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../src/ui.vala:649
 msgid "Failed to save file"
 msgstr "Lagring av fil mislyktes"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:670
+#: ../src/ui.vala:672
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Hvis du ikke lagrer vil endringene gå tapt."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr "Lagre gjeldende dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr "Forkast endringer"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr "Kunne ikke lagre forhåndsvisning"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr "Åpning av forhåndsvisning mislyktes"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr "Kombiner sider"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr "Kombiner sider (omvendt)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr "Omvendt"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr "Behold uendret"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr "Kan ikke åpne hjelpfil"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -626,16 +628,16 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "Om Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "Enkelt verktøy for å skanne dokumenter"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -647,106 +649,106 @@ msgstr ""
 "  Åka Sikrom https://launchpad.net/~akrosikam"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr "Lagre dokumentet før du avslutter?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr "Avslutt uten å lagre"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (standard)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (kladd)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, 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:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr "Nytt dokument"
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr "Dokument"
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr "E-post …"
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr "Skriv ut …"
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr "Hjelp"
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr "Om"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr "Avslutt"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "Bytt _skanner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr "Mørkere"
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr "Lysere"
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr "Mindre"
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr "Mer"
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr "Maksimum"
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr "Lagrer dokument …"
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Lagrer side nr. %d av %d"
diff --git a/po/nl.po b/po/nl.po
index 102e145..6c52cc4 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:39+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Achterzijde"
 
 #. 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 "Scannen"
 
@@ -87,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:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr "Bladzijden herschikken"
 
@@ -205,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:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "Opslaan"
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr "Bijsnijden"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "Voorkeuren"
 
@@ -295,7 +296,7 @@ msgstr "Kwaliteit:"
 msgid "Document Scanner"
 msgstr "Documentenscanner"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Documenten scannen"
 
@@ -310,11 +311,17 @@ msgid ""
 "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"
@@ -462,7 +469,7 @@ msgstr ""
 "Scan"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Scannen is mislukt"
 
@@ -472,62 +479,63 @@ msgid "Scanned Document"
 msgstr "Gescand document"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[APPARAAT...] - Hulpmiddel voor scannen"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Voer ‘%s --help’ uit om een volledige lijst van alle opdrachtregelopties te "
 "zien."
 
-#: ../src/ui.vala:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr "Gescand document.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr "_Sluiten"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Gebruikersnaam en wachtwoord vereist om toegang te krijgen tot  '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr "Geen scanners gevonden"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr "Controleer of uw scanner is aangesloten en is ingeschakeld"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "Opslaan als..."
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr "_Annuleren"
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr "_Opslaan"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr "Afbeeldingsbestanden"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "Alle bestanden"
 
@@ -537,77 +545,77 @@ msgid "Select File _Type"
 msgstr "Bestands_type selecteren"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr "PDF (document met meerdere pagina's)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr "JPEG (gecomprimeerd)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr "PNG (lossless)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../src/ui.vala:649
 msgid "Failed to save file"
 msgstr "Bestand opslaan mislukt"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:670
+#: ../src/ui.vala:672
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Als u niet opslaat, zullen wijzigingen permanent verloren gaan."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr "Huidige document opslaan?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr "Wijzigingen negeren"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr "Opslaan van afbeelding voor voorvertoning mislukt"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr "Kan toepassing voor voorvertoning van afbeelding niet openen"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr "Zijden samenvoegen"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr "Zijden samenvoegen (omgekeerd)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr "Omgekeerd"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr "Onveranderd laten"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr "Kon hulpbestand niet openen"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -638,16 +646,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "Info over Scanhulpmiddel"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "Eenvoudig hulpmiddel voor het scannen van documenten"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -671,106 +679,106 @@ msgstr ""
 "  rob https://launchpad.net/~rvdb"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr "Document opslaan voor afsluiten?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr "Afsluiten zonder opslaan"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (standaard)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (klad)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, 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:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr "Nieuw document"
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr "Document"
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr "E-mail..."
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr "Afdrukken..."
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr "Hulp"
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr "Over"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr "Afsluiten"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "_Scanner wijzigen"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr "Donkerder"
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr "Lichter"
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr "Minder"
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr "Meer"
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr "Maximum"
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr "Bezig met opslaan van document..."
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Bezig met opslaan van pagina %d van %d"
diff --git a/po/oc.po b/po/oc.po
index 071521b..4b2ebb0 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:39+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Precedenta"
 
 #. 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 "Aisina de numerizacion simpla"
 
@@ -87,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:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,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:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "Enregistrar"
 
@@ -248,7 +249,7 @@ msgid "Crop"
 msgstr "Requadrar"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "Preferéncias"
 
@@ -296,7 +297,7 @@ msgstr "Qualitat :"
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Numerizar de documents"
 
@@ -460,7 +461,7 @@ msgstr ""
 "Corregir los fichièrs PDF generats amb las ancianas versions de Simple Scan"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Fracàs de la numerizacion"
 
@@ -470,62 +471,63 @@ msgid "Scanned Document"
 msgstr "Document numerizat"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Aisina de numerizacion"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Aviatz « %s --help » per veire la lista completa de opcions disponiblas en "
 "linha de comanda"
 
-#: ../src/ui.vala:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr "Document.pdf numerizat"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr "_Tampar"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Nom d'utilizaire e senhal necessaris per accedir a « %s »"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr "Cap de scanner es pas estat detectat"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr "Verificatz que vòstre scanner es connectat e jos tension"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "Enregistrar jos..."
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr "A_nullar"
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr "_Salvar"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr "Fichièrs imatges"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "Totes los fichièrs"
 
@@ -535,77 +537,77 @@ msgid "Select File _Type"
 msgstr "Seleccionatz lo _tipe de fichièr"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr "PDF (document multipaginas)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr "JPEG (compressat)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr "PNG (sens pèrda)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../src/ui.vala:649
 msgid "Failed to save file"
 msgstr "Impossible d'enregistrar lo fichièr"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:670
+#: ../src/ui.vala:672
 msgid "If you don't save, changes will be permanently lost."
 msgstr "S'enregistratz pas, las modificacions seràn perdudas definitivament."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr "Enregistrar lo document actual ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr "Abandonar las modificacions"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr "Impossible d'enregistrar l'imatge per lo previsualizar"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr "Impossible de dobrir l'aplicacion de previsualizacion d'imatge"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr "Impossible de dobrir lo fichièr d'ajuda"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -635,16 +637,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "A prepaus de Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "Numerizar simplament vòstres documents"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -652,106 +654,106 @@ msgstr ""
 "  Quentin Pagès https://launchpad.net/~kwentin"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr "Enregistrar lo document abans de quitar ?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr "Quitar sens enregistrar"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (per defaut)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (borrolhon)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, 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:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "Cambiar de _scanner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "Automatic"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr "Mai escur"
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr "Mai clar"
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr "Mens"
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr "Mai"
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr "Maximum"
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr "Enregistrament del document..."
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Enregistrament de la pagina %d sus %d"
diff --git a/po/pa.po b/po/pa.po
index d338a30..fafca46 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:39+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ 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 "ਸੌਖਾ ਸਕੈਨ"
 
@@ -87,7 +88,7 @@ msgstr "ਫੋਟੋ"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +206,7 @@ msgstr "ਸਕੈਨ"
 msgid "Save document to a file"
 msgstr "ਡੌਕੂਮੈਂਟ ਫਾਇਲ ਵਿੱਚ ਸੰਭਾਲੋ"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "ਸੰਭਾਲੋ"
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr "ਕਰੋਪ ਕਰੋ"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "ਮੇਰੀ ਪਸੰਦ"
 
@@ -295,7 +296,7 @@ msgstr ""
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "ਸਕੈਨ ਕੀਤੇ ਡੌਕੂਮੈਂਟ"
 
@@ -448,7 +449,7 @@ msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "ਸਕੈਨ ਕਰਨ ਲਈ ਫੇਲ੍ਹ"
 
@@ -458,60 +459,61 @@ msgid "Scanned Document"
 msgstr "ਸਕੈਨ ਕੀਤੇ ਡੌਕੂਮੈਂਟ"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr "ਸਕੈਨ ਕੀਤਾ ਡੌਕੂਮੈਂਟ.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "'%s' ਵਰਤਣ ਲਈ ਯੂਜ਼ਰ-ਨਾਂ ਅਤੇ ਪਾਸਵਰਡ ਚਾਹੀਦਾ ਹੈ"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr "ਕੋਈ ਸਕੈਨਰ ਨਹੀਂ ਮਿਲਿਆ"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr "ਆਪਣੇ ਜੁੜ ਹੋਏ ਸਕੈਨਰ ਨੂੰ ਚੈੱਕ ਕਰੋ ਅਤੇ ਚਾਲੂ ਕਰੋ"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "ਇੰਝ ਸੰਭਾਲੋ..."
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr "ਚਿੱਤਰ ਫਾਇਲਾਂ"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "ਸਭ ਫਾਇਲਾਂ"
 
@@ -521,77 +523,77 @@ msgid "Select File _Type"
 msgstr "ਫਾਇਲ ਕਿਸਮ ਚੁਣੋ(_T)"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr "PDF (ਬਹੁ-ਸਫ਼ਾ ਡੌਕੂਮੈਂਟ)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr "JPEG (compressed)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr "PNG (lossless)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../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:670
+#: ../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:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr "ਮੌਜੂਦਾ ਡੌਕੂਮੈਂਟ ਸੰਭਾਲਣਾ ਹੈ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr "ਬਦਲਾਅ ਅਣਡਿੱਠੇ"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr "ਚਿੱਤਰ ਝਲਕ ਐਪਲੀਕੇਸ਼ਨ ਖੋਲ੍ਹਣ ਲਈ ਅਸਮਰੱਥ"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr "ਮੱਦਦ ਫਾਇਲ ਖੋਲ੍ਹਣ ਲਈ ਅਸਮਰੱਥ"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -608,122 +610,122 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "ਸੈਂਪਲ ਸਕੈਨ ਬਾਰੇ"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "ਸੈਂਪਲ ਡੌਕੂਮੈਂਟ ਸਕੈਨਿੰਗ ਟੂਲ"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  A S Alam https://launchpad.net/~aalam-users"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr "ਕੀ ਬੰਦ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਡੌਕੂਮੈਂਟ ਸੰਭਾਲਣਾ ਹੈ?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr "ਬਿਨਾਂ ਸੰਭਾਲੇ ਬੰਦ ਕਰਨਾ ਹੈ"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (ਡਿਫਾਲਟ)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (draft)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, 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:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "ਸਕੈਨਰ ਬਦਲੋ(_S)"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "ਆਟੋਮੈਟਿਕ"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 5203b7d..2572360 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2015-04-15 12:17+1200\n"
-"PO-Revision-Date: 2015-04-16 21:56+0000\n"
+"PO-Revision-Date: 2015-08-27 17:25+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-08-11 05:39+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Tył"
 
 #. 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 "Proste skanowanie"
 
@@ -87,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:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr "Zmień kolejność stron"
 
@@ -205,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:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "Zapisz"
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr "Przytnij"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "Preferencje"
 
@@ -295,7 +296,7 @@ msgstr "Jakość:"
 msgid "Document Scanner"
 msgstr "Skaner dokumentów"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Skanowanie dokumentów"
 
@@ -461,7 +462,7 @@ msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "Naprawia pliki PDF utworzone przy użyciu starszych wersji programu"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Skanowanie się nie powiodło"
 
@@ -471,62 +472,63 @@ msgid "Scanned Document"
 msgstr "Zeskanowany dokument"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
-msgstr "[URZĄDZENIE] - Narzędzie do skanowania"
+msgstr "[URZĄDZENIE] — narzędzie do skanowania"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
-"Wykonanie polecenia \"%s --help\" wyświetli pełną listę dostępnych opcji "
-"wiersza poleceń."
+"Polecenie \"%s --help\" wyświetli pełną listę dostępnych opcji wiersza "
+"poleceń."
 
-#: ../src/ui.vala:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr "Zeskanowany dokument.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr "Za_mknij"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
-msgstr "Uzyskanie dostępu do \"%s\" wymaga podania nazwy użytkownika i hasła"
+msgstr "Uzyskanie dostępu do „%s” wymaga podania nazwy użytkownika i hasła"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr "Nie wykryto żadnego skanera"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr "Proszę sprawdzić, czy skaner jest podłączony i włączony"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
-msgstr "Zapisz jako..."
+msgstr "Zapisz jako…"
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr "_Anuluj"
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr "_Zapisz"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr "Pliki obrazów"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "Wszystkie pliki"
 
@@ -536,77 +538,77 @@ msgid "Select File _Type"
 msgstr "Proszę wybrać _typ pliku"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr "PDF (dokument wielostronicowy)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr "JPEG (skompresowany)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr "PNG (bezstratny)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../src/ui.vala:649
 msgid "Failed to save file"
 msgstr "Zapisanie pliku się nie powiodło"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:670
+#: ../src/ui.vala:672
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Zmiany zostaną bezpowrotnie utracone, jeśli nie zostaną zapisane."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr "Zapisać bieżący dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr "Odrzuć zmiany"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr "Nie można zapisać podglądu obrazu"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr "Nie można otworzyć programu podglądu obrazów"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr "Połącz strony"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr "Połącz strony (odwrotnie)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr "Odwrotnie"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr "Bez zmiany"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr "Nie można otworzyć pliku pomocy"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -623,11 +625,11 @@ msgid ""
 msgstr ""
 "Niniejszy program jest wolnym oprogramowaniem; można go rozprowadzać dalej\n"
 "i/lub modyfikować na warunkach Powszechnej Licencji Publicznej GNU, wydanej\n"
-"przez Fundację Wolnego Oprogramowania (Free Software Foundation) - według\n"
+"przez Fundację Wolnego Oprogramowania (Free Software Foundation) — według\n"
 "wersji trzeciej tej Licencji lub którejś z późniejszych wersji.\n"
 "\n"
-"Niniejszy program rozpowszechniany jest z nadzieją, iż będzie on użyteczny -"
-"\n"
+"Niniejszy program rozpowszechniany jest z nadzieją, iż będzie on użyteczny "
+"—\n"
 "jednak BEZ JAKIEJKOLWIEK GWARANCJI, nawet domyślnej gwarancji\n"
 "PRZYDATNOŚCI HANDLOWEJ albo PRZYDATNOŚCI DO OKREŚLONYCH\n"
 "ZASTOSOWAŃ. W celu uzyskania bliższych informacji należy zapoznać się z\n"
@@ -635,19 +637,19 @@ msgstr ""
 "\n"
 "Z pewnością wraz z niniejszym programem dostarczono także egzemplarz\n"
 "Powszechnej Licencji Publicznej GNU (GNU General Public License); jeśli nie\n"
-"- proszę odwiedzić stronę internetową <http://www.gnu.org/licenses/>."
+"— proszę odwiedzić stronę internetową <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "O programie"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "Proste narzędzie do skanowania dokumentów"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -669,106 +671,106 @@ msgstr ""
 "  Wiatrak https://launchpad.net/~wiatrak."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr "Zapisać dokument przed zakończeniem programu?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr "Zakończ bez zapisywania"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d DPI (domyślnie)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d DPI (szkic)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, 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:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr "%d DPI"
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr "Nowy dokument"
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr "Dokument"
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
-msgstr "E-mail..."
+msgstr "E-mail…"
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
-msgstr "Wydrukuj..."
+msgstr "Wydrukuj…"
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr "Pomoc"
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr "O programie"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr "Zakończ"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "Zmień _skaner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "Automatyczny"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr "Ciemniej"
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr "Jaśniej"
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr "Mniejszy"
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr "Większy"
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr "Minimalnie"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr "Maksymalnie"
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
-msgstr "Zapisywanie dokumentu..."
+msgstr "Zapisywanie dokumentu…"
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Zapisywanie strony %d z %d"
diff --git a/po/pt.po b/po/pt.po
index 864bfc2..a2ca636 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:39+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -30,12 +30,12 @@ msgstr "Nome do _utilizador para o recurso:"
 #. Label beside password entry
 #: ../data/simple-scan.ui.h:6
 msgid "_Password:"
-msgstr "_Palavra-Passe:"
+msgstr "_Palavra-passe:"
 
 #. Combo box label for scanning both sides of a page
 #: ../data/simple-scan.ui.h:8
 msgid "Front and Back"
-msgstr "Frente e Verso"
+msgstr "Frente e verso"
 
 #. Combo box label for scanning the front side of a page
 #: ../data/simple-scan.ui.h:10
@@ -49,8 +49,9 @@ msgstr "Verso"
 
 #. 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 "Digitalização Simples"
+msgstr "Digitalização"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:16
@@ -65,17 +66,17 @@ msgstr "Digit_alizar"
 #. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:20
 msgid "Single _Page"
-msgstr "_Página Única"
+msgstr "_Página única"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
 #: ../data/simple-scan.ui.h:22
 msgid "All Pages From _Feeder"
-msgstr "Todas as páginas a partir do _Alimentador"
+msgstr "Todas as páginas a partir do _alimentador"
 
 #. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:24
 msgid "_Stop Scan"
-msgstr "_Parar Digitalização"
+msgstr "_Parar digitalização"
 
 #: ../data/simple-scan.ui.h:25
 msgid "Text"
@@ -87,9 +88,9 @@ msgstr "Foto"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
-msgstr "Reordenar Páginas"
+msgstr "Reordenar páginas"
 
 #. Label on email menu item
 #: ../data/simple-scan.ui.h:30
@@ -104,12 +105,12 @@ msgstr "_Página"
 #. Menu item to rotate page to left (anti-clockwise)
 #: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
-msgstr "Rodar para a _Esquerda"
+msgstr "Rodar à _esquerda"
 
 #. Menu item to rotate page to right (clockwise)
 #: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
-msgstr "Rodar para a _Direita"
+msgstr "Rodar à _direita"
 
 #. Label for page crop submenu
 #: ../data/simple-scan.ui.h:38
@@ -159,17 +160,17 @@ msgstr "_Personalizar"
 #. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
-msgstr "_Rodar Recorte"
+msgstr "_Rodar recorte"
 
 #. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:58
 msgid "Move Left"
-msgstr "Mover para a Esquerda"
+msgstr "Mover para a esquerda"
 
 #. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:60
 msgid "Move Right"
-msgstr "Mover para a Direita"
+msgstr "Mover para a direita"
 
 #. Label on help menu
 #: ../data/simple-scan.ui.h:62
@@ -205,14 +206,14 @@ msgstr "Digitalizar"
 msgid "Save document to a file"
 msgstr "Guardar documento num ficheiro"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "Guardar"
 
 #. Tooltip for stop button
 #: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
-msgstr "Parar a digitalização actual"
+msgstr "Parar digitalização atual"
 
 #: ../data/simple-scan.ui.h:77
 msgid "Stop"
@@ -226,7 +227,7 @@ msgstr "Rodar a página para a esquerda (contra ponteiros do relógio)"
 #. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
-msgstr "Rodar para a Esquerda"
+msgstr "Rodar à esquerda"
 
 #. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:83
@@ -236,7 +237,7 @@ msgstr "Rodar a página para a direita (ponteiros do relógio)"
 #. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
-msgstr "Rodar para a Direita"
+msgstr "Rodar à direita"
 
 #: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
@@ -247,24 +248,24 @@ msgid "Crop"
 msgstr "Recortar"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "Preferências"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
-msgstr "Origem da Digitalizaçã_o:"
+msgstr "Origem da digitalizaçã_o:"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
-msgstr "Resolução do _Texto:"
+msgstr "Resolução do _texto:"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
-msgstr "_Resolução da Foto:"
+msgstr "_Resolução da foto:"
 
 #. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:97
@@ -274,7 +275,7 @@ msgstr "Lado da digitalização"
 #. Label beside page size combo box
 #: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
-msgstr "Tamanho da Página:"
+msgstr "Tamanho da página:"
 
 #. Label beside brightness scale
 #: ../data/simple-scan.ui.h:101
@@ -293,11 +294,11 @@ msgstr "Qualidade:"
 
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Document Scanner"
-msgstr "Scanner de Documentos"
+msgstr "Scanner de documentos"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
-msgstr "Digitalizar Documentos"
+msgstr "Digitalizar documentos"
 
 #: ../data/simple-scan.desktop.in.h:4
 msgid "scan;scanner;flatbed;adf;"
@@ -408,7 +409,7 @@ msgstr "Pasta para guardar os ficheiros"
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
-"O directório no qual salvar os ficheiros. Usa o directório de documentos "
+"O diretório no qual salvar os ficheiros. Usa o diretório de documentos "
 "predefinido se não for configurado."
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
@@ -422,7 +423,7 @@ msgstr "Valor de qualidade a usar na compressão JPEG."
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
-msgstr "Nenhum digitalizador disponível. Por favor, ligue um scanner."
+msgstr "Sem digitalizador disponível. Por favor, ligue um scanner."
 
 #. Error displayed when cannot connect to scanner
 #: ../src/scanner.vala:870
@@ -452,10 +453,11 @@ msgstr "Imprimir mensagens de depuração"
 #: ../src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
-"Compatibilizar ficheiros PDF gerados por versões mais antigas do Simple Scan"
+"Compatibilizar ficheiros PDF gerados por versões mais antigas do "
+"Digitalizações"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Falhou ao digitalizar"
 
@@ -465,142 +467,143 @@ msgid "Scanned Document"
 msgstr "Documento digitalizado"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Utilitário de digitalização"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Execute '%s --help' para consultar uma lista completa das opções de linha de "
 "comando disponíveis."
 
-#: ../src/ui.vala:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
-msgstr "Documento Digitalizado.pdf"
+msgstr "Documento digitalizado.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr "Fechar"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "É necessário utilizador e palavra-passe para aceder a '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
-msgstr "Nenhum scanner detectado"
+msgstr "Sem scanners detetados"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
-msgstr "Verifique se o seu scanner está conectado e ligado"
+msgstr "Verifique se o seu scanner está conetado e ligado"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
-msgstr "Guardar Como..."
+msgstr "Guardar como..."
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr "Cancelar"
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr "Guardar"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr "Ficheiros de imagem"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "Todos os ficheiros"
 
 #. 
 #: ../src/ui.vala:532
 msgid "Select File _Type"
-msgstr "Seleccionar _Tipo de ficheiro"
+msgstr "Selecionar _tipo de ficheiro"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr "PDF (documento multi-página)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimido)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr "PNG (sem perdas)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../src/ui.vala:649
 msgid "Failed to save file"
 msgstr "Falhou ao guardar o ficheiro"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:670
+#: ../src/ui.vala:672
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Se não guardar, as alteração serão perdidas permanentemente."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
-msgstr "Guardar documento actual?"
+msgstr "Guardar documento atual?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
-msgstr "Descartar Alterações"
+msgstr "Descartar alterações"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr "Incapaz de gravar imagem para pré-visualização"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr "Não foi possível abrir a aplicação de visualização de imagem"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr "Combinar lados"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
-msgstr "Combinar Lados (inverso)"
+msgstr "Combinar lados (inverso)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr "Inverter"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr "Manter inalterado"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr "Não foi possível abrir o ficheiro da ajuda"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -630,16 +633,16 @@ msgstr ""
 "este programa. Caso contrário, veja <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
-msgstr "Acerca do Digitalização Simples (Simple Scan)"
+msgstr "Acerca do Digitalizações (Simple Scan)"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "Ferramenta simples para digitalizar documentos"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -659,6 +662,7 @@ msgstr ""
 "  Flavio https://launchpad.net/~flaviocarpin\n"
 "  Gusrubin https://launchpad.net/~gusrubin\n"
 "  Hélder Portela https://launchpad.net/~helderp666\n"
+"  Ivo Xavier https://launchpad.net/~ivoxavier\n"
 "  IvoGuerreiro https://launchpad.net/~ivoguerreiro\n"
 "  Jaime Pereira https://launchpad.net/~jaimepereira\n"
 "  Jose Almeida https://launchpad.net/~josealmeida\n"
@@ -675,106 +679,106 @@ msgstr ""
 "  styluss https://launchpad.net/~styluss"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr "Guardar documento antes de sair?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
-msgstr "Sair SEM Guardar"
+msgstr "Sair sem guardar"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (predefinido)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (rascunho)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, 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:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
-msgstr "Novo Documento"
+msgstr "Novo documento"
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr "Documento"
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
-msgstr "E-mail..."
+msgstr "Email..."
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr "Ajuda"
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr "Sobre"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr "Sair"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "Alterar _digitalizador"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr "Escurecer"
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr "Clarear"
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr "Menos"
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr "Mais"
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr "Mínimo"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr "Máximo"
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr "A guardar o documento..."
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "A guardar a página %d de %d"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 846b129..e65d0a6 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:40+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Verso"
 
 #. 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 "Digitalizador simples"
 
@@ -87,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:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr "Reordenar páginas"
 
@@ -205,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:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "Salvar"
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr "Recortar"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "Preferências"
 
@@ -295,7 +296,7 @@ msgstr "Qualidade:"
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Digitalizar documentos"
 
@@ -457,7 +458,7 @@ msgstr ""
 "Corrigir arquivos PDF gerados com versões anteriores do Digitalizador simples"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Falha ao digitalizar"
 
@@ -467,62 +468,63 @@ msgid "Scanned Document"
 msgstr "Documento digitalizado"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DISPOSITIVO...] - Utilitário de digitalização"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Execute '%s --help' para ver a lista completa de opções disponíveis para "
 "linha de comando."
 
-#: ../src/ui.vala:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr "Documento digitalizado.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr "Fe_char"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "É necessário o nome de usuário e senha para acessar '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr "Nenhum digitalizador detectado"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr "Por favor verifique se o seu digitalizador está conectado e ligado"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "Salvar como..."
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr "_Salvar"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr "Arquivos de imagem"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "Todos os arquivos"
 
@@ -532,77 +534,77 @@ msgid "Select File _Type"
 msgstr "Selecionar _tipo de arquivo"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr "PDF (documento com múltiplas páginas)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimido)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr "PNG (sem perdas)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../src/ui.vala:649
 msgid "Failed to save file"
 msgstr "Falha ao salvar o arquivo"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:670
+#: ../src/ui.vala:672
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Se você não salvar, as alterações serão permanentemente perdidas."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr "Salvar documento atual?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr "Descartar alterações"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr "Não é possível salvar imagem para visualização"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr "Não foi possível abrir o aplicativo de visualização de imagem"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr "Combine os lados"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr "Combine os lados (reverso)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr "Reverso"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr "Manter inalterado"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr "Não foi possível abrir o arquivo de ajuda"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -632,16 +634,16 @@ msgstr ""
 "este programa. Caso contrário, acesse <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "Sobre o Digitalizador simples"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "Ferramenta simples para digitalizar documentos"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -670,106 +672,106 @@ msgstr ""
 "  millemiglia https://launchpad.net/~dnieper650"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr "Salvar o documento antes de sair?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr "Sair sem salvar"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (padrão)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (rascunho)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, 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:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr "Novo documento"
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr "Documentos"
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr "E-mail..."
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr "Ajuda"
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr "Sobre"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr "Sair"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "Alterar _digitalizador"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr "Mais escuro"
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr "Mais claro"
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr "Menos"
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr "Mais"
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr "Mínima"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr "Máxima"
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr "Salvando documento..."
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Salvando página %d de %d"
diff --git a/po/ro.po b/po/ro.po
index 32663f3..10c91db 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:39+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 "Language: ro\n"
 
 #. Button to submit authorization dialog
@@ -50,6 +50,7 @@ msgstr "Verso"
 
 #. 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 "Scanare simplă"
 
@@ -88,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:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr ""
 
@@ -206,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:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "Salvează"
 
@@ -248,7 +249,7 @@ msgid "Crop"
 msgstr "Decupează"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "Preferințe"
 
@@ -296,7 +297,7 @@ msgstr "Calitate:"
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Scanează documente"
 
@@ -456,7 +457,7 @@ msgstr ""
 "simplă"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Scanarea a eșuat"
 
@@ -466,62 +467,63 @@ msgid "Scanned Document"
 msgstr "Document scanat"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "DISPOZITIV...] - Utilitar pentru scanare"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Rulați „%s --help” pentru a consulta lista completă a opțiunilor pentru "
 "comenzile mediului text."
 
-#: ../src/ui.vala:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr "Document scanat.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr "Înc_hide"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Sunt necesare numele de utilizator și parola pentru a accesa „%s”"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr "Nu a fost detectat niciun scaner"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr "Verificați dacă scanerul este conectat și pornit"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "Salvează ca..."
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr "_Anulare"
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr "_Salvează"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr "Fișiere imagine"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "Toate fișierele"
 
@@ -531,77 +533,77 @@ msgid "Select File _Type"
 msgstr "Alegeți _tipul de fișier"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr "PDF (document cu mai multe pagini)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimat)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr "PNG (fără pierderi)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../src/ui.vala:649
 msgid "Failed to save file"
 msgstr "Salvarea fișierului a eșuat"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:670
+#: ../src/ui.vala:672
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Dacă nu salvați, modificările vor fi pierdute definitiv."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr "Salvați documentul curent?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr "Renunță la modificări"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr "Nu se poate salva imaginea pentru a prezenta o previzualizare"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr "Nu s-a putut deschide aplicația de previzualizare a imaginilor"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr "Nu se poate deschide fișierul de ajutor"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -633,16 +635,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "Despre „Scanare simplă”"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "Utilitar pentru scanarea simplă a documentelor"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -656,106 +658,106 @@ msgstr ""
 "  sfantu https://launchpad.net/~sfantus1"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr "Salvați documentul înainte de ieșire?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr "Închide fără a salva"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (implicit)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (ciornă)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, 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:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "Schimbă _scanerul"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "Automată"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr "Mai întunecat"
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr "Mai luminos"
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr "Mai puțin"
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr "Mai mult"
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr "Minim"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr "Maxim"
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr "Se salvează documentul..."
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Se salvează pagina %d din %d"
diff --git a/po/ru.po b/po/ru.po
index 5dd3575..3b77fe7 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,14 +8,14 @@ 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-07-23 23:33+0000\n"
-"Last-Translator: Sergey Sedov <sedov@webmail.perm.ru>\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-08-11 05:39+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ 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 "Простое сканирование"
 
@@ -60,7 +61,7 @@ msgstr "_Документ"
 #. Scan menu item
 #: ../data/simple-scan.ui.h:18
 msgid "Sc_an"
-msgstr "От_сканировать"
+msgstr "_Сканировать"
 
 #. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:20
@@ -87,14 +88,14 @@ msgstr "Фотография"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr "Организация страниц"
 
 #. Label on email menu item
 #: ../data/simple-scan.ui.h:30
 msgid "_Email"
-msgstr "Отправить по _электронной почте"
+msgstr "Отправить _почтой"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
 #: ../data/simple-scan.ui.h:32
@@ -205,7 +206,7 @@ msgstr "Сканировать"
 msgid "Save document to a file"
 msgstr "Сохранить документ в файл"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "Сохранить"
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr "Обрезать"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "Параметры"
 
@@ -295,7 +296,7 @@ msgstr "Качество:"
 msgid "Document Scanner"
 msgstr "Сканер документов"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Сканирование документов"
 
@@ -455,7 +456,7 @@ msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "Исправить PDF-файлы, созданные предыдущими версиями Simple Scan"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Сканирование не удалось"
 
@@ -465,60 +466,61 @@ msgid "Scanned Document"
 msgstr "Отсканированный документ"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] — Устройство сканирования"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../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:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr "Сканированный документ.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr "_Закрыть"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Для доступа к '%s' нужны имя пользователя и пароль"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr "Сканеры не обнаружены"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr "Проверьте, что сканер подсоединён и включён"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "Сохранить как..."
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr "_Отменить"
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr "Со_хранить"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr "Файлы изображений"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "Все файлы"
 
@@ -528,77 +530,77 @@ msgid "Select File _Type"
 msgstr "Выберите _тип файла"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr "PDF (многостраничный документ)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr "JPEG (сжатый)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr "PNG (без потерь в качестве)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../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:670
+#: ../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:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr "Сохранить текущий документ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr "Отменить изменения"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr "Не удалось сохранить изображение для предварительного просмотра"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr "Невозможно открыть программу для просмотра изображений"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr "Объединить стороны"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr "Объединить стороны (в обратном порядке)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr "В обратном порядке"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr "Оставить без изменений"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr "Не удалось открыть файл справки"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -627,16 +629,16 @@ msgstr ""
 "пройдите по ссылке: <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "О программе"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "Простой инструмент для сканирования документов"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -678,106 +680,106 @@ msgstr ""
 "  ☠Jay ZDLin☠ https://launchpad.net/~black-buddha666"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr "Сохранить документ перед выходом?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr "Выйти без сохранения"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (по умолчанию)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (черновик)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, 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:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr "Новый документ"
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr "Документ"
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr "Отправить..."
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr "Печать..."
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr "Справка"
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr "О программе"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr "Завершить"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "Сменить _сканер"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "Выбрать автоматически"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr "Темнее"
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr "Светлее"
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr "Меньше"
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr "Больше"
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr "Мин."
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr "Макс."
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr "Сохранение документа..."
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Сохранение страницы %d из %d"
diff --git a/po/sd.po b/po/sd.po
index 2565bb0..d19390e 100644
--- a/po/sd.po
+++ b/po/sd.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:40+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ 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 "سادو اسڪين"
 
@@ -87,7 +88,7 @@ msgstr "فوٽو"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +206,7 @@ msgstr "اسڪين"
 msgid "Save document to a file"
 msgstr "دستاويز کي فائل ۾ سانڍيو"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "سانڍيو"
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr "ڪاٽيو"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "ترجيحون"
 
@@ -295,7 +296,7 @@ msgstr ""
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "دستاويزات اسڪين ڪريو"
 
@@ -446,7 +447,7 @@ msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "اسڪين ڪرڻ ۾ ناڪامي"
 
@@ -456,60 +457,61 @@ msgid "Scanned Document"
 msgstr "اسڪين ٿيل دستاويز"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr "اسڪين دستاويز.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../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:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "هينئن سانڍيو..."
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr "شڪل فائلون"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "تمام فائلون"
 
@@ -519,77 +521,77 @@ msgid "Select File _Type"
 msgstr "فائل جو _قسم چونڊيو"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../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:670
+#: ../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:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr "هاڻوڪو دستاويز سانڍيو؟"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr "تبديليون منسوخ ڪريو"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr "سهڪاري فائل ڀرڻ ۾ ناڪام"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -606,122 +608,122 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "سادي اسڪين بابت"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "سادو دستاويز اسڪين ڪندڙ اوزار"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Abdul-Rahim Nizamani https://launchpad.net/~ghaffari"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr "نڪرڻ کان پهرين دستاويز سانڍيو؟"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr "سانڍڻ بغير نڪرو"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "اسڪينر _تبديل ڪريو"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "پاڻمرادو"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/se.po b/po/se.po
index 6308664..54f426d 100644
--- a/po/se.po
+++ b/po/se.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:40+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Maŋos"
 
 #. 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 "Simple Scan"
 
@@ -87,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:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +206,7 @@ msgstr "Oza"
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "Vurke"
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "Oidimat"
 
@@ -295,7 +296,7 @@ msgstr ""
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr ""
 
@@ -446,7 +447,7 @@ msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr ""
 
@@ -456,60 +457,61 @@ msgid "Scanned Document"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../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:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "Vurke nugo …"
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "Buot fiillat"
 
@@ -519,77 +521,77 @@ msgid "Select File _Type"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../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:670
+#: ../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:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -606,122 +608,122 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "Simple Scan-dieđut"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Christopher Forster https://launchpad.net/~christopherforster"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "Automáhtalaš"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/shn.po b/po/shn.po
index 61d8bf3..864282a 100644
--- a/po/shn.po
+++ b/po/shn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:40+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ 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 ""
 
@@ -87,7 +88,7 @@ msgstr ""
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +206,7 @@ msgstr ""
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr ""
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr ""
 
@@ -295,7 +296,7 @@ msgstr ""
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr ""
 
@@ -446,7 +447,7 @@ msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr ""
 
@@ -456,60 +457,61 @@ msgid "Scanned Document"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../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:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr ""
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr ""
 
@@ -519,77 +521,77 @@ msgid "Select File _Type"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../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:670
+#: ../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:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -606,120 +608,120 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/sk.po b/po/sk.po
index 1f6d3aa..970c810 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -2,20 +2,22 @@
 # Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
 # This file is distributed under the same license as the simple-scan package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+# Dušan Kazik <prescott66@gmail.com>, 2015.
 #
 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-06-29 19:13+0000\n"
-"Last-Translator: Laco Gubík <Unknown>\n"
-"Language-Team: Slovak <sk@li.org>\n"
+"PO-Revision-Date: 2015-08-25 17:58+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-08-11 05:40+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
+"Language: sk\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +51,7 @@ msgstr "Zadná strana"
 
 #. 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 "Jednoduché skenovanie"
 
@@ -87,9 +90,9 @@ msgstr "Fotografia"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
-msgstr ""
+msgstr "Zmeniť poradie stránok"
 
 #. Label on email menu item
 #: ../data/simple-scan.ui.h:30
@@ -184,7 +187,7 @@ msgstr "_Obsah"
 #. Tooltip for new document button
 #: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
-msgstr "Vytvoriť nový dokument"
+msgstr "Vytvorí nový dokument"
 
 #: ../data/simple-scan.ui.h:67
 msgid "New"
@@ -193,7 +196,7 @@ msgstr "Nový"
 #. Tooltip for scan toolbar button
 #: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
-msgstr "Oskenovať jednu stránku zo skeneru"
+msgstr "Oskenuje jednu stránku zo skeneru"
 
 #. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:71
@@ -203,25 +206,25 @@ msgstr "Skenovať"
 #. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
-msgstr ""
+msgstr "Uloží dokument do súboru"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "Uložiť"
 
 #. Tooltip for stop button
 #: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
-msgstr ""
+msgstr "Zastaví aktuálne skenovanie"
 
 #: ../data/simple-scan.ui.h:77
 msgid "Stop"
-msgstr ""
+msgstr "Zastaviť"
 
 #. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
-msgstr ""
+msgstr "Otočí stránku doľava (v protismere hodinových ručičiek)"
 
 #. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:81
@@ -231,25 +234,26 @@ msgstr "Otočiť doľava"
 #. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
-msgstr ""
+msgstr "Otočí stránku doprava (v smere hodinových ručičiek)"
 
 #. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "Otočiť doprava"
 
+# tooltip
 #: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
-msgstr ""
+msgstr "Oreže vybratú stránku"
 
 #: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "Orezanie"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
-msgstr "Predvoľby"
+msgstr "Nastavenia"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:91
@@ -259,22 +263,22 @@ msgstr "Zdroj s_kenovania:"
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
-msgstr ""
+msgstr "Rozlíšenie _textu:"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
-msgstr ""
+msgstr "Rozlíšenie _fotografií:"
 
 #. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
-msgstr ""
+msgstr "Skenovaná strana:"
 
 #. Label beside page size combo box
 #: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
-msgstr ""
+msgstr "Veľkosť stránky:"
 
 #. Label beside brightness scale
 #: ../data/simple-scan.ui.h:101
@@ -293,15 +297,15 @@ msgstr "Kvalita:"
 
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Document Scanner"
-msgstr ""
+msgstr "Skener dokumentov"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Skenovať dokumenty"
 
 #: ../data/simple-scan.desktop.in.h:4
 msgid "scan;scanner;flatbed;adf;"
-msgstr ""
+msgstr "skenovanie;skenovať;skener;plochý;adf;"
 
 #: ../data/appdata/simple-scan.appdata.xml.in.h:2
 msgid ""
@@ -310,11 +314,17 @@ msgid ""
 "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"
@@ -338,80 +348,89 @@ msgstr ""
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
-msgstr ""
+msgstr "Šírka papiera v desatinách 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 ""
+"Šírka papiera v desatinách mm (alebo hodnota 0 pre automatické rozpoznanie "
+"papiera)"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
-msgstr ""
+msgstr "Výška papiera v desatinách 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 ""
+"Výška papiera v desatinách mm (alebo hodnota 0 pre automatické rozpoznanie "
+"papiera)"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
-msgstr ""
+msgstr "Jas skenu"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr ""
+msgstr "Úprava jasu od -100 do 100 (0 znamená bez úpravy)"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
-msgstr ""
+msgstr "Kontrast skenu"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr ""
+msgstr "Úprava kontrastu od -100 do 100 (0 znamená bez úpravy)"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
-msgstr ""
+msgstr "Rozlíšenie pre skenovanie textu"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
+"Rozlíšenie v bodoch na palec (DPI), ktoré sa má použiť pri skenovaní textu."
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
-msgstr ""
+msgstr "Rozlíšenie pre skenovanie fotografií"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
+"Rozlíšenie v bodoch na palec (DPI), ktoré sa má použiť pri skenovaní "
+"fotografií."
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
-msgstr ""
+msgstr "Strana stránky na skenovanie"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
-msgstr ""
+msgstr "Strana stránky, ktorá sa má oskenovať."
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
-msgstr ""
+msgstr "Adresár na ukladanie súborov"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
+"Adresár, do ktorého sa majú ukladať súbory. Ak je nenastavený, použije sa "
+"predvolený adresár dokumentov."
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
-msgstr ""
+msgstr "Hodnota kvality kompresie obrázkov JPEG"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
-msgstr ""
+msgstr "Hodnota kvality, ktorá sa má použiť pre kompresiu obrázkov JPEG."
 
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
@@ -450,152 +469,153 @@ msgstr ""
 "skenovanie"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 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 ""
+msgstr "Oskenovaný dokument"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ZARIADENIE…] - Nástroj na skenovanie"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Zoznam všetkých dostupných volieb príkazového riadka zobrazíte spustením „%s "
 "--help“."
 
-#: ../src/ui.vala:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr "Naskenovaný dokument.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
-msgstr ""
+msgstr "_Zavrieť"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Meno používateľa a heslo je vyžadované pre prístup k '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
-msgstr "Žiadne skenery neboli nájdené"
+msgstr "Nezistili sa žiadne skenery"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
-msgstr "Prosím skontrolujte či je skener pripojený a zapnutý"
+msgstr "Prosím, skontrolujte, či je skener pripojený a zapnutý"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "Uložiť ako..."
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
-msgstr ""
+msgstr "Z_rušiť"
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
-msgstr ""
+msgstr "_Uložiť"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
-msgstr ""
+msgstr "Súbory obrázkov"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
-msgstr ""
+msgstr "Všetky súbory"
 
 #. 
 #: ../src/ui.vala:532
 msgid "Select File _Type"
-msgstr ""
+msgstr "Vybrať _typ súboru"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
-msgstr ""
+msgstr "PDF (dokument s viacerými stranami)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
-msgstr ""
+msgstr "JPEG (komprimovaný)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
-msgstr ""
+msgstr "PNG (bezstratový)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../src/ui.vala:649
 msgid "Failed to save file"
 msgstr "Ukladanie súboru zlyhalo"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:670
+#: ../src/ui.vala:672
 msgid "If you don't save, changes will be permanently lost."
-msgstr ""
+msgstr "Ak dokument neuložíte, zmeny budú natrvalo stratené."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
-msgstr ""
+msgstr "Uložiť aktuálny dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
-msgstr ""
+msgstr "Zahodiť zmeny"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr "Nepodarilo sa uložiť obraz na náhľad"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
-msgstr ""
+msgstr "Nie je možné otvoriť aplikáciu na náhľad obrázku"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
-msgstr ""
+msgstr "Kombinovať strany"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
-msgstr ""
+msgstr "Kombinovať strany (obrátene)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
-msgstr ""
+msgstr "Obrátiť"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
-msgstr ""
+msgstr "Ponechať nezmenené"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
-msgstr ""
+msgstr "Nie je možné otvoriť súbor pomocníka"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -625,128 +645,128 @@ msgstr ""
 "licencie GNU. Ak sa tak nestalo, navštívte <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "O programe Jednoduché skenovanie"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "Nástroj na jednoduché skenovanie dokumentov"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  6205 https://launchpad.net/~6205-reactivated-deactivatedaccount\n"
 "  Alessio Treglia https://launchpad.net/~quadrispro\n"
+"  Dusan Kazik https://launchpad.net/~prescott66\n"
 "  Eduard Hummel https://launchpad.net/~eduardhummel\n"
 "  Laco Gubík https://launchpad.net/~laco\n"
 "  Pavol Klačanský https://launchpad.net/~pavolzetor-deactivatedaccount\n"
-"  Prescott_SK https://launchpad.net/~prescott66\n"
 "  Robert Ancell https://launchpad.net/~robert-ancell"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
-msgstr ""
+msgstr "Uložiť dokument pred ukončením?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
-msgstr ""
+msgstr "Ukončiť bez uloženia"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
-msgstr ""
+msgstr "%d dpi (predvolené)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
-msgstr ""
+msgstr "%d dpi (koncept)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (high resolution)"
-msgstr ""
+msgstr "%d dpi (vysoké rozlíšenie)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
-msgstr ""
+msgstr "%d dpi"
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
-msgstr ""
+msgstr "Nový dokument"
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
-msgstr ""
+msgstr "Dokument"
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
-msgstr ""
+msgstr "Email..."
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
-msgstr ""
+msgstr "Tlačiť..."
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
-msgstr ""
+msgstr "Pomocník"
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
-msgstr ""
+msgstr "O programe"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
-msgstr ""
+msgstr "Ukončiť"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "Zmeniť _skener"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
-msgstr ""
+msgstr "Automatická"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
-msgstr ""
+msgstr "Tmavší"
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
-msgstr ""
+msgstr "Svetlejší"
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
-msgstr ""
+msgstr "Menší"
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
-msgstr ""
+msgstr "Väčší"
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
-msgstr ""
+msgstr "Minimálna"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
-msgstr ""
+msgstr "Maximálna"
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr "Ukladá sa dokument…"
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Ukladá sa %d. strana z %d"
diff --git a/po/sl.po b/po/sl.po
index 159d4d4..3d3269f 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:40+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Hrbtna stran"
 
 #. 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 "Enostavno optično branje"
 
@@ -87,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:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr "Prerazporeditev strani"
 
@@ -205,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:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "Shrani"
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr "Obreži"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "Možnosti"
 
@@ -295,7 +296,7 @@ msgstr "Kakovost:"
 msgid "Document Scanner"
 msgstr "Optični bralnik dokumentov"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Optično preberite dokumente"
 
@@ -453,7 +454,7 @@ msgstr ""
 "Popravi datoteke PDF ustvarjene s starejšimi različicami programa Simple Scan"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Optično branje je spodletelo"
 
@@ -463,60 +464,61 @@ msgid "Scanned Document"
 msgstr "Optično bran dokument"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[NAPRAVA ...] - pripomoček optičnega branja"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "Za popoln seznam možnosti ukazne vrstice zaženite '%s --help'."
 
-#: ../src/ui.vala:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr "Optično bran dokument.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr "_Zapri"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Za dostop do '%s' je zahtevano uporabniško ime in geslo"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr "Optičnega bralnika ni mogoče zaznati"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr "Preverite, če je vaš optični bralnik povezan in vklopljen"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "Shrani kot ..."
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr "_Prekliči"
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr "_Shrani"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr "Slikovne datoteke"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "Vse datoteke"
 
@@ -526,77 +528,77 @@ msgid "Select File _Type"
 msgstr "Izberite _vrsto datoteke"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr "PDF (večstranski dokument)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr "JPEG (stisnjen)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr "PNG (brez izgub)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../src/ui.vala:649
 msgid "Failed to save file"
 msgstr "Shranjevanje datoteke je spodletelo"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:670
+#: ../src/ui.vala:672
 msgid "If you don't save, changes will be permanently lost."
 msgstr "V primeru, da sprememb ne shranite, bodo trajno izgubljene."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr "Naj bo trenutni dokument shranjen?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr "Zavrzi vse spremembe"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr "Ni bilo mogoče shraniti slike za predogled"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr "Ni mogoče odpreti programa predogleda slik"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr "Spoji strani"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr "Spoji strani (obratno)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr "Obrnjeno"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr "Ohrani nespremenjeno"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr "Ni mogoče odpreti datoteke pomoči"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -628,16 +630,16 @@ msgstr ""
 "v primeru, da kopije niste prejeli si oglejte <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "O programu"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "Preprosto orodje za optično branje dokumentov"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -651,106 +653,106 @@ msgstr ""
 "  grofaty https://launchpad.net/~grofaty"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr "Ali naj bo dokument pred končanjem programa shranjen?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr "Končaj brez shranjevanja"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, 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:1635
+#: ../src/ui.vala:1772
 #, 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:1638
+#: ../src/ui.vala:1775
 #, 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:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr "%d točk na palec"
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr "Nov dokument"
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr "Dokument"
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr "E-pošta ..."
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr "Natisni ..."
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr "Pomoč"
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr "O programu"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr "Izhod"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "Spremeni _optični bralnik"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "Samodejno"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr "Temenjše"
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr "Svetlejše"
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr "Manj"
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr "Več"
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr "Najmanj"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr "Največ"
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr "Shranjevanje dokumenta ..."
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Shranjevanje strani %d od %d"
diff --git a/po/sq.po b/po/sq.po
index 26871c6..ec3b8ad 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:39+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:13+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Mbrapa"
 
 #. 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 "Skanim i thjeshtë"
 
@@ -87,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:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,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:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "Ruaj"
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr "Prej"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "Parapëlqimet"
 
@@ -295,7 +296,7 @@ msgstr "Cilësia:"
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Skanoj Dokumentet"
 
@@ -454,7 +455,7 @@ msgstr ""
 "Thjeshtë"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Skanimi dështoi"
 
@@ -464,63 +465,64 @@ msgid "Scanned Document"
 msgstr "Dokumenti i Skanuar"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Mjet i skanimit"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Nis '%s --ndihmë' për të parë një listë të plotë të linjave të disponueshme "
 "të komandës."
 
-#: ../src/ui.vala:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr "Dokumenti i Skanuar.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr "_Mbylle"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Emri i përdoruesit dhe skanimi kërkohet për të hyrë në '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr "Nuk u dalluan skanera"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 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"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "Ruaje Si..."
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr "_Anullo"
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr "_Ruaje"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr "Kartela Pamje"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "Të Gjithë Skedarët"
 
@@ -530,77 +532,77 @@ msgid "Select File _Type"
 msgstr "Zgjidh Llojin e _Skedarit"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr "PDF (dokument shumë faqësh)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr "JPEG (i ngjeshur)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr "PNG (pa humbje)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../src/ui.vala:649
 msgid "Failed to save file"
 msgstr "Dështuam në ruajtjen e skedarit"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:670
+#: ../src/ui.vala:672
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Nëse nuk  ruani, ndryshimet do të humbasin përgjithmonë."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr "Ta ruaj dokumentin e tanishëm?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr "Anullo Ndryshimet"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr "Nuk jemi në gjendje ta ruajmë imazhin për parapamje"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr "Nuk jam në gjendje të hap programin për parapamjen e imazhit"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr "E pamundur hapja e file të ndihmës"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -629,16 +631,16 @@ msgstr ""
 "me këtë program. Nëse jo, shikoni <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "Rreth Skanimit të Thjeshtë"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "Mjet i thjeshtë për skanimin e dokumenteve"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -647,106 +649,106 @@ msgstr ""
 "  Vilson Gjeci https://launchpad.net/~vilsongjeci"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr "Ta ruaj dokumentin para daljes?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr "Dil pa e ruajtur"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (e parazgjedhur)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (i thjeshtë)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, 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:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "Ndrysho _Skanerin"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "Automatik"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr "Më e Errët"
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr "Më e lehtë"
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr "Më Pak"
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr "Më tepër"
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr "Maksimum"
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr "Ruajtje e dokumentit..."
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Ruajtja e faqes %d nga %d"
diff --git a/po/sr.po b/po/sr.po
index 4ddcb9b..b20a5d2 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:39+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 "Language: sr\n"
 
 #. Button to submit authorization dialog
@@ -49,6 +49,7 @@ 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 "Обично скенирање"
 
@@ -87,7 +88,7 @@ msgstr "Слика"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr "Промени ред страница"
 
@@ -205,7 +206,7 @@ msgstr "Скенирај"
 msgid "Save document to a file"
 msgstr "Сачувајте документ у датотеку"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "Сачувај"
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr "Одрежи"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "Поставке"
 
@@ -295,7 +296,7 @@ msgstr "Квалитет:"
 msgid "Document Scanner"
 msgstr "Скенер докумената"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Скенирајте документе"
 
@@ -464,7 +465,7 @@ msgstr ""
 "Поправи ПДФ датотеке створене старијим издањима Једноставног скенирања"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Нисам успео да скенирам"
 
@@ -474,61 +475,62 @@ msgid "Scanned Document"
 msgstr "Скенирани документ"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[УРЕЂАЈ...] — алатка за скенирање"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../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:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr "Скенирани документ.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr "_Затвори"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Корисничко име и лозинка су обавезни за приступ „%s“"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr "Нема откривених скенера"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr "Проверите да ли је скенер повезан и укључен"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "Сачувај као..."
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr "_Откажи"
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr "_Сачувај"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr "Датотеке слика"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "Све датотеке"
 
@@ -538,77 +540,77 @@ msgid "Select File _Type"
 msgstr "_Изабери врсту датотеке"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr "ПДФ (документ са више страна)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr "ЈПЕГ (сажето)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr "ПНГ (без губитака)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../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:670
+#: ../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:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr "Да сачувам текући документ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr "Одбаци измене"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr "Не могу да сачувам слику за преглед"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr "Не могу да отворим програм за приказивање слика"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr "Обједини стране"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr "Обједини стране (преокрени)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr "Преокрени"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr "Задржи неизмењено"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr "Не могу да отворим датотеку помоћи"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -638,16 +640,16 @@ msgstr ""
 "http://www.gnu.org/licenses/."
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "О Једноставном скенирању"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "Једноставна алатка за скенирање докумената"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -659,106 +661,106 @@ msgstr ""
 "  Мирослав Николић https://launchpad.net/~lipek"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr "Да сачувам документ пре него што изађем?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr "Изађи без чувања"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d тпи (основно)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d тпи (нацрт)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, 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:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr "%d тпи"
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr "Нови документ"
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr "Документ"
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr "Ел. пошта..."
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr "Штампај..."
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr "Помоћ"
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr "О програму"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr "Изађи"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "Промени _скенер"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "Самостално"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr "Тамније"
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr "Светлије"
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr "Мање"
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr "Више"
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr "Најмање"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr "Највише"
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr "Чувам документ..."
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Чувам %d. страницу од укупно %d"
diff --git a/po/sv.po b/po/sv.po
index 6802d45..5435a48 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,14 +8,14 @@ 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-03-13 01:21+0000\n"
-"Last-Translator: Robert Ancell <robert.ancell@canonical.com>\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-08-11 05:40+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Baksida"
 
 #. 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 "Enkel bildinläsning"
 
@@ -87,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:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr "Ändra sidordning"
 
@@ -164,12 +165,12 @@ msgstr "_Rotera beskär"
 #. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:58
 msgid "Move Left"
-msgstr ""
+msgstr "Flytta åt vänster"
 
 #. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:60
 msgid "Move Right"
-msgstr ""
+msgstr "Flytta åt höger"
 
 #. Label on help menu
 #: ../data/simple-scan.ui.h:62
@@ -205,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:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "Spara"
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr "Beskär"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "Inställningar"
 
@@ -295,7 +296,7 @@ msgstr "Kvalitet:"
 msgid "Document Scanner"
 msgstr "Dokumentskanner"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Läs in dokument"
 
@@ -460,7 +461,7 @@ msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "Laga PDF-filer som skapades med äldre versioner av Simple Scan"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Misslyckades med att läsa in"
 
@@ -470,62 +471,63 @@ msgid "Scanned Document"
 msgstr "Inläst dokument"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ENHET...] - Bildinläsningsverktyg"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Kör \"%s --help\" för en komplett lista över tillgängliga "
 "kommandoradsflaggor."
 
-#: ../src/ui.vala:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr "Inläst dokument.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr "_Stäng"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Användarnamn och lösenord krävs för åtkomst till \"%s\""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr "Inga bildinläsare hittades"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr "Kontrollera att din bildläsare är ansluten och påslagen"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "Spara som..."
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr "_Spara"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr "Bildfiler"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "Alla filer"
 
@@ -535,77 +537,77 @@ msgid "Select File _Type"
 msgstr "Välj fil_typ"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr "PDF (flersidigt dokument)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr "JPEG (komprimerad)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr "PNG (förlustfri)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../src/ui.vala:649
 msgid "Failed to save file"
 msgstr "Misslyckades med att spara filen"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:670
+#: ../src/ui.vala:672
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Om du inte sparar så kommer ändringarna att gå förlorade."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr "Spara aktuellt dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr "Förkasta ändringar"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr "Kunde inte spara bild för förhandsvisning"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr "Kunde inte öppna förhandsvisningsprogrammet för bilder"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr "Kombinera sidor"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr "Kombinera sidor (omvänt)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr "Omvänt"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr "Behåll oförändrad"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr "Kunde inte öppna hjälpfilen"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -635,16 +637,16 @@ msgstr ""
 "med detta program. Om inte, se <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "Om Enkel bildinläsning"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "Enkelt verktyg för inläsning av dokument"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -661,106 +663,106 @@ msgstr ""
 "deactivatedaccount"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr "Spara dokumment innan du avslutar?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr "Avsluta utan att spara"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (standard)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (utkast)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, 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:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr "Nytt dokument"
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr "Dokument"
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr "E-post..."
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr "Skriv ut..."
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr "Hjälp"
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr "Om"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr "Avsluta"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "Byt _bildinläsare"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "Automatiskt"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr "Mörkare"
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr "Ljusare"
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr "Mindre"
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr "Mer"
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr "Maximum"
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr "Sparar dokument..."
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Sparar sida %d av %d"
diff --git a/po/ta.po b/po/ta.po
index 74deda4..14989db 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:40+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ 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 ""
 
@@ -87,7 +88,7 @@ msgstr ""
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +206,7 @@ msgstr ""
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr ""
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr ""
 
@@ -295,7 +296,7 @@ msgstr ""
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr ""
 
@@ -446,7 +447,7 @@ msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr ""
 
@@ -456,60 +457,61 @@ msgid "Scanned Document"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../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:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr ""
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr ""
 
@@ -519,77 +521,77 @@ msgid "Select File _Type"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../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:670
+#: ../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:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -606,16 +608,16 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -625,106 +627,106 @@ msgstr ""
 "  mano-மனோ https://launchpad.net/~manoj-neyveli"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/te.po b/po/te.po
index 25367fb..2b484d3 100644
--- a/po/te.po
+++ b/po/te.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:40+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ 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 "సింపుల్ స్కాన్"
 
@@ -87,7 +88,7 @@ msgstr "ఫొటో"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +206,7 @@ msgstr "స్కాన్"
 msgid "Save document to a file"
 msgstr "పత్రాన్ని ఫైలులో దాచు"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "భద్రపరచు"
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr "అంచులుసవరించు"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "ప్రాధాన్యతలు"
 
@@ -295,7 +296,7 @@ msgstr ""
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "పత్రాలు స్కాన్ చేయు"
 
@@ -452,7 +453,7 @@ msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "స్కాన్‌చేయుటలో విఫలమైంది"
 
@@ -462,61 +463,62 @@ msgid "Scanned Document"
 msgstr "స్కాన్‌చేయబడిన పత్రం"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../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:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr "స్కాన్‌చేయబడిన పత్రం.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "'%s' వాడుటకు వాడుకరిపేరు మరియు సంకేతపదం కావాలి"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr "ఏ స్కానర్‌లు కనిపెట్టబడలేదు"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 "మీ స్కానర్ విద్యుత్తుచే చేతనమై కంప్యూటర్‌కు అనుసంధానమైనదో లేదో చూడండి."
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "ఇలా దాచు..."
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr "బొమ్మ ఫైళ్లు"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "అన్ని ఫైళ్ళు"
 
@@ -526,77 +528,77 @@ msgid "Select File _Type"
 msgstr "ఫైల్ రకం ఎంచుకోండి( _T)"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr "PDF (బహుళ-పేజి పత్రం)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr "JPEG (కుదించిన)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr "PNG (నష్టంలేని)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../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:670
+#: ../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:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr "ప్రస్తుత పత్రాన్ని దాచాలా?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr "మార్పులు వదలివేయి"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr "మునుజూపు కొరకు బొమ్మను భద్రపరుచులేకపోతున్నది"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr "బొమ్మ మునుజూపు అనువర్తనం తెరచుట వీలుకాలేదు"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr "సహాయ ఫైలు తెరువలేకపోయింది"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -624,16 +626,16 @@ msgstr ""
 " లేనిచో చూడండి <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "సింపుల్ స్కాన్ గురించి"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "సులభంగా పత్ర స్కానింగ్‌చేయు సాధనం"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -643,106 +645,106 @@ msgstr ""
 "  వీవెన్ https://launchpad.net/~veeven"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr "నిష్క్రమించేముందు పత్రాన్ని దాచాలా?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr "దాచకుండా నిష్క్రమించు"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (అప్రమేయ)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (చిత్తు)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, 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:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "స్కానర్‌ను మార్చు(_S)"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "స్వయంచాలక"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/th.po b/po/th.po
index a19d305..32110fa 100644
--- a/po/th.po
+++ b/po/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:40+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ 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 "Simple Scan"
 
@@ -87,7 +88,7 @@ msgstr "ภาพถ่าย"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +206,7 @@ msgstr "สแกน"
 msgid "Save document to a file"
 msgstr "บันทึกเอกสารเป็นแฟ้ม"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "บันทึก"
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr "ตัด"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "คุณสมบัติ"
 
@@ -295,7 +296,7 @@ msgstr ""
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "สแกนเอกสาร"
 
@@ -451,7 +452,7 @@ msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "ซ่อมแฟ้ม PDF ที่ถูกสร้างด้วย Simple Scan รุ่นที่เก่ากว่า"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "การสแกนล้มเหลว"
 
@@ -461,60 +462,61 @@ msgid "Scanned Document"
 msgstr "เอกสารที่สแกนแล้ว"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - เครื่องมือกำลังสแกน"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../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:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr "สแกน Document.pdf แล้ว"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "ต้องการชื่อผู้ใช้และรหัสผ่านเพื่อเข้าใช้ '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr "ไม่พบเครื่องสแกน"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr "กรุณาตรวจสอบการเชื่อมต่อเครื่องสแกนของคุณและเปิดเครื่อง"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "บันทึกเป็น..."
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr "แฟ้มภาพ"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "แฟ้มทั้งหมด"
 
@@ -524,77 +526,77 @@ msgid "Select File _Type"
 msgstr "เลือก_ประเภทแฟ้ม"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr "PDF (เอกสารหลายหน้า)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr "JPEG (บีบอัดแล้ว)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr "PNG (lossless)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../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:670
+#: ../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:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr "บันทึกเอกสารปัจจุบัน"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr "ยกเลิกการเปลี่ยนแปลง"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr "ไม่สามารถบัญทึกรูปภาพตัวอย่าง"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr "ไม่สามารถเปิดโปรแกรมแสดงภาพได้"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr "ไม่สามารถเปิดแฟ้มเอกสารวิธีใช้"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -623,16 +625,16 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "เกี่ยวกับ Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "เครื่องมือสแกนเอกสารอย่างง่าย"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -640,110 +642,111 @@ msgstr ""
 "  AnuchitChalothorn https://launchpad.net/~anuchit\n"
 "  Manop Pornpeanvichanon(มานพ พรเพียรวิชานนท์) "
 "https://launchpad.net/~manoppornpeanvichanon\n"
+"  Rockworld https://launchpad.net/~rockrock2222222\n"
 "  SiraNokyoongtong https://launchpad.net/~gumara\n"
 "  kijjaz https://launchpad.net/~kijjaz-gmail"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr "บันทึกเอกสารก่อนปิดหรือไม่?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr "ปิดโดยไม่บันทึก"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (ค่าปริยาย)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (ภาพร่าง)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, 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:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "เ_ปลี่ยนเครื่องสแกน"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "อัตโนมัติ"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/tr.po b/po/tr.po
index e0ed0f2..d811670 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:40+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Arka taraf"
 
 #. 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 "Basit Tarama"
 
@@ -87,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:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr "Sayfaları Yeniden Sırala"
 
@@ -205,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:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "Kaydet"
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr "Kırp"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "Tercihler"
 
@@ -295,7 +296,7 @@ msgstr "Kalite:"
 msgid "Document Scanner"
 msgstr "Belge Tarayıcı"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Belgeleri Tara"
 
@@ -457,7 +458,7 @@ msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "Basit Tarama'nın eski sürümlerince üretilen PDF dosyalarını düzelt"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Tarama başarısız oldu"
 
@@ -467,62 +468,63 @@ msgid "Scanned Document"
 msgstr "Taranmış Belge"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[AYGIT...] - Tarama uygulaması"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Kullanılabilir komut satırı seçeneklerinin tam listesini görmek için '%s --"
 "help' komutunu çalıştırın."
 
-#: ../src/ui.vala:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr "Taranan Belge.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr "_Kapat"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "'%s' kaynağına erişmek için kullanıcı adı ve parola gerekiyor"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr "Tarayıcı bulunamadı"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr "Lütfen tarayıcınızın bağlı ve açık olduğundan emin olun"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "Farklı Kaydet..."
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr "_Vazgeç"
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr "_Kaydet"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr "Resim Dosyaları"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "Tüm Dosyalar"
 
@@ -532,77 +534,77 @@ msgid "Select File _Type"
 msgstr "Dosya _Türünü Seç"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr "PDF (çok sayfalı belge)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr "JPEG (sıkıştırılmış)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr "PNG (kayıpsız)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../src/ui.vala:649
 msgid "Failed to save file"
 msgstr "Dosya kaydedilemedi"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:670
+#: ../src/ui.vala:672
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Eğer kaydetmezseniz, değişiklikler tamamen kaybedilecek."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr "Mevcut belgeyi kaydet?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr "Değişiklikleri Geri Al"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr "Görüntü, önizleme için kaydedilemiyor"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr "Görüntü ön izleme uygulaması açılamıyor"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr "Yüzleri birleştir"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr "Yüzleri birleştir (ters)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr "Tersine çevir"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr "Değiştirmeden bırak"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr "Yardım dosyası açılamıyor"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -631,16 +633,16 @@ msgstr ""
 "Eğer almadıysanız bile şuraya bakınız: <http://www.gnu.org/licenses/>"
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "Basit Tarama Hakkında"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "Basit bir belge tarama aracı"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -664,106 +666,106 @@ msgstr ""
 "  İbrahim Çelik https://launchpad.net/~ibrahimcelik89"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr "Çıkmadan önce belgeyi kaydet?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr "Kaydetmeden Çık"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (varsayılan)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (taslak)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, 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:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr "Yeni Belge"
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr "Belge"
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr "E-Posta..."
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr "Yazdır..."
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr "Yardım"
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr "Hakkında"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr "Çık"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "_Tarayıcı Değiştir"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "Otomatik"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr "Daha Koyu"
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr "Daha Açık"
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr "Daha Az"
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr "Daha Fazla"
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr "En Az"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr "En Çok"
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr "Belge kaydediliyor..."
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Kaydedilen sayfa: %d / %d"
diff --git a/po/ug.po b/po/ug.po
index 2674fc4..63d253e 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:40+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 "X-Poedit-Language: Uighur\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
@@ -52,6 +52,7 @@ 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 "ئاددىي شويلىلاش"
 
@@ -90,7 +91,7 @@ msgstr "سۈرەت"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr "بەتلەرنى قايتا تىزىش"
 
@@ -208,7 +209,7 @@ msgstr "شويلىلاش"
 msgid "Save document to a file"
 msgstr "پۈتۈكنى ھۆججەتكە ساقلايدۇ"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "ساقلا"
 
@@ -250,7 +251,7 @@ msgid "Crop"
 msgstr "قىرقى"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "مايىللىق"
 
@@ -298,7 +299,7 @@ msgstr "سۈپىتى:"
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "پۈتۈك شويلىلاش"
 
@@ -458,7 +459,7 @@ msgstr ""
 "كونا نەشردىكى «ئاددىي شويلىلاش»  ئارقىلىق ياسالغان PDF ھۆججىتىنى ئوڭلاش"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "شويلىلاش مەغلۇپ بولدى"
 
@@ -468,61 +469,62 @@ msgid "Scanned Document"
 msgstr "شويلىلانغان ھۆججەت"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ئۈسكۈنە...] - شويلىلاش قورالى."
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../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:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr "شويلىلانغان Document.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr "ياپ(_C)"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "‹%s› كىرىش ئۈچۈن ئىشلەتكۈچى نامى ۋە مەخپىي نومۇر كېرەك"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr "شويلىلىغۇچ تېپىلمىدى"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr "شويلىلىغۇچ چېتىلغانمۇ توكى ئۇلانغانمۇ تەكشۈرۈڭ"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "باشقا ئاتتا ساقلا…"
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr "ئەمەلدىن قالدۇر(_C)"
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr "ساقلا(_S)"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr "سۈرەت ھۆججەتلىرى"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "بارلىق ھۆججەتلەر"
 
@@ -532,77 +534,77 @@ msgid "Select File _Type"
 msgstr "ھۆججەت تىپىنى تاللا(_T)"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr "PDF (كۆپ بەتلىك پۈتۈكلەر)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr "JPEG (پرېسلانغان)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr "PNG (خورىماس)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../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:670
+#: ../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:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr "ھازىرقى پۈتۈكنى ساقلىسۇنمۇ؟"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr "ئۆزگەرتىشنى تاشلىۋەت"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr "ئالدىن كۆرىدىغان رەسىمنى ساقلىغىلى بولمىدى."
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr "رەسىمنى ئالدىن كۆرۈش پروگراممىسىنى قوزغاتقىلى بولمىدى"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr "تەرەپلەرنى بىرىكتۈرۈش"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr "تەرەپلەرنى بىرىكتۈرۈش(ئەسكىچە)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr "ئەكسىچە"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr "ئۆزگەرمىسۇن"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr "ياردەم ھۆججىتىنى ئاچقىلى بولمىدى"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -633,16 +635,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/> دا تاپالايسىز."
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "«ئاددىي شويلىلاش» ھەققىدە"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "ئاددىي پۈتۈك شويلىلاش قورالى"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -656,106 +658,106 @@ msgstr ""
 "  umar tumur https://launchpad.net/~umar-tumur"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr "ئاخىرلاشتۇرۇشتىن ئاۋۋال ھازىرقى پۈتۈكنى ساقلىسۇنمۇ؟"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr "ساقلىماي ئاخىرلاشتۇر"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (كۆڭۈلدىكى)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (دەسلەپكى نۇسخا)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, 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:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr "يېڭى پۈتۈك"
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr "پۈتۈك"
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr "ئېلخەت…"
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr "باس…"
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr "ياردەم"
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr "ھەققىدە"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr "ئاخىرلاشتۇر"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "شويلىلىغۇچنى ئالماشتۇرۇڭ(_S)"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "ئاپتوماتىك"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr "قارىراق"
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr "يورۇقراق"
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr "كىچىك"
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr "تېخىمۇ كۆپ"
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr "ئەڭ كىچىك"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr "ئەڭ چوڭ"
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr "پۈتۈكنى ساقلاۋاتىدۇ…"
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "ساقلاۋاتقىنى %d/%d - بەت"
diff --git a/po/uk.po b/po/uk.po
index 4a515bf..20c6c14 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:40+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ 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 "Просте сканування"
 
@@ -87,7 +88,7 @@ msgstr "Фотографія"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr "Перевпорядкувати сторінки"
 
@@ -205,7 +206,7 @@ msgstr "Сканувати"
 msgid "Save document to a file"
 msgstr "Зберегти документ до файла"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "Зберегти"
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr "Обрізати"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "Налаштування"
 
@@ -295,7 +296,7 @@ msgstr "Якість:"
 msgid "Document Scanner"
 msgstr "Засіб для сканування документів"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Сканувати документи"
 
@@ -463,7 +464,7 @@ msgstr ""
 "Виправити файли PDF, створені за допомогою застарілих версій Simple Scan"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Помилка сканування"
 
@@ -473,62 +474,63 @@ msgid "Scanned Document"
 msgstr "Сканований документ"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ПРИСТРІЙ...] — програма для сканування"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../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:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr "Сканований документ.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr "За_крити"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Для доступу до «%s» слід вказати ім’я користувача та пароль"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr "Сканерів не виявлено"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr "Будь ласка, перевірте, чи з’єднано ваш сканер і чи увімкнено його"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "Зберегти як..."
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr "_Скасувати"
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr "З_берегти"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr "Файли зображень"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "Всі файли"
 
@@ -538,77 +540,77 @@ msgid "Select File _Type"
 msgstr "Вибрати _тип файла"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr "PDF (багатосторінковий документ)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr "JPEG (стиснений)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr "PNG (без втрат)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../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:670
+#: ../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:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr "Зберегти поточний документ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr "Відкинути зміни"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr "Не вдалося зберегти зображення для попереднього перегляду"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr "Не вдалося запустити програму для перегляду зображення"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr "З’єднувати збоку"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr "З’єднувати збоку (у зворотному порядку)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr "У зворотному порядку"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr "Не змінювати"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr "Не вдалося відкрити файл довідки"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -637,16 +639,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>, щоб дізнатися про подальші дії."
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "Про «Просте сканування»"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "Інструмент для спрощення сканування документів"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -656,106 +658,106 @@ msgstr ""
 "  passtas https://launchpad.net/~passtas"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr "Зберегти документ перед виходом?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr "Вийти без збереження"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d т/д (типова)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d т/д (чернетка)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, 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:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr "%d т/д"
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr "Новий документ"
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr "Документ"
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr "Надіслати ел. поштою…"
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr "Надрукувати…"
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr "Довідка"
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr "Про програму"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr "Вийти"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "З_мінити сканер"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "Автоматично"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr "темніше"
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr "світліше"
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr "менше"
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr "більше"
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr "Мінімальна"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr "Максимальна"
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr "Збереження документа…"
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Зберігаємо сторінку %d з %d"
diff --git a/po/ur.po b/po/ur.po
index 827d312..cfc96e1 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:40+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ 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 ""
 
@@ -87,7 +88,7 @@ msgstr "تصویر"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +206,7 @@ msgstr ""
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "محفوظ کریں"
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "ترجیحات"
 
@@ -295,7 +296,7 @@ msgstr ""
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr ""
 
@@ -446,7 +447,7 @@ msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr ""
 
@@ -456,60 +457,61 @@ msgid "Scanned Document"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../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:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr ""
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr ""
 
@@ -519,77 +521,77 @@ msgid "Select File _Type"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../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:670
+#: ../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:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -606,16 +608,16 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -624,106 +626,106 @@ msgstr ""
 "  Shoaib Mirza https://launchpad.net/~monymirza"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/uz.po b/po/uz.po
index d84ad17..a85e6ed 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:40+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Orqaga"
 
 #. 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 "Simple Scan"
 
@@ -87,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:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +206,7 @@ msgstr "Skan qilish"
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "Saqlash"
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr "Kesish"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "Мослашлар"
 
@@ -295,7 +296,7 @@ msgstr ""
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr ""
 
@@ -446,7 +447,7 @@ msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr ""
 
@@ -456,62 +457,63 @@ msgid "Scanned Document"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../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:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../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:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr ""
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "Hamma fayllar"
 
@@ -521,77 +523,77 @@ msgid "Select File _Type"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../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:670
+#: ../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:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -608,122 +610,122 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "Simple Scan haqida"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Sardorbek Pulatov https://launchpad.net/~prockrammer"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr "Saqlamasdan chiqib ketish"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (default)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "_Skaner almashrirish"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "Avtomatik"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/vi.po b/po/vi.po
index 11d4d1a..4ee87df 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:40+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ 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 "Quét đơn giản"
 
@@ -87,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:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +206,7 @@ msgstr ""
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr ""
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "Tùy thích"
 
@@ -295,7 +296,7 @@ msgstr "Chất lượng:"
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr ""
 
@@ -449,7 +450,7 @@ msgstr ""
 "Chỉnh các tệp PDF đã được tạo ra bởi các phiên bản cũ hơn của Simple Scan"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Quét hình thất bại"
 
@@ -459,61 +460,62 @@ msgid "Scanned Document"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Công cụ quét hình"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Chạy lệnh '%s --help' để xem danh sách tất cả các tùy chọn dòng lệnh."
 
-#: ../src/ui.vala:188
+#. 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:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Tên đăng nhập và mật mã cần thiết để truy cập '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr "Không phát hiện máy quét hình nào hết"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr "Vui lòng kiểm tra đã cắm và bật máy quét hình chưa"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "Lưu thành..."
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr ""
 
@@ -523,77 +525,77 @@ msgid "Select File _Type"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../src/ui.vala:649
 msgid "Failed to save file"
 msgstr "Không lưu được tệp"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:670
+#: ../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:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr "Không lưu được ảnh cho xem trước"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -622,16 +624,16 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "Về Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "Công cụ đơn giản để quét tài liệu"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -640,106 +642,106 @@ msgstr ""
 "  Vu Do Quynh https://launchpad.net/~vu-do-quynh"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr "Tối hơn"
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 5a1ae19..a28c2fb 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:40+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ 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 "扫描易"
 
@@ -87,7 +88,7 @@ msgstr "照片"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +206,7 @@ msgstr "扫描"
 msgid "Save document to a file"
 msgstr "将文档保存为文件"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "保存"
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr "剪裁"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "首选项"
 
@@ -295,7 +296,7 @@ msgstr "质量："
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "扫描文档"
 
@@ -446,7 +447,7 @@ msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "修复旧版扫描易生成的 PDF 文件"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "扫描失败"
 
@@ -456,60 +457,61 @@ msgid "Scanned Document"
 msgstr "扫描的文档"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[设备...] - 扫描工具"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../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:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr "扫描的文件.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr "关闭(_C)"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "使用“%s”需要用户名和密码"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr "没有发现扫描仪"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr "请检查您的扫描仪已经连接并且打开"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "保存为..."
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr "保存(_S)"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr "图像文件"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "所有文件"
 
@@ -519,77 +521,77 @@ msgid "Select File _Type"
 msgstr "选择文件类型(_T)"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr "PDF (多页文档)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr "JPEG (压缩)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr "PNG (无损)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../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:670
+#: ../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:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr "保存当前文档？"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr "放弃更改"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr "无法保存用以预览的图像"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr "无法打开图像预览软件"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr "无法打开帮助文件"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -615,16 +617,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "关于扫描易"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "简易的文件扫描工具"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -645,106 +647,106 @@ msgstr ""
 "  zixue.liu https://launchpad.net/~zixue"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr "退出前保存文档？"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr "退出且不保存"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (默认)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (草稿)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, 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:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "更换扫描仪(_S)"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "自动"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr "较深"
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr "稍浅"
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr "较少"
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr "更多"
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr "最小值"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr "最大值"
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr "正在保存文档..."
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "正在保存 %d/%d 页"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index a49ac31..243ef9c 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:40+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ 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 "掃描易"
 
@@ -87,7 +88,7 @@ msgstr "相片"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr "重新排列頁面"
 
@@ -205,7 +206,7 @@ msgstr "掃描"
 msgid "Save document to a file"
 msgstr "將文件儲存至檔案"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr "儲存"
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr "裁切"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr "偏好設定"
 
@@ -295,7 +296,7 @@ msgstr "品質："
 msgid "Document Scanner"
 msgstr "文件掃描"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "掃描文件"
 
@@ -446,7 +447,7 @@ msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "修正由舊版本「簡易掃描」產生的 PDF 檔案"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "掃描失敗"
 
@@ -456,60 +457,61 @@ msgid "Scanned Document"
 msgstr "掃描的文件"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[裝置...] - 掃描公用程式"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../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:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr "掃描的文件.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr "關閉(_C)"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "要存取「%s」需要提供使用者名稱與密碼"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr "沒有偵測到掃描器"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr "請檢查您的掃描器是否連接，並且是否開啟電源"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr "另存為..."
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr "儲存(_S)"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr "影像檔"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr "所有檔案"
 
@@ -519,77 +521,77 @@ msgid "Select File _Type"
 msgstr "選取檔案類型(_T)"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr "PDF (多頁文件)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr "JPEG (壓縮)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr "PNG (無損)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../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:670
+#: ../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:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr "是否儲存目前文件？"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr "放棄變更"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr "無法儲存影像以供預覽"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr "無法開啟影像預覽應用程式"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr "合併邊緣"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr "合併邊緣 (相反次序)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr "反轉"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr "維持不變"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr "無法開啟幫助文件檔案"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../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"
@@ -612,16 +614,16 @@ msgstr ""
 "您應已收到附隨於本程式的 GNU 通用公眾授權的副本；如果沒有，請參照 <http://www.gnu.org/licenses/>。"
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr "關於「簡易掃描」"
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr "簡易文件掃描工具"
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -631,109 +633,110 @@ msgstr ""
 "  Roy Chan https://launchpad.net/~roy-chan-linux\n"
 "  Walter Cheuk https://launchpad.net/~wwycheuk\n"
 "  Yu - Sian , Liu https://launchpad.net/~thomasysliu\n"
-"  nckuhuahua https://launchpad.net/~nckuhuahua"
+"  nckuhuahua https://launchpad.net/~nckuhuahua\n"
+"  tomoe_musashi https://launchpad.net/~musashi"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr "在結束前要儲存文件嗎？"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr "直接退出而不儲存"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (預設)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (草稿)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, 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:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr "新文件"
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr "文件"
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr "電子郵件..."
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr "列印..."
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr "求助"
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr "關於"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr "結束"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr "變更掃描器(_S)"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr "自動"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr "較深"
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr "較淺"
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr "少"
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr "多"
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr "最小"
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr "最大"
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr "正在儲存文件..."
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "正在儲存 %2$d 頁中的第 %1$d 頁"
diff --git a/src/autosave-manager.c b/src/autosave-manager.c
index 58a0392..2536d49 100644
--- a/src/autosave-manager.c
+++ b/src/autosave-manager.c
@@ -1,4 +1,4 @@
-/* autosave-manager.c generated by valac 0.28.0, the Vala compiler
+/* autosave-manager.c generated by valac 0.28.1, the Vala compiler
  * generated from autosave-manager.vala, do not modify */
 
 /*
diff --git a/src/book-view.c b/src/book-view.c
index 303ba61..9514351 100644
--- a/src/book-view.c
+++ b/src/book-view.c
@@ -1,8 +1,8 @@
-/* book-view.c generated by valac 0.28.0, the Vala compiler
+/* book-view.c generated by valac 0.28.1, the Vala compiler
  * generated from book-view.vala, do not modify */
 
 /*
- * Copyright (C) 2009-2011 Canonical Ltd.
+ * Copyright (C) 2009-2015 Canonical Ltd.
  * Author: Robert Ancell <robert.ancell@canonical.com>
  *
  * This program is free software: you can redistribute it and/or modify it under
diff --git a/src/book-view.vala b/src/book-view.vala
index 08439be..069525e 100644
--- a/src/book-view.vala
+++ b/src/book-view.vala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2011 Canonical Ltd.
+ * Copyright (C) 2009-2015 Canonical Ltd.
  * Author: Robert Ancell <robert.ancell@canonical.com>
  *
  * This program is free software: you can redistribute it and/or modify it under
diff --git a/src/book.c b/src/book.c
index 969c8de..3808ce5 100644
--- a/src/book.c
+++ b/src/book.c
@@ -1,8 +1,8 @@
-/* book.c generated by valac 0.28.0, the Vala compiler
+/* book.c generated by valac 0.28.1, the Vala compiler
  * generated from book.vala, do not modify */
 
 /*
- * Copyright (C) 2009-2011 Canonical Ltd.
+ * Copyright (C) 2009-2015 Canonical Ltd.
  * Author: Robert Ancell <robert.ancell@canonical.com>
  *
  * This program is free software: you can redistribute it and/or modify it under
diff --git a/src/book.vala b/src/book.vala
index db9be0b..5782838 100644
--- a/src/book.vala
+++ b/src/book.vala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2011 Canonical Ltd.
+ * Copyright (C) 2009-2015 Canonical Ltd.
  * Author: Robert Ancell <robert.ancell@canonical.com>
  *
  * This program is free software: you can redistribute it and/or modify it under
diff --git a/src/page-view.c b/src/page-view.c
index 3a4d582..102fb15 100644
--- a/src/page-view.c
+++ b/src/page-view.c
@@ -1,8 +1,8 @@
-/* page-view.c generated by valac 0.28.0, the Vala compiler
+/* page-view.c generated by valac 0.28.1, the Vala compiler
  * generated from page-view.vala, do not modify */
 
 /*
- * Copyright (C) 2009-2011 Canonical Ltd.
+ * Copyright (C) 2009-2015 Canonical Ltd.
  * Author: Robert Ancell <robert.ancell@canonical.com>
  *
  * This program is free software: you can redistribute it and/or modify it under
diff --git a/src/page-view.vala b/src/page-view.vala
index c982c4b..03fecfb 100644
--- a/src/page-view.vala
+++ b/src/page-view.vala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2011 Canonical Ltd.
+ * Copyright (C) 2009-2015 Canonical Ltd.
  * Author: Robert Ancell <robert.ancell@canonical.com>
  *
  * This program is free software: you can redistribute it and/or modify it under
diff --git a/src/page.c b/src/page.c
index 5fc7d4b..715ff11 100644
--- a/src/page.c
+++ b/src/page.c
@@ -1,8 +1,8 @@
-/* page.c generated by valac 0.28.0, the Vala compiler
+/* page.c generated by valac 0.28.1, the Vala compiler
  * generated from page.vala, do not modify */
 
 /*
- * Copyright (C) 2009-2011 Canonical Ltd.
+ * Copyright (C) 2009-2015 Canonical Ltd.
  * Author: Robert Ancell <robert.ancell@canonical.com>
  *
  * This program is free software: you can redistribute it and/or modify it under
diff --git a/src/page.vala b/src/page.vala
index a786f50..9636d0d 100644
--- a/src/page.vala
+++ b/src/page.vala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2011 Canonical Ltd.
+ * Copyright (C) 2009-2015 Canonical Ltd.
  * Author: Robert Ancell <robert.ancell@canonical.com>
  *
  * This program is free software: you can redistribute it and/or modify it under
diff --git a/src/scanner.c b/src/scanner.c
index 38fa7e5..227976f 100644
--- a/src/scanner.c
+++ b/src/scanner.c
@@ -1,8 +1,8 @@
-/* scanner.c generated by valac 0.28.0, the Vala compiler
+/* scanner.c generated by valac 0.28.1, the Vala compiler
  * generated from scanner.vala, do not modify */
 
 /*
- * Copyright (C) 2009-2011 Canonical Ltd.
+ * Copyright (C) 2009-2015 Canonical Ltd.
  * Author: Robert Ancell <robert.ancell@canonical.com>
  *
  * This program is free software: you can redistribute it and/or modify it under
diff --git a/src/scanner.vala b/src/scanner.vala
index 5fb7f00..bc2be6d 100644
--- a/src/scanner.vala
+++ b/src/scanner.vala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2011 Canonical Ltd.
+ * Copyright (C) 2009-2015 Canonical Ltd.
  * Author: Robert Ancell <robert.ancell@canonical.com>
  *
  * This program is free software: you can redistribute it and/or modify it under
diff --git a/src/simple-scan.c b/src/simple-scan.c
index 504a0dc..d73c486 100644
--- a/src/simple-scan.c
+++ b/src/simple-scan.c
@@ -1,8 +1,8 @@
-/* simple-scan.c generated by valac 0.28.0, the Vala compiler
+/* simple-scan.c generated by valac 0.28.1, the Vala compiler
  * generated from simple-scan.vala, do not modify */
 
 /*
- * Copyright (C) 2009-2011 Canonical Ltd.
+ * Copyright (C) 2009-2015 Canonical Ltd.
  * Author: Robert Ancell <robert.ancell@canonical.com>
  *
  * This program is free software: you can redistribute it and/or modify it under
diff --git a/src/simple-scan.vala b/src/simple-scan.vala
index 19dd8a2..81e21e4 100644
--- a/src/simple-scan.vala
+++ b/src/simple-scan.vala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2011 Canonical Ltd.
+ * Copyright (C) 2009-2015 Canonical Ltd.
  * Author: Robert Ancell <robert.ancell@canonical.com>
  *
  * This program is free software: you can redistribute it and/or modify it under
diff --git a/src/ui.c b/src/ui.c
index a938838..cdfb433 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -1,8 +1,8 @@
-/* ui.c generated by valac 0.28.0, the Vala compiler
+/* ui.c generated by valac 0.28.1, the Vala compiler
  * generated from ui.vala, do not modify */
 
 /*
- * Copyright (C) 2009-2011 Canonical Ltd.
+ * Copyright (C) 2009-2015 Canonical Ltd.
  * Author: Robert Ancell <robert.ancell@canonical.com>,
  *         Eduard Gotwig <g@ox.io>
  *
@@ -1549,7 +1549,6 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const
 	gboolean _tmp2_ = FALSE;
 	GList* _tmp6_ = NULL;
 	gboolean _tmp53_ = FALSE;
-	gboolean _tmp54_ = FALSE;
 #line 403 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
 #line 405 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -1568,7 +1567,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 1572 "ui.c"
+#line 1571 "ui.c"
 		GtkComboBox* _tmp3_ = NULL;
 		gint _tmp4_ = 0;
 		gint _tmp5_ = 0;
@@ -1580,13 +1579,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 1584 "ui.c"
+#line 1583 "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 1590 "ui.c"
+#line 1589 "ui.c"
 	{
 		GList* device_collection = NULL;
 		GList* device_it = NULL;
@@ -1594,14 +1593,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 1598 "ui.c"
+#line 1597 "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 1605 "ui.c"
+#line 1604 "ui.c"
 			{
 				gint n_delete = 0;
 				GtkListStore* _tmp8_ = NULL;
@@ -1622,18 +1621,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 1626 "ui.c"
+#line 1625 "ui.c"
 					gint i = 0;
 #line 426 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					i = 0;
-#line 1630 "ui.c"
+#line 1629 "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 1637 "ui.c"
+#line 1636 "ui.c"
 							gchar* name = NULL;
 							gboolean matched = FALSE;
 							GtkListStore* _tmp15_ = NULL;
@@ -1645,7 +1644,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 1649 "ui.c"
+#line 1648 "ui.c"
 								GtkListStore* _tmp13_ = NULL;
 								gboolean _tmp14_ = FALSE;
 #line 441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -1656,7 +1655,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 1660 "ui.c"
+#line 1659 "ui.c"
 								}
 							}
 #line 427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -1679,7 +1678,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 1683 "ui.c"
+#line 1682 "ui.c"
 								gint _tmp21_ = 0;
 #line 437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_tmp21_ = i;
@@ -1689,7 +1688,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 1693 "ui.c"
+#line 1692 "ui.c"
 							}
 #line 440 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp22_ = i;
@@ -1697,7 +1696,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 1701 "ui.c"
+#line 1700 "ui.c"
 						}
 					}
 				}
@@ -1705,7 +1704,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 1709 "ui.c"
+#line 1708 "ui.c"
 					gint i = 0;
 					GtkListStore* _tmp24_ = NULL;
 					GtkTreeIter _tmp25_ = {0};
@@ -1721,7 +1720,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 1725 "ui.c"
+#line 1724 "ui.c"
 					{
 						gboolean _tmp28_ = FALSE;
 #line 452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -1730,7 +1729,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 1734 "ui.c"
+#line 1733 "ui.c"
 							gint _tmp30_ = 0;
 							gint _tmp31_ = 0;
 							GtkListStore* _tmp32_ = NULL;
@@ -1740,13 +1739,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 1744 "ui.c"
+#line 1743 "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 1750 "ui.c"
+#line 1749 "ui.c"
 							}
 #line 452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp28_ = FALSE;
@@ -1758,7 +1757,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 1762 "ui.c"
+#line 1761 "ui.c"
 							}
 #line 454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp32_ = self->priv->device_model;
@@ -1774,7 +1773,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 1778 "ui.c"
+#line 1777 "ui.c"
 						}
 					}
 				} else {
@@ -1809,7 +1808,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 1813 "ui.c"
+#line 1812 "ui.c"
 				}
 #line 463 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp46_ = index;
@@ -1817,13 +1816,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 1821 "ui.c"
+#line 1820 "ui.c"
 			}
 		}
 	}
 #line 467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	while (TRUE) {
-#line 1827 "ui.c"
+#line 1826 "ui.c"
 		GtkListStore* _tmp47_ = NULL;
 		gint _tmp48_ = 0;
 		GtkTreeIter _tmp49_ = {0};
@@ -1842,7 +1841,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 1846 "ui.c"
+#line 1845 "ui.c"
 		}
 #line 468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp51_ = self->priv->device_model;
@@ -1850,39 +1849,75 @@ 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 1854 "ui.c"
+#line 1853 "ui.c"
 	}
 #line 471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp54_ = have_selection;
+	_tmp53_ = have_selection;
 #line 471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (!_tmp54_) {
-#line 1860 "ui.c"
-		GList* _tmp55_ = NULL;
-#line 471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp55_ = devices;
-#line 471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp53_ = _tmp55_ != NULL;
-#line 1866 "ui.c"
-	} else {
-#line 471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp53_ = FALSE;
-#line 1870 "ui.c"
-	}
+	if (!_tmp53_) {
+#line 1859 "ui.c"
+		gchar* device = NULL;
+		GSettings* _tmp54_ = NULL;
+		gchar* _tmp55_ = NULL;
+		gboolean _tmp56_ = FALSE;
+		const gchar* _tmp57_ = NULL;
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp54_ = self->priv->settings;
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp55_ = g_settings_get_string (_tmp54_, "selected-device");
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		device = _tmp55_;
+#line 474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp57_ = device;
+#line 474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		if (_tmp57_ != NULL) {
+#line 1875 "ui.c"
+			const gchar* _tmp58_ = NULL;
+			GtkTreeIter _tmp59_ = {0};
+			gboolean _tmp60_ = FALSE;
+#line 474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp58_ = device;
+#line 474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp60_ = user_interface_find_scan_device (self, _tmp58_, &_tmp59_);
+#line 474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			iter = _tmp59_;
+#line 474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp56_ = _tmp60_;
+#line 1887 "ui.c"
+		} else {
+#line 474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp56_ = FALSE;
+#line 1891 "ui.c"
+		}
+#line 474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		if (_tmp56_) {
+#line 1895 "ui.c"
+			GtkComboBox* _tmp61_ = NULL;
+			GtkTreeIter _tmp62_ = {0};
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp61_ = self->priv->device_combo;
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_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"
+		} 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 471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp53_) {
-#line 1874 "ui.c"
-		GtkComboBox* _tmp56_ = NULL;
-#line 472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp56_ = self->priv->device_combo;
-#line 472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_combo_box_set_active (_tmp56_, 0);
-#line 1880 "ui.c"
+		_g_free0 (device);
+#line 1915 "ui.c"
 	}
-#line 474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->setting_devices = FALSE;
-#line 476 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_info_bar (self);
-#line 1886 "ui.c"
+#line 1921 "ui.c"
 }
 
 
@@ -1895,69 +1930,69 @@ static void user_interface_add_default_page (UserInterface* self) {
 	Page* _tmp4_ = NULL;
 	Book* _tmp5_ = NULL;
 	BookView* _tmp6_ = NULL;
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 485 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 481 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 487 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->default_page_width;
-#line 481 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 487 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->default_page_height;
-#line 481 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 487 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = self->priv->default_page_dpi;
-#line 481 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 487 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->default_page_scan_direction;
-#line 481 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 487 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page_new (_tmp0_, _tmp1_, _tmp2_, _tmp3_);
-#line 481 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 487 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp4_;
-#line 485 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = self->priv->_book;
-#line 485 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_append_page (_tmp5_, page);
-#line 486 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = self->priv->book_view;
-#line 486 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_view_set_selected_page (_tmp6_, page);
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 485 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 1923 "ui.c"
+#line 1958 "ui.c"
 }
 
 
 static Block1Data* block1_data_ref (Block1Data* _data1_) {
-#line 489 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_atomic_int_inc (&_data1_->_ref_count_);
-#line 489 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return _data1_;
-#line 1932 "ui.c"
+#line 1967 "ui.c"
 }
 
 
 static void block1_data_unref (void * _userdata_) {
 	Block1Data* _data1_;
 	_data1_ = (Block1Data*) _userdata_;
-#line 489 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) {
-#line 1941 "ui.c"
+#line 1976 "ui.c"
 		UserInterface* self;
-#line 489 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self = _data1_->self;
-#line 489 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (_data1_->file_type_combo);
-#line 489 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (_data1_->file_type_store);
-#line 489 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (self);
-#line 489 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_slice_free (Block1Data, _data1_);
-#line 1953 "ui.c"
+#line 1988 "ui.c"
 	}
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 517 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1961 "ui.c"
+#line 1996 "ui.c"
 }
 
 
@@ -1982,7 +2017,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 1986 "ui.c"
+#line 2021 "ui.c"
 		gchar* _tmp4_ = NULL;
 #line 934 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
@@ -1990,13 +2025,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 1994 "ui.c"
+#line 2029 "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 2000 "ui.c"
+#line 2035 "ui.c"
 	}
 }
 
@@ -2030,7 +2065,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 2034 "ui.c"
+#line 2069 "ui.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 #line 1233 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
@@ -2039,13 +2074,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 2043 "ui.c"
+#line 2078 "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 2049 "ui.c"
+#line 2084 "ui.c"
 		glong _tmp6_ = 0L;
 		glong _tmp7_ = 0L;
 #line 1236 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
@@ -2054,13 +2089,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 2058 "ui.c"
+#line 2093 "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 2064 "ui.c"
+#line 2099 "ui.c"
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
 #line 1238 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
@@ -2069,11 +2104,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 2073 "ui.c"
+#line 2108 "ui.c"
 	} else {
 #line 1238 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp8_ = FALSE;
-#line 2077 "ui.c"
+#line 2112 "ui.c"
 	}
 #line 1238 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp8_, NULL);
@@ -2081,7 +2116,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 2085 "ui.c"
+#line 2120 "ui.c"
 		glong _tmp14_ = 0L;
 		glong _tmp15_ = 0L;
 #line 1239 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
@@ -2090,11 +2125,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 2094 "ui.c"
+#line 2129 "ui.c"
 	} else {
 #line 1239 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp12_ = FALSE;
-#line 2098 "ui.c"
+#line 2133 "ui.c"
 	}
 #line 1239 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp12_, NULL);
@@ -2116,7 +2151,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 2120 "ui.c"
+#line 2155 "ui.c"
 }
 
 
@@ -2143,99 +2178,99 @@ static void __lambda5_ (Block1Data* _data1_) {
 	gchar* _tmp18_ = NULL;
 	GtkFileChooserDialog* _tmp19_ = NULL;
 	const gchar* _tmp20_ = NULL;
-#line 561 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = _data1_->self;
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = g_strdup ("");
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	extension = _tmp0_;
-#line 565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _data1_->file_type_combo;
-#line 565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = gtk_combo_box_get_active_iter (_tmp1_, &_tmp2_);
-#line 565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	i = _tmp2_;
-#line 565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp3_) {
-#line 2161 "ui.c"
+#line 2196 "ui.c"
 		GtkListStore* _tmp4_ = NULL;
 		GtkTreeIter _tmp5_ = {0};
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = _data1_->file_type_store;
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = i;
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_tree_model_get ((GtkTreeModel*) _tmp4_, &_tmp5_, 1, &extension, -1, -1);
-#line 2170 "ui.c"
+#line 2205 "ui.c"
 	}
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 574 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = self->priv->save_dialog;
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 574 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = gtk_file_chooser_get_filename ((GtkFileChooser*) _tmp6_);
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 574 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	path = _tmp7_;
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = path;
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = g_path_get_basename (_tmp8_);
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	filename = _tmp9_;
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = filename;
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = string_last_index_of_char (_tmp10_, (gunichar) '.', 0);
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	extension_index = _tmp11_;
-#line 573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = extension_index;
-#line 573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp12_ >= 0) {
-#line 2194 "ui.c"
+#line 2229 "ui.c"
 		const gchar* _tmp13_ = NULL;
 		gint _tmp14_ = 0;
 		gchar* _tmp15_ = NULL;
-#line 574 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp13_ = filename;
-#line 574 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp14_ = extension_index;
-#line 574 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = string_slice (_tmp13_, (glong) 0, (glong) _tmp14_);
-#line 574 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (filename);
-#line 574 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		filename = _tmp15_;
-#line 2208 "ui.c"
+#line 2243 "ui.c"
 	}
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = filename;
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp17_ = extension;
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = g_strconcat (_tmp16_, _tmp17_, NULL);
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (filename);
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	filename = _tmp18_;
-#line 576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp19_ = self->priv->save_dialog;
-#line 576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp20_ = filename;
-#line 576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_chooser_set_current_name ((GtkFileChooser*) _tmp19_, _tmp20_);
-#line 561 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (filename);
-#line 561 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (path);
-#line 561 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (extension);
-#line 2232 "ui.c"
+#line 2267 "ui.c"
 }
 
 
 static void ___lambda5__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 561 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	__lambda5_ (self);
-#line 2239 "ui.c"
+#line 2274 "ui.c"
 }
 
 
@@ -2324,279 +2359,279 @@ static gchar* user_interface_choose_file_location (UserInterface* self) {
 	gchar* _tmp94_ = NULL;
 	gchar* _tmp95_ = NULL;
 	GtkFileChooserDialog* _tmp96_ = NULL;
-#line 489 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 489 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data1_ = g_slice_new0 (Block1Data);
-#line 489 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data1_->_ref_count_ = 1;
-#line 489 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data1_->self = g_object_ref (self);
-#line 492 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 498 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	directory = NULL;
-#line 493 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->settings;
-#line 493 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_settings_get_string (_tmp0_, "save-directory");
-#line 493 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (directory);
-#line 493 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	directory = _tmp1_;
-#line 495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = directory;
-#line 495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp3_ == NULL) {
-#line 495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = TRUE;
-#line 2352 "ui.c"
+#line 2387 "ui.c"
 	} else {
 		const gchar* _tmp4_ = NULL;
-#line 495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = directory;
-#line 495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = g_strcmp0 (_tmp4_, "") == 0;
-#line 2359 "ui.c"
+#line 2394 "ui.c"
 	}
-#line 495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 2363 "ui.c"
+#line 2398 "ui.c"
 		const gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = g_get_user_special_dir (G_USER_DIRECTORY_DOCUMENTS);
-#line 496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = g_strdup (_tmp5_);
-#line 496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (directory);
-#line 496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		directory = _tmp6_;
-#line 2374 "ui.c"
+#line 2409 "ui.c"
 	}
-#line 498 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 504 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = _ ("Save As...");
-#line 498 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 504 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = _ ("_Cancel");
-#line 498 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 504 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = _ ("_Save");
-#line 498 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 504 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = (GtkFileChooserDialog*) gtk_file_chooser_dialog_new (_tmp7_, (GtkWindow*) self, GTK_FILE_CHOOSER_ACTION_SAVE, _tmp8_, GTK_RESPONSE_CANCEL, _tmp9_, GTK_RESPONSE_ACCEPT, NULL, NULL);
-#line 498 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 504 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp10_);
-#line 498 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 504 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->save_dialog);
-#line 498 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 504 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->save_dialog = _tmp10_;
-#line 505 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = self->priv->save_dialog;
-#line 505 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_chooser_set_do_overwrite_confirmation ((GtkFileChooser*) _tmp11_, TRUE);
-#line 506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = self->priv->save_dialog;
-#line 506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_chooser_set_local_only ((GtkFileChooser*) _tmp12_, FALSE);
-#line 507 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 513 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = self->priv->save_dialog;
-#line 507 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 513 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = directory;
-#line 507 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 513 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_chooser_set_current_folder ((GtkFileChooser*) _tmp13_, _tmp14_);
-#line 509 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = self->priv->save_dialog;
-#line 509 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = _ ("Scanned Document.pdf");
-#line 509 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_chooser_set_current_name ((GtkFileChooser*) _tmp15_, _tmp16_);
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 518 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp17_ = gtk_file_filter_new ();
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 518 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp17_);
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 518 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	filter = _tmp17_;
-#line 513 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = filter;
-#line 513 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp19_ = _ ("Image Files");
-#line 513 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_filter_set_name (_tmp18_, _tmp19_);
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 521 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp20_ = filter;
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 521 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_filter_add_pixbuf_formats (_tmp20_);
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp21_ = filter;
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_filter_add_mime_type (_tmp21_, "application/pdf");
-#line 517 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp22_ = self->priv->save_dialog;
-#line 517 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp23_ = filter;
-#line 517 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp24_ = _g_object_ref0 (_tmp23_);
-#line 517 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_chooser_add_filter ((GtkFileChooser*) _tmp22_, _tmp24_);
-#line 518 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp25_ = gtk_file_filter_new ();
-#line 518 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp25_);
-#line 518 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (filter);
-#line 518 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	filter = _tmp25_;
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 525 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp26_ = filter;
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 525 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp27_ = _ ("All Files");
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 525 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_filter_set_name (_tmp26_, _tmp27_);
-#line 521 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp28_ = filter;
-#line 521 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_filter_add_pattern (_tmp28_, "*");
-#line 522 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp29_ = self->priv->save_dialog;
-#line 522 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp30_ = filter;
-#line 522 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp31_ = _g_object_ref0 (_tmp30_);
-#line 522 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_chooser_add_filter ((GtkFileChooser*) _tmp29_, _tmp31_);
-#line 524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp32_ = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING, -1);
-#line 524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data1_->file_type_store = _tmp32_;
-#line 526 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 532 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp33_ = _data1_->file_type_store;
-#line 526 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 532 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_append (_tmp33_, &_tmp34_);
-#line 526 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 532 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp34_;
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp35_ = _data1_->file_type_store;
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp36_ = iter;
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp37_ = _ ("PDF (multi-page document)");
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_set (_tmp35_, &_tmp36_, 0, _tmp37_, 1, ".pdf", -1, -1);
-#line 532 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp38_ = _data1_->file_type_store;
-#line 532 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_append (_tmp38_, &_tmp39_);
-#line 532 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp39_;
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp40_ = _data1_->file_type_store;
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp41_ = iter;
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp42_ = _ ("JPEG (compressed)");
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_set (_tmp40_, &_tmp41_, 0, _tmp42_, 1, ".jpg", -1, -1);
-#line 538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp43_ = _data1_->file_type_store;
-#line 538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_append (_tmp43_, &_tmp44_);
-#line 538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp44_;
-#line 539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp45_ = _data1_->file_type_store;
-#line 539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp46_ = iter;
-#line 539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp47_ = _ ("PNG (lossless)");
-#line 539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp45_, &_tmp46_, 0, _tmp47_, 1, ".png", -1, -1);
 #line 545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_set (_tmp45_, &_tmp46_, 0, _tmp47_, 1, ".png", -1, -1);
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp48_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
-#line 545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp48_);
-#line 545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	box = _tmp48_;
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 552 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp49_ = box;
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 552 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp49_, TRUE);
-#line 547 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp50_ = self->priv->save_dialog;
-#line 547 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp51_ = box;
-#line 547 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_chooser_set_extra_widget ((GtkFileChooser*) _tmp50_, (GtkWidget*) _tmp51_);
-#line 550 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp52_ = _ ("File format:");
-#line 550 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp53_ = (GtkLabel*) gtk_label_new (_tmp52_);
-#line 550 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp53_);
-#line 550 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	label = _tmp53_;
-#line 551 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp54_ = label;
-#line 551 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp54_, TRUE);
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 558 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp55_ = box;
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 558 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp56_ = label;
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 558 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (_tmp55_, (GtkWidget*) _tmp56_, FALSE, FALSE, (guint) 0);
-#line 554 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp57_ = _data1_->file_type_store;
-#line 554 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp58_ = (GtkComboBox*) gtk_combo_box_new_with_model ((GtkTreeModel*) _tmp57_);
-#line 554 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp58_);
-#line 554 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data1_->file_type_combo = _tmp58_;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp59_ = _data1_->file_type_combo;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp59_, TRUE);
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp60_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp60_);
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	renderer = _tmp60_;
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp61_ = _data1_->file_type_combo;
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp62_ = renderer;
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp61_, (GtkCellRenderer*) _tmp62_, TRUE);
-#line 558 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp63_ = _data1_->file_type_combo;
-#line 558 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp64_ = renderer;
-#line 558 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp63_, (GtkCellRenderer*) _tmp64_, "text", 0);
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp65_ = _data1_->file_type_combo;
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_combo_box_set_active (_tmp65_, 0);
-#line 561 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp66_ = _data1_->file_type_combo;
-#line 561 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_data (_tmp66_, "changed", (GCallback) ___lambda5__gtk_combo_box_changed, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0);
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp67_ = box;
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp68_ = _data1_->file_type_combo;
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (_tmp67_, (GtkWidget*) _tmp68_, FALSE, FALSE, (guint) 0);
-#line 580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 586 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp69_ = self->priv->save_dialog;
-#line 580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 586 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp70_ = gtk_dialog_run ((GtkDialog*) _tmp69_);
-#line 580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 586 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	response = _tmp70_;
-#line 582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	uri = NULL;
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 589 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp71_ = response;
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 589 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp71_ == ((gint) GTK_RESPONSE_ACCEPT)) {
-#line 2600 "ui.c"
+#line 2635 "ui.c"
 		gchar* extension = NULL;
 		gchar* _tmp72_ = NULL;
 		GtkTreeIter i = {0};
@@ -2617,128 +2652,128 @@ static gchar* user_interface_choose_file_location (UserInterface* self) {
 		GFile* _tmp89_ = NULL;
 		GFile* _tmp90_ = NULL;
 		gchar* _tmp91_ = NULL;
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp72_ = g_strdup ("");
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		extension = _tmp72_;
-#line 587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp73_ = _data1_->file_type_combo;
-#line 587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp75_ = gtk_combo_box_get_active_iter (_tmp73_, &_tmp74_);
-#line 587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		i = _tmp74_;
-#line 587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp75_) {
-#line 2633 "ui.c"
+#line 2668 "ui.c"
 			GtkListStore* _tmp76_ = NULL;
 			GtkTreeIter _tmp77_ = {0};
-#line 588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp76_ = _data1_->file_type_store;
-#line 588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp77_ = i;
-#line 588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			gtk_tree_model_get ((GtkTreeModel*) _tmp76_, &_tmp77_, 1, &extension, -1, -1);
-#line 2642 "ui.c"
+#line 2677 "ui.c"
 		}
-#line 590 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp78_ = self->priv->save_dialog;
-#line 590 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp79_ = gtk_file_chooser_get_filename ((GtkFileChooser*) _tmp78_);
-#line 590 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		path = _tmp79_;
-#line 591 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp80_ = path;
-#line 591 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp81_ = g_path_get_basename (_tmp80_);
-#line 591 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		filename = _tmp81_;
-#line 593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp82_ = filename;
-#line 593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp83_ = string_last_index_of_char (_tmp82_, (gunichar) '.', 0);
-#line 593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		extension_index = _tmp83_;
-#line 594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp84_ = extension_index;
-#line 594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp84_ < 0) {
-#line 2666 "ui.c"
+#line 2701 "ui.c"
 			const gchar* _tmp85_ = NULL;
 			const gchar* _tmp86_ = NULL;
 			gchar* _tmp87_ = NULL;
-#line 595 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp85_ = path;
-#line 595 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp86_ = extension;
-#line 595 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp87_ = g_strconcat (_tmp85_, _tmp86_, NULL);
-#line 595 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_free0 (path);
-#line 595 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			path = _tmp87_;
-#line 2680 "ui.c"
+#line 2715 "ui.c"
 		}
-#line 597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp88_ = path;
-#line 597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp89_ = g_file_new_for_path (_tmp88_);
-#line 597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp90_ = _tmp89_;
-#line 597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp91_ = g_file_get_uri (_tmp90_);
-#line 597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri);
-#line 597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		uri = _tmp91_;
-#line 597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (_tmp90_);
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 589 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (filename);
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 589 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 589 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (extension);
-#line 2702 "ui.c"
+#line 2737 "ui.c"
 	}
-#line 600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 606 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp92_ = self->priv->settings;
-#line 600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 606 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp93_ = self->priv->save_dialog;
-#line 600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 606 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp94_ = gtk_file_chooser_get_current_folder ((GtkFileChooser*) _tmp93_);
-#line 600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 606 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp95_ = _tmp94_;
-#line 600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 606 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_string (_tmp92_, "save-directory", _tmp95_);
-#line 600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 606 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (_tmp95_);
-#line 602 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp96_ = self->priv->save_dialog;
-#line 602 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_destroy ((GtkWidget*) _tmp96_);
-#line 603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->save_dialog);
-#line 603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->save_dialog = NULL;
-#line 605 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = uri;
-#line 605 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (renderer);
-#line 605 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (label);
-#line 605 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (box);
-#line 605 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (filter);
-#line 605 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (directory);
-#line 605 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	block1_data_unref (_data1_);
-#line 605 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data1_ = NULL;
-#line 605 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 2742 "ui.c"
+#line 2777 "ui.c"
 }
 
 
@@ -2763,194 +2798,194 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 	gchar* _tmp39_ = NULL;
 	Book* _tmp40_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 614 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->book_uri;
-#line 611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp1_ != NULL) {
-#line 2773 "ui.c"
+#line 2808 "ui.c"
 		gboolean _tmp2_ = FALSE;
-#line 611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = force_choose_location;
-#line 611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = !_tmp2_;
-#line 2779 "ui.c"
+#line 2814 "ui.c"
 	} else {
-#line 611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = FALSE;
-#line 2783 "ui.c"
+#line 2818 "ui.c"
 	}
-#line 611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
-#line 2787 "ui.c"
+#line 2822 "ui.c"
 		const gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
-#line 612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = self->priv->book_uri;
-#line 612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = g_strdup (_tmp3_);
-#line 612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri);
-#line 612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		uri = _tmp4_;
-#line 2798 "ui.c"
+#line 2833 "ui.c"
 	} else {
 		gchar* _tmp5_ = NULL;
-#line 614 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = user_interface_choose_file_location (self);
-#line 614 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri);
-#line 614 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		uri = _tmp5_;
-#line 2807 "ui.c"
+#line 2842 "ui.c"
 	}
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = uri;
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp6_ == NULL) {
-#line 616 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = FALSE;
-#line 616 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri);
-#line 616 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 2819 "ui.c"
+#line 2854 "ui.c"
 	}
-#line 618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 624 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = uri;
-#line 618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 624 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = g_file_new_for_uri (_tmp7_);
-#line 618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 624 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	file = _tmp8_;
-#line 620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = uri;
-#line 620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_debug ("ui.vala:620: Saving to '%s'", _tmp9_);
-#line 622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_debug ("ui.vala:626: Saving to '%s'", _tmp9_);
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = uri;
-#line 622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = g_utf8_strdown (_tmp10_, (gssize) (-1));
-#line 622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	uri_lower = _tmp11_;
-#line 623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = g_strdup ("jpeg");
-#line 623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	format = _tmp12_;
-#line 624 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = uri_lower;
-#line 624 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = g_str_has_suffix (_tmp13_, ".pdf");
-#line 624 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp14_) {
-#line 2847 "ui.c"
+#line 2882 "ui.c"
 		gchar* _tmp15_ = NULL;
-#line 625 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = g_strdup ("pdf");
-#line 625 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (format);
-#line 625 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		format = _tmp15_;
-#line 2855 "ui.c"
+#line 2890 "ui.c"
 	} else {
 		const gchar* _tmp16_ = NULL;
 		gboolean _tmp17_ = FALSE;
-#line 626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp16_ = uri_lower;
-#line 626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp17_ = g_str_has_suffix (_tmp16_, ".ps");
-#line 626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp17_) {
-#line 2865 "ui.c"
+#line 2900 "ui.c"
 			gchar* _tmp18_ = NULL;
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp18_ = g_strdup ("ps");
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_free0 (format);
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			format = _tmp18_;
-#line 2873 "ui.c"
+#line 2908 "ui.c"
 		} else {
 			const gchar* _tmp19_ = NULL;
 			gboolean _tmp20_ = FALSE;
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp19_ = uri_lower;
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp20_ = g_str_has_suffix (_tmp19_, ".png");
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (_tmp20_) {
-#line 2883 "ui.c"
+#line 2918 "ui.c"
 				gchar* _tmp21_ = NULL;
-#line 629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp21_ = g_strdup ("png");
-#line 629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (format);
-#line 629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				format = _tmp21_;
-#line 2891 "ui.c"
+#line 2926 "ui.c"
 			} else {
 				gboolean _tmp22_ = FALSE;
 				const gchar* _tmp23_ = NULL;
 				gboolean _tmp24_ = FALSE;
-#line 630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp23_ = uri_lower;
-#line 630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp24_ = g_str_has_suffix (_tmp23_, ".tif");
-#line 630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp24_) {
-#line 630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp22_ = TRUE;
-#line 2904 "ui.c"
+#line 2939 "ui.c"
 				} else {
 					const gchar* _tmp25_ = NULL;
 					gboolean _tmp26_ = FALSE;
-#line 630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp25_ = uri_lower;
-#line 630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp26_ = g_str_has_suffix (_tmp25_, ".tiff");
-#line 630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp22_ = _tmp26_;
-#line 2914 "ui.c"
+#line 2949 "ui.c"
 				}
-#line 630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp22_) {
-#line 2918 "ui.c"
+#line 2953 "ui.c"
 					gchar* _tmp27_ = NULL;
-#line 631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp27_ = g_strdup ("tiff");
-#line 631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_g_free0 (format);
-#line 631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					format = _tmp27_;
-#line 2926 "ui.c"
+#line 2961 "ui.c"
 				}
 			}
 		}
 	}
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 639 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_show_progress_dialog (self);
-#line 2933 "ui.c"
+#line 2968 "ui.c"
 	{
 		Book* _tmp28_ = NULL;
 		const gchar* _tmp29_ = NULL;
 		gint _tmp30_ = 0;
 		gint _tmp31_ = 0;
 		GFile* _tmp32_ = NULL;
-#line 636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 642 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp28_ = self->priv->_book;
-#line 636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 642 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp29_ = format;
-#line 636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 642 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp30_ = user_interface_get_quality (self);
-#line 636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 642 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp31_ = _tmp30_;
-#line 636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 642 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp32_ = file;
-#line 636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 642 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		book_save (_tmp28_, _tmp29_, _tmp31_, _tmp32_, &_inner_error_);
-#line 636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 642 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2954 "ui.c"
+#line 2989 "ui.c"
 			goto __catch17_g_error;
 		}
 	}
@@ -2963,86 +2998,86 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 		const gchar* _tmp35_ = NULL;
 		GError* _tmp36_ = NULL;
 		const gchar* _tmp37_ = NULL;
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_inner_error_ = NULL;
 #line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_inner_error_ = NULL;
+#line 646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_hide_progress_dialog (self);
-#line 641 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp33_ = e;
-#line 641 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp34_ = _tmp33_->message;
-#line 641 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_warning ("ui.vala:641: Error saving file: %s", _tmp34_);
-#line 642 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_warning ("ui.vala:647: Error saving file: %s", _tmp34_);
+#line 648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp35_ = _ ("Failed to save file");
-#line 642 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp36_ = e;
-#line 642 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp37_ = _tmp36_->message;
-#line 642 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_show_error (self, _tmp35_, _tmp37_, FALSE);
-#line 646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = FALSE;
-#line 646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (format);
-#line 646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri_lower);
-#line 646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (file);
-#line 646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri);
-#line 646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 3001 "ui.c"
+#line 3036 "ui.c"
 	}
 	__finally17:
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (format);
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri_lower);
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (file);
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri);
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 640 "/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 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return FALSE;
-#line 3020 "ui.c"
+#line 3055 "ui.c"
 	}
-#line 649 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp38_ = uri;
-#line 649 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp39_ = g_strdup (_tmp38_);
-#line 649 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->book_uri);
-#line 649 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->book_uri = _tmp39_;
-#line 650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp40_ = self->priv->_book;
-#line 650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_set_needs_saving (_tmp40_, FALSE);
-#line 651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = TRUE;
-#line 651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (format);
-#line 651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (uri_lower);
-#line 651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (file);
-#line 651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (uri);
-#line 651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 3046 "ui.c"
+#line 3081 "ui.c"
 }
 
 
@@ -3067,124 +3102,124 @@ static gboolean user_interface_prompt_to_save (UserInterface* self, const gchar*
 	gint _tmp14_ = 0;
 	GtkMessageDialog* _tmp15_ = NULL;
 	gint _tmp16_ = 0;
-#line 654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (title != NULL, FALSE);
-#line 654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (discard_label != NULL, FALSE);
-#line 656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->_book;
-#line 656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_get_needs_saving (_tmp0_);
-#line 656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp2_) {
-#line 657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = TRUE;
-#line 657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 3089 "ui.c"
+#line 3124 "ui.c"
 	}
-#line 659 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 665 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = title;
-#line 659 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 665 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) self, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, "%s", _tmp3_);
-#line 659 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 665 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp4_);
-#line 659 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 665 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	dialog = _tmp4_;
-#line 664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = dialog;
-#line 664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = _ ("If you don't save, changes will be permanently lost.");
-#line 664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_message_dialog_format_secondary_text (_tmp5_, "%s", _tmp6_);
-#line 667 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = dialog;
-#line 667 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = discard_label;
-#line 667 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_dialog_add_button ((GtkDialog*) _tmp7_, _tmp8_, (gint) GTK_RESPONSE_NO);
-#line 668 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 674 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = dialog;
-#line 668 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 674 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = _ ("_Cancel");
-#line 668 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 674 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_dialog_add_button ((GtkDialog*) _tmp9_, _tmp10_, (gint) GTK_RESPONSE_CANCEL);
-#line 669 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = dialog;
-#line 669 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = _ ("_Save");
-#line 669 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_dialog_add_button ((GtkDialog*) _tmp11_, _tmp12_, (gint) GTK_RESPONSE_YES);
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 677 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = dialog;
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 677 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = gtk_dialog_run ((GtkDialog*) _tmp13_);
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 677 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	response = _tmp14_;
-#line 672 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 678 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = dialog;
-#line 672 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 678 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_destroy ((GtkWidget*) _tmp15_);
-#line 674 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = response;
-#line 674 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	switch (_tmp16_) {
-#line 674 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case GTK_RESPONSE_YES:
-#line 3139 "ui.c"
+#line 3174 "ui.c"
 		{
 			gboolean _tmp17_ = FALSE;
-#line 677 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 683 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp17_ = user_interface_save_document (self, FALSE);
-#line 677 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 683 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (_tmp17_) {
-#line 678 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				result = TRUE;
-#line 678 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_object_unref0 (dialog);
-#line 678 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				return result;
-#line 3152 "ui.c"
+#line 3187 "ui.c"
 			} else {
-#line 680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				result = FALSE;
-#line 680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_object_unref0 (dialog);
-#line 680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				return result;
-#line 3160 "ui.c"
+#line 3195 "ui.c"
 			}
 		}
-#line 674 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case GTK_RESPONSE_NO:
-#line 3165 "ui.c"
+#line 3200 "ui.c"
 		{
-#line 682 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			result = TRUE;
-#line 682 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_object_unref0 (dialog);
-#line 682 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			return result;
-#line 3173 "ui.c"
+#line 3208 "ui.c"
 		}
 		default:
 		{
-#line 684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			result = FALSE;
-#line 684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_object_unref0 (dialog);
-#line 684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			return result;
-#line 3183 "ui.c"
+#line 3218 "ui.c"
 		}
 	}
-#line 654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (dialog);
-#line 3188 "ui.c"
+#line 3223 "ui.c"
 }
 
 
@@ -3193,31 +3228,31 @@ static void user_interface_clear_document (UserInterface* self) {
 	Book* _tmp1_ = NULL;
 	GtkMenuItem* _tmp2_ = NULL;
 	GtkMenuItem* _tmp3_ = NULL;
-#line 688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->_book;
-#line 690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_clear (_tmp0_);
-#line 691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_add_default_page (self);
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->book_uri);
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->book_uri = NULL;
-#line 693 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->_book;
-#line 693 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_set_needs_saving (_tmp1_, FALSE);
-#line 694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = self->priv->save_as_menuitem;
-#line 694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp2_, FALSE);
-#line 695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 701 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->copy_to_clipboard_menuitem;
-#line 695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 701 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp3_, FALSE);
-#line 3221 "ui.c"
+#line 3256 "ui.c"
 }
 
 
@@ -3227,60 +3262,60 @@ static void user_interface_new_document (UserInterface* self) {
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
 	gboolean _tmp4_ = FALSE;
-#line 698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 704 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 706 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = _ ("Save current document?");
-#line 700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 706 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _ ("Discard Changes");
-#line 700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 706 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = user_interface_prompt_to_save (self, _tmp0_, _tmp1_);
-#line 700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 706 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp2_) {
-#line 704 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 710 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 3243 "ui.c"
+#line 3278 "ui.c"
 	}
-#line 706 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = user_interface_get_scanning (self);
-#line 706 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = _tmp3_;
-#line 706 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp4_) {
-#line 707 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 713 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_signal_emit_by_name (self, "stop-scan");
-#line 3253 "ui.c"
+#line 3288 "ui.c"
 	}
-#line 708 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 714 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_clear_document (self);
-#line 3257 "ui.c"
+#line 3292 "ui.c"
 }
 
 
 static void user_interface_new_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
-#line 712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 714 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 720 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_new_document (self);
-#line 3268 "ui.c"
+#line 3303 "ui.c"
 }
 
 
 static void _user_interface_new_button_clicked_cb_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_new_button_clicked_cb ((UserInterface*) self, _sender);
-#line 3275 "ui.c"
+#line 3310 "ui.c"
 }
 
 
 void user_interface_new_document_activate_cb (UserInterface* self) {
-#line 717 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 723 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 725 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_new_document (self);
-#line 3284 "ui.c"
+#line 3319 "ui.c"
 }
 
 
@@ -3289,78 +3324,78 @@ static void user_interface_set_document_hint (UserInterface* self, const gchar*
 	gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gboolean _tmp10_ = FALSE;
-#line 722 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 728 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 722 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 728 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (document_hint != NULL);
-#line 724 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 730 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = document_hint;
-#line 724 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 730 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 724 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 730 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->document_hint);
-#line 724 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 730 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->document_hint = _tmp1_;
-#line 726 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = document_hint;
-#line 726 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (g_strcmp0 (_tmp2_, "text") == 0) {
-#line 3309 "ui.c"
+#line 3344 "ui.c"
 		GtkRadioMenuItem* _tmp3_ = NULL;
 		GtkRadioMenuItem* _tmp4_ = NULL;
 		GtkRadioMenuItem* _tmp5_ = NULL;
-#line 728 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = self->priv->text_button_menuitem;
-#line 728 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp3_, TRUE);
-#line 729 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = self->priv->text_button_hb_menuitem;
-#line 729 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp4_, TRUE);
-#line 730 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 736 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = self->priv->text_menuitem;
-#line 730 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 736 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp5_, TRUE);
-#line 3325 "ui.c"
+#line 3360 "ui.c"
 	} else {
 		const gchar* _tmp6_ = NULL;
-#line 732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 738 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = document_hint;
-#line 732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 738 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (g_strcmp0 (_tmp6_, "photo") == 0) {
-#line 3332 "ui.c"
+#line 3367 "ui.c"
 			GtkRadioMenuItem* _tmp7_ = NULL;
 			GtkRadioMenuItem* _tmp8_ = NULL;
 			GtkRadioMenuItem* _tmp9_ = NULL;
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp7_ = self->priv->photo_button_menuitem;
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp7_, TRUE);
-#line 735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 741 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp8_ = self->priv->photo_button_hb_menuitem;
-#line 735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 741 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp8_, TRUE);
-#line 736 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 742 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp9_ = self->priv->photo_menuitem;
-#line 736 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 742 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp9_, TRUE);
-#line 3348 "ui.c"
+#line 3383 "ui.c"
 		}
 	}
-#line 739 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = save;
-#line 739 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp10_) {
-#line 3355 "ui.c"
+#line 3390 "ui.c"
 		GSettings* _tmp11_ = NULL;
 		const gchar* _tmp12_ = NULL;
-#line 740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp11_ = self->priv->settings;
-#line 740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp12_ = document_hint;
-#line 740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_settings_set_string (_tmp11_, "document-type", _tmp12_);
-#line 3364 "ui.c"
+#line 3399 "ui.c"
 	}
 }
 
@@ -3369,21 +3404,21 @@ static void user_interface_text_menuitem_toggled_cb (UserInterface* self, GtkChe
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 750 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 750 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 752 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 752 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 752 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 752 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 753 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_document_hint (self, "text", TRUE);
-#line 3387 "ui.c"
+#line 3422 "ui.c"
 	}
 }
 
@@ -3391,7 +3426,7 @@ static void user_interface_text_menuitem_toggled_cb (UserInterface* self, GtkChe
 static void _user_interface_text_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_text_menuitem_toggled_cb ((UserInterface*) self, _sender);
-#line 3395 "ui.c"
+#line 3430 "ui.c"
 }
 
 
@@ -3399,21 +3434,21 @@ static void user_interface_photo_menuitem_toggled_cb (UserInterface* self, GtkCh
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 751 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 751 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 753 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 759 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 753 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 759 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 753 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 759 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 753 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 759 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 754 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 760 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_document_hint (self, "photo", TRUE);
-#line 3417 "ui.c"
+#line 3452 "ui.c"
 	}
 }
 
@@ -3421,7 +3456,7 @@ static void user_interface_photo_menuitem_toggled_cb (UserInterface* self, GtkCh
 static void _user_interface_photo_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_photo_menuitem_toggled_cb ((UserInterface*) self, _sender);
-#line 3425 "ui.c"
+#line 3460 "ui.c"
 }
 
 
@@ -3430,71 +3465,71 @@ static void user_interface_set_page_side (UserInterface* self, ScanType page_sid
 	GtkListStore* _tmp0_ = NULL;
 	GtkTreeIter _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
-#line 757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 767 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->page_side_model;
-#line 761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 767 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_tree_model_get_iter_first ((GtkTreeModel*) _tmp0_, &_tmp1_);
-#line 761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 767 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp1_;
-#line 761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 767 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 3444 "ui.c"
+#line 3479 "ui.c"
 		{
 			gboolean _tmp3_ = FALSE;
-#line 763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp3_ = TRUE;
-#line 763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			while (TRUE) {
-#line 3451 "ui.c"
+#line 3486 "ui.c"
 				gint s = 0;
 				GtkListStore* _tmp6_ = NULL;
 				GtkTreeIter _tmp7_ = {0};
 				gint _tmp8_ = 0;
 				ScanType _tmp9_ = 0;
-#line 763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (!_tmp3_) {
-#line 3459 "ui.c"
+#line 3494 "ui.c"
 					GtkListStore* _tmp4_ = NULL;
 					gboolean _tmp5_ = FALSE;
-#line 772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp4_ = self->priv->page_side_model;
-#line 772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp5_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp4_, &iter);
-#line 772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					if (!_tmp5_) {
-#line 772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						break;
-#line 3470 "ui.c"
+#line 3505 "ui.c"
 					}
 				}
-#line 763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp3_ = FALSE;
-#line 766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp6_ = self->priv->page_side_model;
-#line 766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp7_ = iter;
-#line 766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				gtk_tree_model_get ((GtkTreeModel*) _tmp6_, &_tmp7_, 0, &s, -1, -1);
-#line 767 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp8_ = s;
-#line 767 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp9_ = page_side;
-#line 767 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp8_ == ((gint) _tmp9_)) {
-#line 3487 "ui.c"
+#line 3522 "ui.c"
 					GtkComboBox* _tmp10_ = NULL;
 					GtkTreeIter _tmp11_ = {0};
-#line 769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 775 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp10_ = self->priv->page_side_combo;
-#line 769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 775 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp11_ = iter;
-#line 769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 775 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_combo_box_set_active_iter (_tmp10_, &_tmp11_);
-#line 770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					return;
-#line 3498 "ui.c"
+#line 3533 "ui.c"
 				}
 			}
 		}
@@ -3507,27 +3542,27 @@ static void user_interface_set_paper_size (UserInterface* self, gint width, gint
 	gboolean have_iter = FALSE;
 	gboolean _tmp14_ = FALSE;
 	gboolean _tmp18_ = FALSE;
-#line 776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 3513 "ui.c"
+#line 3548 "ui.c"
 	{
 		GtkListStore* _tmp0_ = NULL;
 		GtkTreeIter _tmp1_ = {0};
 		gboolean _tmp2_ = FALSE;
 		gboolean _tmp3_ = FALSE;
-#line 781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = self->priv->paper_size_model;
-#line 781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = gtk_tree_model_get_iter_first ((GtkTreeModel*) _tmp0_, &_tmp1_);
-#line 781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		iter = _tmp1_;
-#line 781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		have_iter = _tmp2_;
-#line 781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = TRUE;
-#line 781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		while (TRUE) {
-#line 3531 "ui.c"
+#line 3566 "ui.c"
 			gboolean _tmp6_ = FALSE;
 			gint w = 0;
 			gint h = 0;
@@ -3536,96 +3571,96 @@ static void user_interface_set_paper_size (UserInterface* self, gint width, gint
 			gboolean _tmp9_ = FALSE;
 			gint _tmp10_ = 0;
 			gint _tmp11_ = 0;
-#line 781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (!_tmp3_) {
-#line 3542 "ui.c"
+#line 3577 "ui.c"
 				GtkListStore* _tmp4_ = NULL;
 				gboolean _tmp5_ = FALSE;
-#line 783 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 789 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp4_ = self->priv->paper_size_model;
-#line 783 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 789 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp5_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp4_, &iter);
-#line 783 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 789 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				have_iter = _tmp5_;
-#line 3551 "ui.c"
+#line 3586 "ui.c"
 			}
-#line 781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp3_ = FALSE;
-#line 782 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp6_ = have_iter;
-#line 782 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (!_tmp6_) {
-#line 782 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 3561 "ui.c"
+#line 3596 "ui.c"
 			}
-#line 786 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp7_ = self->priv->paper_size_model;
-#line 786 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp8_ = iter;
-#line 786 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			gtk_tree_model_get ((GtkTreeModel*) _tmp7_, &_tmp8_, 0, &w, 1, &h, -1, -1);
-#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp10_ = w;
-#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp11_ = width;
-#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (_tmp10_ == _tmp11_) {
-#line 3575 "ui.c"
+#line 3610 "ui.c"
 				gint _tmp12_ = 0;
 				gint _tmp13_ = 0;
-#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp12_ = h;
-#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp13_ = height;
-#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp9_ = _tmp12_ == _tmp13_;
-#line 3584 "ui.c"
+#line 3619 "ui.c"
 			} else {
-#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp9_ = FALSE;
-#line 3588 "ui.c"
+#line 3623 "ui.c"
 			}
-#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (_tmp9_) {
-#line 788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 3594 "ui.c"
+#line 3629 "ui.c"
 			}
 		}
 	}
-#line 791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = have_iter;
-#line 791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp14_) {
-#line 3602 "ui.c"
+#line 3637 "ui.c"
 		GtkListStore* _tmp15_ = NULL;
 		GtkTreeIter _tmp16_ = {0};
 		gboolean _tmp17_ = FALSE;
-#line 792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = self->priv->paper_size_model;
-#line 792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp17_ = gtk_tree_model_get_iter_first ((GtkTreeModel*) _tmp15_, &_tmp16_);
-#line 792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		iter = _tmp16_;
-#line 792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		have_iter = _tmp17_;
-#line 3614 "ui.c"
+#line 3649 "ui.c"
 	}
-#line 793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = have_iter;
-#line 793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp18_) {
-#line 3620 "ui.c"
+#line 3655 "ui.c"
 		GtkComboBox* _tmp19_ = NULL;
 		GtkTreeIter _tmp20_ = {0};
-#line 794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp19_ = self->priv->paper_size_combo;
-#line 794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp20_ = iter;
-#line 794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_combo_box_set_active_iter (_tmp19_, &_tmp20_);
-#line 3629 "ui.c"
+#line 3664 "ui.c"
 	}
 }
 
@@ -3637,34 +3672,34 @@ static gint user_interface_get_text_dpi (UserInterface* self) {
 	GtkComboBox* _tmp0_ = NULL;
 	GtkTreeIter _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
-#line 797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 803 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	dpi = USER_INTERFACE_DEFAULT_TEXT_DPI;
-#line 802 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->text_dpi_combo;
-#line 802 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_combo_box_get_active_iter (_tmp0_, &_tmp1_);
-#line 802 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp1_;
-#line 802 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 3653 "ui.c"
+#line 3688 "ui.c"
 		GtkListStore* _tmp3_ = NULL;
 		GtkTreeIter _tmp4_ = {0};
-#line 803 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = self->priv->text_dpi_model;
-#line 803 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = iter;
-#line 803 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_tree_model_get ((GtkTreeModel*) _tmp3_, &_tmp4_, 0, &dpi, -1, -1);
-#line 3662 "ui.c"
+#line 3697 "ui.c"
 	}
-#line 805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 811 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = dpi;
-#line 805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 811 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 3668 "ui.c"
+#line 3703 "ui.c"
 }
 
 
@@ -3675,34 +3710,34 @@ static gint user_interface_get_photo_dpi (UserInterface* self) {
 	GtkComboBox* _tmp0_ = NULL;
 	GtkTreeIter _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
-#line 808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 811 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 817 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	dpi = USER_INTERFACE_DEFAULT_PHOTO_DPI;
-#line 813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->photo_dpi_combo;
-#line 813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_combo_box_get_active_iter (_tmp0_, &_tmp1_);
-#line 813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp1_;
-#line 813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 3691 "ui.c"
+#line 3726 "ui.c"
 		GtkListStore* _tmp3_ = NULL;
 		GtkTreeIter _tmp4_ = {0};
-#line 814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = self->priv->photo_dpi_model;
-#line 814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = iter;
-#line 814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_tree_model_get ((GtkTreeModel*) _tmp3_, &_tmp4_, 0, &dpi, -1, -1);
-#line 3700 "ui.c"
+#line 3735 "ui.c"
 	}
-#line 816 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = dpi;
-#line 816 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 3706 "ui.c"
+#line 3741 "ui.c"
 }
 
 
@@ -3714,36 +3749,36 @@ static ScanType user_interface_get_page_side (UserInterface* self) {
 	GtkTreeIter _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
 	gint _tmp5_ = 0;
-#line 819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 828 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page_side = (gint) SCAN_TYPE_ADF_BOTH;
-#line 824 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->page_side_combo;
-#line 824 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_combo_box_get_active_iter (_tmp0_, &_tmp1_);
-#line 824 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp1_;
-#line 824 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 3730 "ui.c"
+#line 3765 "ui.c"
 		GtkListStore* _tmp3_ = NULL;
 		GtkTreeIter _tmp4_ = {0};
-#line 825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = self->priv->page_side_model;
-#line 825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = iter;
-#line 825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_tree_model_get ((GtkTreeModel*) _tmp3_, &_tmp4_, 0, &page_side, -1, -1);
-#line 3739 "ui.c"
+#line 3774 "ui.c"
 	}
-#line 827 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = page_side;
-#line 827 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = (ScanType) _tmp5_;
-#line 827 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 3747 "ui.c"
+#line 3782 "ui.c"
 }
 
 
@@ -3756,66 +3791,66 @@ static gboolean user_interface_get_paper_size (UserInterface* self, gint* width,
 	GtkComboBox* _tmp1_ = NULL;
 	GtkTreeIter _tmp2_ = {0};
 	gboolean _tmp3_ = FALSE;
-#line 830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 836 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 834 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 840 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_height = 0;
-#line 834 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 840 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = _vala_height;
-#line 834 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 840 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_width = _tmp0_;
-#line 835 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->paper_size_combo;
-#line 835 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = gtk_combo_box_get_active_iter (_tmp1_, &_tmp2_);
-#line 835 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp2_;
-#line 835 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp3_) {
-#line 3776 "ui.c"
+#line 3811 "ui.c"
 		GtkListStore* _tmp4_ = NULL;
 		GtkTreeIter _tmp5_ = {0};
-#line 837 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 843 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = self->priv->paper_size_model;
-#line 837 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 843 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = iter;
-#line 837 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 843 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_tree_model_get ((GtkTreeModel*) _tmp4_, &_tmp5_, 0, &_vala_width, 1, &_vala_height, -1, -1);
-#line 838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = TRUE;
-#line 838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (width) {
-#line 838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			*width = _vala_width;
-#line 3791 "ui.c"
+#line 3826 "ui.c"
 		}
-#line 838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (height) {
-#line 838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			*height = _vala_height;
-#line 3797 "ui.c"
+#line 3832 "ui.c"
 		}
-#line 838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 3801 "ui.c"
+#line 3836 "ui.c"
 	}
-#line 841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 847 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
-#line 841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 847 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (width) {
-#line 841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 847 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*width = _vala_width;
-#line 3809 "ui.c"
+#line 3844 "ui.c"
 	}
-#line 841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 847 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (height) {
-#line 841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 847 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*height = _vala_height;
-#line 3815 "ui.c"
+#line 3850 "ui.c"
 	}
-#line 841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 847 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 3819 "ui.c"
+#line 3854 "ui.c"
 }
 
 
@@ -3834,88 +3869,88 @@ static ScanOptions* user_interface_make_scan_options (UserInterface* self) {
 	ScanOptions* _tmp17_ = NULL;
 	gint _tmp18_ = 0;
 	gint _tmp19_ = 0;
-#line 844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 850 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 846 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 852 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = scan_options_new ();
-#line 846 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 852 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	options = _tmp0_;
-#line 847 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->document_hint;
-#line 847 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (g_strcmp0 (_tmp1_, "text") == 0) {
-#line 3848 "ui.c"
+#line 3883 "ui.c"
 		ScanOptions* _tmp2_ = NULL;
 		ScanOptions* _tmp3_ = NULL;
 		gint _tmp4_ = 0;
 		ScanOptions* _tmp5_ = NULL;
-#line 849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 855 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = options;
-#line 849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 855 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_->scan_mode = SCAN_MODE_GRAY;
-#line 850 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = options;
-#line 850 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = user_interface_get_text_dpi (self);
-#line 850 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_->dpi = _tmp4_;
-#line 851 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = options;
-#line 851 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_->depth = 2;
-#line 3867 "ui.c"
+#line 3902 "ui.c"
 	} else {
 		ScanOptions* _tmp6_ = NULL;
 		ScanOptions* _tmp7_ = NULL;
 		gint _tmp8_ = 0;
 		ScanOptions* _tmp9_ = NULL;
-#line 855 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = options;
-#line 855 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_->scan_mode = SCAN_MODE_COLOR;
-#line 856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = options;
-#line 856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = user_interface_get_photo_dpi (self);
-#line 856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_->dpi = _tmp8_;
-#line 857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_ = options;
-#line 857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_->depth = 8;
-#line 3887 "ui.c"
+#line 3922 "ui.c"
 	}
-#line 859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = options;
-#line 859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = options;
-#line 859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_get_paper_size (self, &_tmp12_, &_tmp13_);
-#line 859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_->paper_width = _tmp12_;
-#line 859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_->paper_height = _tmp13_;
-#line 860 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = options;
-#line 860 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = user_interface_get_brightness (self);
-#line 860 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = _tmp15_;
-#line 860 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_->brightness = _tmp16_;
-#line 861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp17_ = options;
-#line 861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = user_interface_get_contrast (self);
-#line 861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp19_ = _tmp18_;
-#line 861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp17_->contrast = _tmp19_;
-#line 863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 869 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = options;
-#line 863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 869 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 3919 "ui.c"
+#line 3954 "ui.c"
 }
 
 
@@ -3925,73 +3960,73 @@ static void user_interface_scan_button_clicked_cb (UserInterface* self, GtkWidge
 	gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 869 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = user_interface_make_scan_options (self);
-#line 869 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	options = _tmp0_;
-#line 870 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 876 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	options->type = SCAN_TYPE_SINGLE;
-#line 871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 877 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_selected_device (self);
-#line 871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 877 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 877 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 877 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_emit_by_name (self, "start-scan", _tmp3_, options);
-#line 871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 877 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (_tmp3_);
-#line 867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_scan_options_unref0 (options);
-#line 3951 "ui.c"
+#line 3986 "ui.c"
 }
 
 
 static void _user_interface_scan_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_scan_button_clicked_cb ((UserInterface*) self, _sender);
-#line 3958 "ui.c"
+#line 3993 "ui.c"
 }
 
 
 static void user_interface_stop_scan_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
-#line 875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 881 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 881 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 877 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_emit_by_name (self, "stop-scan");
-#line 3969 "ui.c"
+#line 4004 "ui.c"
 }
 
 
 static void _user_interface_stop_scan_button_clicked_cb_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_stop_scan_button_clicked_cb ((UserInterface*) self, _sender);
-#line 3976 "ui.c"
+#line 4011 "ui.c"
 }
 
 
 static void user_interface_continuous_scan_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-#line 881 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 881 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 889 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = user_interface_get_scanning (self);
-#line 883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 889 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _tmp0_;
-#line 883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 889 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp1_) {
-#line 884 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_signal_emit_by_name (self, "stop-scan");
-#line 3995 "ui.c"
+#line 4030 "ui.c"
 	} else {
 		ScanOptions* options = NULL;
 		ScanOptions* _tmp2_ = NULL;
@@ -4001,31 +4036,31 @@ static void user_interface_continuous_scan_button_clicked_cb (UserInterface* sel
 		gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
 		ScanOptions* _tmp8_ = NULL;
-#line 887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = user_interface_make_scan_options (self);
-#line 887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		options = _tmp2_;
-#line 888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = options;
-#line 888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = user_interface_get_page_side (self);
-#line 888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_->type = _tmp4_;
-#line 889 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = user_interface_get_selected_device (self);
-#line 889 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = _tmp5_;
-#line 889 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = _tmp6_;
-#line 889 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = options;
-#line 889 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_signal_emit_by_name (self, "start-scan", _tmp7_, _tmp8_);
-#line 889 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_tmp7_);
-#line 883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 889 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_scan_options_unref0 (options);
-#line 4029 "ui.c"
+#line 4064 "ui.c"
 	}
 }
 
@@ -4033,56 +4068,56 @@ 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 4037 "ui.c"
+#line 4072 "ui.c"
 }
 
 
 static void user_interface_preferences_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
 	GtkDialog* _tmp0_ = NULL;
-#line 894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->preferences_dialog;
-#line 896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_present ((GtkWindow*) _tmp0_);
-#line 4051 "ui.c"
+#line 4086 "ui.c"
 }
 
 
 static void _user_interface_preferences_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_preferences_button_clicked_cb ((UserInterface*) self, _sender);
-#line 4058 "ui.c"
+#line 4093 "ui.c"
 }
 
 
 void user_interface_preferences_activate_cb (UserInterface* self) {
 	GtkDialog* _tmp0_ = NULL;
-#line 899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 905 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 901 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->preferences_dialog;
-#line 901 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_present ((GtkWindow*) _tmp0_);
-#line 4070 "ui.c"
+#line 4105 "ui.c"
 }
 
 
 static gboolean user_interface_preferences_dialog_delete_event_cb (UserInterface* self, GtkWidget* widget, GdkEventAny* event) {
 	gboolean result = FALSE;
-#line 905 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 905 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (widget != NULL, FALSE);
-#line 905 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 913 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = TRUE;
-#line 907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 913 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 4086 "ui.c"
+#line 4121 "ui.c"
 }
 
 
@@ -4091,35 +4126,35 @@ 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 4095 "ui.c"
+#line 4130 "ui.c"
 }
 
 
 static void user_interface_preferences_dialog_response_cb (UserInterface* self, GtkWidget* widget, gint response_id) {
 	GtkDialog* _tmp0_ = NULL;
-#line 911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 917 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 917 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 913 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 919 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->preferences_dialog;
-#line 913 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 919 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp0_, FALSE);
-#line 4109 "ui.c"
+#line 4144 "ui.c"
 }
 
 
 static void _user_interface_preferences_dialog_response_cb_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_preferences_dialog_response_cb ((UserInterface*) self, _sender, response_id);
-#line 4116 "ui.c"
+#line 4151 "ui.c"
 }
 
 
 static gpointer _page_ref0 (gpointer self) {
-#line 918 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self ? page_ref (self) : NULL;
-#line 4123 "ui.c"
+#line 4158 "ui.c"
 }
 
 
@@ -4130,34 +4165,34 @@ static void user_interface_update_page_menu (UserInterface* self) {
 	Page* _tmp2_ = NULL;
 	Page* _tmp3_ = NULL;
 	Page* _tmp4_ = NULL;
-#line 916 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 918 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
-#line 918 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_view_get_selected_page (_tmp0_);
-#line 918 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 918 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _page_ref0 (_tmp2_);
-#line 918 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp3_;
-#line 919 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page;
-#line 919 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp4_ == NULL) {
-#line 4150 "ui.c"
+#line 4185 "ui.c"
 		GtkMenuItem* _tmp5_ = NULL;
 		GtkMenuItem* _tmp6_ = NULL;
-#line 921 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 927 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = self->priv->page_move_left_menuitem;
-#line 921 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 927 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_set_sensitive ((GtkWidget*) _tmp5_, FALSE);
-#line 922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = self->priv->page_move_right_menuitem;
-#line 922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_set_sensitive ((GtkWidget*) _tmp6_, FALSE);
-#line 4161 "ui.c"
+#line 4196 "ui.c"
 	} else {
 		guint index = 0U;
 		Book* _tmp7_ = NULL;
@@ -4170,37 +4205,37 @@ static void user_interface_update_page_menu (UserInterface* self) {
 		Book* _tmp14_ = NULL;
 		guint _tmp15_ = 0U;
 		guint _tmp16_ = 0U;
-#line 926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = self->priv->_book;
-#line 926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = page;
-#line 926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_ = book_get_page_index (_tmp7_, _tmp8_);
-#line 926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		index = _tmp9_;
-#line 927 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp10_ = self->priv->page_move_left_menuitem;
-#line 927 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp11_ = index;
-#line 927 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_set_sensitive ((GtkWidget*) _tmp10_, _tmp11_ > ((guint) 0));
-#line 928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp12_ = self->priv->page_move_right_menuitem;
-#line 928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp13_ = index;
-#line 928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp14_ = self->priv->_book;
-#line 928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = book_get_n_pages (_tmp14_);
-#line 928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp16_ = _tmp15_;
-#line 928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_set_sensitive ((GtkWidget*) _tmp12_, _tmp13_ < (_tmp16_ - 1));
-#line 4200 "ui.c"
+#line 4235 "ui.c"
 	}
-#line 916 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 4204 "ui.c"
+#line 4239 "ui.c"
 }
 
 
@@ -4221,165 +4256,165 @@ static void user_interface_page_selected_cb (UserInterface* self, BookView* view
 	Page* _tmp37_ = NULL;
 	gboolean _tmp38_ = FALSE;
 	gboolean _tmp39_ = FALSE;
-#line 932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (view != NULL);
-#line 934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 940 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = page;
-#line 934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 940 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_ == NULL) {
-#line 935 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 941 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4235 "ui.c"
+#line 4270 "ui.c"
 	}
-#line 937 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 943 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->updating_page_menu = TRUE;
-#line 939 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 945 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_page_menu (self);
-#line 941 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->no_crop_menuitem;
-#line 941 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 941 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	menuitem = _tmp2_;
-#line 942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = page;
-#line 942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page_get_has_crop (_tmp3_);
-#line 942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = _tmp4_;
-#line 942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp5_) {
-#line 4255 "ui.c"
+#line 4290 "ui.c"
 		gchar* crop_name = NULL;
 		Page* _tmp6_ = NULL;
 		const gchar* _tmp7_ = NULL;
 		const gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
 		const gchar* _tmp10_ = NULL;
-#line 944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = page;
-#line 944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = page_get_crop_name (_tmp6_);
-#line 944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = _tmp7_;
-#line 944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_ = g_strdup (_tmp8_);
-#line 944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		crop_name = _tmp9_;
-#line 945 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp10_ = crop_name;
-#line 945 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp10_ != NULL) {
-#line 4276 "ui.c"
+#line 4311 "ui.c"
 			const gchar* _tmp11_ = NULL;
-#line 947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp11_ = crop_name;
-#line 947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (g_strcmp0 (_tmp11_, "A4") == 0) {
-#line 4282 "ui.c"
+#line 4317 "ui.c"
 				GtkRadioMenuItem* _tmp12_ = NULL;
 				GtkRadioMenuItem* _tmp13_ = NULL;
-#line 948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp12_ = self->priv->a4_menuitem;
-#line 948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp13_ = _g_object_ref0 (_tmp12_);
-#line 948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_object_unref0 (menuitem);
-#line 948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				menuitem = _tmp13_;
-#line 4293 "ui.c"
+#line 4328 "ui.c"
 			} else {
 				const gchar* _tmp14_ = NULL;
-#line 949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp14_ = crop_name;
-#line 949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (g_strcmp0 (_tmp14_, "A5") == 0) {
-#line 4300 "ui.c"
+#line 4335 "ui.c"
 					GtkRadioMenuItem* _tmp15_ = NULL;
 					GtkRadioMenuItem* _tmp16_ = NULL;
-#line 950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp15_ = self->priv->a5_menuitem;
-#line 950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp16_ = _g_object_ref0 (_tmp15_);
-#line 950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_g_object_unref0 (menuitem);
-#line 950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					menuitem = _tmp16_;
-#line 4311 "ui.c"
+#line 4346 "ui.c"
 				} else {
 					const gchar* _tmp17_ = NULL;
-#line 951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp17_ = crop_name;
-#line 951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					if (g_strcmp0 (_tmp17_, "A6") == 0) {
-#line 4318 "ui.c"
+#line 4353 "ui.c"
 						GtkRadioMenuItem* _tmp18_ = NULL;
 						GtkRadioMenuItem* _tmp19_ = NULL;
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp18_ = self->priv->a6_menuitem;
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp19_ = _g_object_ref0 (_tmp18_);
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_g_object_unref0 (menuitem);
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						menuitem = _tmp19_;
-#line 4329 "ui.c"
+#line 4364 "ui.c"
 					} else {
 						const gchar* _tmp20_ = NULL;
-#line 953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp20_ = crop_name;
-#line 953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						if (g_strcmp0 (_tmp20_, "letter") == 0) {
-#line 4336 "ui.c"
+#line 4371 "ui.c"
 							GtkRadioMenuItem* _tmp21_ = NULL;
 							GtkRadioMenuItem* _tmp22_ = NULL;
-#line 954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp21_ = self->priv->letter_menuitem;
-#line 954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp22_ = _g_object_ref0 (_tmp21_);
-#line 954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_g_object_unref0 (menuitem);
-#line 954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							menuitem = _tmp22_;
-#line 4347 "ui.c"
+#line 4382 "ui.c"
 						} else {
 							const gchar* _tmp23_ = NULL;
-#line 955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp23_ = crop_name;
-#line 955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							if (g_strcmp0 (_tmp23_, "legal") == 0) {
-#line 4354 "ui.c"
+#line 4389 "ui.c"
 								GtkRadioMenuItem* _tmp24_ = NULL;
 								GtkRadioMenuItem* _tmp25_ = NULL;
-#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_tmp24_ = self->priv->legal_menuitem;
-#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_tmp25_ = _g_object_ref0 (_tmp24_);
-#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_g_object_unref0 (menuitem);
-#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								menuitem = _tmp25_;
-#line 4365 "ui.c"
+#line 4400 "ui.c"
 							} else {
 								const gchar* _tmp26_ = NULL;
-#line 957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_tmp26_ = crop_name;
-#line 957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								if (g_strcmp0 (_tmp26_, "4x6") == 0) {
-#line 4372 "ui.c"
+#line 4407 "ui.c"
 									GtkRadioMenuItem* _tmp27_ = NULL;
 									GtkRadioMenuItem* _tmp28_ = NULL;
-#line 958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 									_tmp27_ = self->priv->four_by_six_menuitem;
-#line 958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 									_tmp28_ = _g_object_ref0 (_tmp27_);
-#line 958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 									_g_object_unref0 (menuitem);
-#line 958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 									menuitem = _tmp28_;
-#line 4383 "ui.c"
+#line 4418 "ui.c"
 								}
 							}
 						}
@@ -4389,49 +4424,49 @@ static void user_interface_page_selected_cb (UserInterface* self, BookView* view
 		} else {
 			GtkRadioMenuItem* _tmp29_ = NULL;
 			GtkRadioMenuItem* _tmp30_ = NULL;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 967 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp29_ = self->priv->custom_crop_menuitem;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 967 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp30_ = _g_object_ref0 (_tmp29_);
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 967 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_object_unref0 (menuitem);
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 967 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			menuitem = _tmp30_;
-#line 4401 "ui.c"
+#line 4436 "ui.c"
 		}
-#line 942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (crop_name);
-#line 4405 "ui.c"
+#line 4440 "ui.c"
 	}
-#line 964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp31_ = menuitem;
-#line 964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp31_, TRUE);
-#line 965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp32_ = self->priv->crop_button;
-#line 965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp33_ = page;
-#line 965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp34_ = page_get_has_crop (_tmp33_);
-#line 965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp35_ = _tmp34_;
-#line 965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_toggle_button_set_active (_tmp32_, _tmp35_);
-#line 966 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp36_ = self->priv->crop_toolbutton;
-#line 966 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp37_ = page;
-#line 966 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp38_ = page_get_has_crop (_tmp37_);
-#line 966 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp39_ = _tmp38_;
-#line 966 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_toggle_tool_button_set_active (_tmp36_, _tmp39_);
-#line 968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 974 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->updating_page_menu = FALSE;
-#line 932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (menuitem);
-#line 4435 "ui.c"
+#line 4470 "ui.c"
 }
 
 
@@ -4443,51 +4478,51 @@ static void user_interface_show_page_cb (UserInterface* self, BookView* view, Pa
 	const gchar* _tmp2_ = NULL;
 	GFile* _tmp3_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (view != NULL);
-#line 971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (page != NULL);
-#line 973 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 979 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = get_temporary_filename ("scanned-page", "tiff");
-#line 973 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 979 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	path = _tmp0_;
-#line 974 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = path;
-#line 974 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp1_ == NULL) {
-#line 975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4465 "ui.c"
+#line 4500 "ui.c"
 	}
-#line 976 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = path;
-#line 976 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = g_file_new_for_path (_tmp2_);
-#line 976 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	file = _tmp3_;
-#line 4473 "ui.c"
+#line 4508 "ui.c"
 	{
 		Page* _tmp4_ = NULL;
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
 		GFile* _tmp7_ = NULL;
-#line 980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 986 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = page;
-#line 980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 986 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = user_interface_get_quality (self);
-#line 980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 986 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = _tmp5_;
-#line 980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 986 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = file;
-#line 980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 986 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		page_save (_tmp4_, "tiff", _tmp6_, _tmp7_, &_inner_error_);
-#line 980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 986 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4491 "ui.c"
+#line 4526 "ui.c"
 			goto __catch18_g_error;
 		}
 	}
@@ -4498,42 +4533,42 @@ static void user_interface_show_page_cb (UserInterface* self, BookView* view, Pa
 		const gchar* _tmp8_ = NULL;
 		GError* _tmp9_ = NULL;
 		const gchar* _tmp10_ = NULL;
-#line 978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_inner_error_ = NULL;
 #line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_inner_error_ = NULL;
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = _ ("Unable to save image for preview");
-#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_ = e;
-#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp10_ = _tmp9_->message;
-#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_show_error_dialog (self, _tmp8_, _tmp10_);
-#line 987 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 993 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 987 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 993 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (file);
-#line 987 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 993 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 987 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 993 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4522 "ui.c"
+#line 4557 "ui.c"
 	}
 	__finally18:
-#line 978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (file);
-#line 978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 984 "/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 978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4537 "ui.c"
+#line 4572 "ui.c"
 	}
 	{
 		GdkScreen* _tmp11_ = NULL;
@@ -4542,25 +4577,25 @@ static void user_interface_show_page_cb (UserInterface* self, BookView* view, Pa
 		gchar* _tmp14_ = NULL;
 		gchar* _tmp15_ = NULL;
 		guint32 _tmp16_ = 0U;
-#line 992 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 998 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp11_ = gtk_window_get_screen ((GtkWindow*) self);
-#line 992 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 998 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp12_ = _tmp11_;
-#line 992 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 998 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp13_ = file;
-#line 992 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 998 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp14_ = g_file_get_uri (_tmp13_);
-#line 992 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 998 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = _tmp14_;
-#line 992 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 998 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp16_ = gtk_get_current_event_time ();
-#line 992 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 998 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_show_uri (_tmp12_, _tmp15_, _tmp16_, &_inner_error_);
-#line 992 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 998 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_tmp15_);
-#line 992 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 998 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4564 "ui.c"
+#line 4599 "ui.c"
 			goto __catch19_g_error;
 		}
 	}
@@ -4571,59 +4606,59 @@ static void user_interface_show_page_cb (UserInterface* self, BookView* view, Pa
 		const gchar* _tmp17_ = NULL;
 		GError* _tmp18_ = NULL;
 		const gchar* _tmp19_ = NULL;
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_inner_error_ = NULL;
 #line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_inner_error_ = NULL;
+#line 1002 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp17_ = _ ("Unable to open image preview application");
-#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1002 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp18_ = e;
-#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1002 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp19_ = _tmp18_->message;
-#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1002 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_show_error_dialog (self, _tmp17_, _tmp19_);
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 4589 "ui.c"
+#line 4624 "ui.c"
 	}
 	__finally19:
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (file);
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 996 "/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 990 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4604 "ui.c"
+#line 4639 "ui.c"
 	}
-#line 971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (file);
-#line 971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (path);
-#line 4610 "ui.c"
+#line 4645 "ui.c"
 }
 
 
 static void user_interface_show_page_menu_cb (UserInterface* self, BookView* view) {
 	GtkMenu* _tmp0_ = NULL;
 	guint32 _tmp1_ = 0U;
-#line 1002 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1002 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (view != NULL);
-#line 1004 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1010 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->page_menu;
-#line 1004 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1010 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_get_current_event_time ();
-#line 1004 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1010 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_menu_popup (_tmp0_, NULL, NULL, NULL, NULL, (guint) 3, _tmp1_);
-#line 4627 "ui.c"
+#line 4662 "ui.c"
 }
 
 
@@ -4635,50 +4670,50 @@ static void user_interface_rotate_left_button_clicked_cb (UserInterface* self, G
 	Page* _tmp3_ = NULL;
 	Page* _tmp4_ = NULL;
 	Page* _tmp5_ = NULL;
-#line 1008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1010 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->updating_page_menu;
-#line 1010 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
-#line 1011 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1017 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4649 "ui.c"
+#line 4684 "ui.c"
 	}
-#line 1012 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->book_view;
-#line 1012 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = book_view_get_selected_page (_tmp1_);
-#line 1012 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 1012 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = _page_ref0 (_tmp3_);
-#line 1012 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp4_;
-#line 1013 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = page;
-#line 1013 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp5_ != NULL) {
-#line 4665 "ui.c"
+#line 4700 "ui.c"
 		Page* _tmp6_ = NULL;
-#line 1014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1020 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = page;
-#line 1014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1020 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		page_rotate_left (_tmp6_);
-#line 4671 "ui.c"
+#line 4706 "ui.c"
 	}
-#line 1008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 4675 "ui.c"
+#line 4710 "ui.c"
 }
 
 
 static void _user_interface_rotate_left_button_clicked_cb_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_rotate_left_button_clicked_cb ((UserInterface*) self, _sender);
-#line 4682 "ui.c"
+#line 4717 "ui.c"
 }
 
 
@@ -4690,50 +4725,50 @@ static void user_interface_rotate_right_button_clicked_cb (UserInterface* self,
 	Page* _tmp3_ = NULL;
 	Page* _tmp4_ = NULL;
 	Page* _tmp5_ = NULL;
-#line 1018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1024 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1024 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1020 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1026 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->updating_page_menu;
-#line 1020 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1026 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
-#line 1021 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4704 "ui.c"
+#line 4739 "ui.c"
 	}
-#line 1022 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->book_view;
-#line 1022 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = book_view_get_selected_page (_tmp1_);
-#line 1022 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 1022 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = _page_ref0 (_tmp3_);
-#line 1022 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp4_;
-#line 1023 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1029 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = page;
-#line 1023 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1029 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp5_ != NULL) {
-#line 4720 "ui.c"
+#line 4755 "ui.c"
 		Page* _tmp6_ = NULL;
-#line 1024 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1030 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = page;
-#line 1024 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1030 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		page_rotate_right (_tmp6_);
-#line 4726 "ui.c"
+#line 4761 "ui.c"
 	}
-#line 1018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1024 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 4730 "ui.c"
+#line 4765 "ui.c"
 }
 
 
 static void _user_interface_rotate_right_button_clicked_cb_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_rotate_right_button_clicked_cb ((UserInterface*) self, _sender);
-#line 4737 "ui.c"
+#line 4772 "ui.c"
 }
 
 
@@ -4748,62 +4783,62 @@ static void user_interface_set_crop (UserInterface* self, const gchar* crop_name
 	Page* _tmp6_ = NULL;
 	Page* _tmp7_ = NULL;
 	const gchar* _tmp8_ = NULL;
-#line 1027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1029 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->crop_rotate_menuitem;
-#line 1029 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = crop_name;
-#line 1029 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp0_, _tmp1_ != NULL);
-#line 1031 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1037 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = self->priv->updating_page_menu;
-#line 1031 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1037 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 1032 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1038 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4766 "ui.c"
+#line 4801 "ui.c"
 	}
-#line 1034 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->book_view;
-#line 1034 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = book_view_get_selected_page (_tmp3_);
-#line 1034 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = _tmp4_;
-#line 1034 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = _page_ref0 (_tmp5_);
-#line 1034 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp6_;
-#line 1035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1041 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = page;
-#line 1035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1041 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp7_ == NULL) {
-#line 1037 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_warning ("ui.vala:1037: Trying to set crop but no selected page");
-#line 1038 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1043 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_warning ("ui.vala:1043: Trying to set crop but no selected page");
+#line 1044 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_page_unref0 (page);
-#line 1038 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1044 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4788 "ui.c"
+#line 4823 "ui.c"
 	}
-#line 1041 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1047 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = crop_name;
-#line 1041 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1047 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp8_ == NULL) {
-#line 4794 "ui.c"
+#line 4829 "ui.c"
 		Page* _tmp9_ = NULL;
-#line 1042 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_ = page;
-#line 1042 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		page_set_no_crop (_tmp9_);
-#line 4800 "ui.c"
+#line 4835 "ui.c"
 	} else {
 		const gchar* _tmp10_ = NULL;
-#line 1043 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1049 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp10_ = crop_name;
-#line 1043 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1049 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (g_strcmp0 (_tmp10_, "custom") == 0) {
-#line 4807 "ui.c"
+#line 4842 "ui.c"
 			gint width = 0;
 			Page* _tmp11_ = NULL;
 			gint _tmp12_ = 0;
@@ -4824,66 +4859,66 @@ static void user_interface_set_crop (UserInterface* self, const gchar* crop_name
 			gint _tmp24_ = 0;
 			gint _tmp25_ = 0;
 			gint _tmp26_ = 0;
-#line 1045 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1051 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp11_ = page;
-#line 1045 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1051 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp12_ = page_get_width (_tmp11_);
-#line 1045 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1051 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp13_ = _tmp12_;
-#line 1045 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1051 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			width = _tmp13_;
-#line 1046 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1052 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp14_ = page;
-#line 1046 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1052 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp15_ = page_get_height (_tmp14_);
-#line 1046 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1052 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp16_ = _tmp15_;
-#line 1046 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1052 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			height = _tmp16_;
-#line 1047 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp17_ = width;
-#line 1047 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			crop_width = (gint) ((_tmp17_ * 0.8) + 0.5);
-#line 1048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp18_ = height;
-#line 1048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			crop_height = (gint) ((_tmp18_ * 0.8) + 0.5);
-#line 1049 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp19_ = page;
-#line 1049 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp20_ = crop_width;
-#line 1049 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp21_ = crop_height;
-#line 1049 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			page_set_custom_crop (_tmp19_, _tmp20_, _tmp21_);
-#line 1050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp22_ = page;
-#line 1050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp23_ = width;
-#line 1050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp24_ = crop_width;
-#line 1050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp25_ = height;
-#line 1050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp26_ = crop_height;
-#line 1050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			page_move_crop (_tmp22_, (_tmp23_ - _tmp24_) / 2, (_tmp25_ - _tmp26_) / 2);
-#line 4872 "ui.c"
+#line 4907 "ui.c"
 		} else {
 			Page* _tmp27_ = NULL;
 			const gchar* _tmp28_ = NULL;
-#line 1053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1059 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp27_ = page;
-#line 1053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1059 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp28_ = crop_name;
-#line 1053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1059 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			page_set_named_crop (_tmp27_, _tmp28_);
-#line 4882 "ui.c"
+#line 4917 "ui.c"
 		}
 	}
-#line 1027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 4887 "ui.c"
+#line 4922 "ui.c"
 }
 
 
@@ -4891,21 +4926,21 @@ static void user_interface_no_crop_menuitem_toggled_cb (UserInterface* self, Gtk
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1059 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1065 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 1059 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1065 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 1059 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1065 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1059 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1065 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 1060 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, NULL);
-#line 4909 "ui.c"
+#line 4944 "ui.c"
 	}
 }
 
@@ -4913,7 +4948,7 @@ static void user_interface_no_crop_menuitem_toggled_cb (UserInterface* self, Gtk
 static void _user_interface_no_crop_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_no_crop_menuitem_toggled_cb ((UserInterface*) self, _sender);
-#line 4917 "ui.c"
+#line 4952 "ui.c"
 }
 
 
@@ -4921,21 +4956,21 @@ static void user_interface_custom_crop_menuitem_toggled_cb (UserInterface* self,
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1070 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1070 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1072 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 1066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1072 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 1066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1072 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1072 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 1067 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1073 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "custom");
-#line 4939 "ui.c"
+#line 4974 "ui.c"
 	}
 }
 
@@ -4943,7 +4978,7 @@ static void user_interface_custom_crop_menuitem_toggled_cb (UserInterface* self,
 static void _user_interface_custom_crop_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_custom_crop_menuitem_toggled_cb ((UserInterface*) self, _sender);
-#line 4947 "ui.c"
+#line 4982 "ui.c"
 }
 
 
@@ -4952,40 +4987,40 @@ static void user_interface_crop_button_toggled_cb (UserInterface* self, GtkToggl
 	GtkToggleButton* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
-#line 1071 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1071 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1073 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1079 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->updating_page_menu;
-#line 1073 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1079 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
-#line 1074 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1080 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4966 "ui.c"
+#line 5001 "ui.c"
 	}
-#line 1076 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1082 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = widget;
-#line 1076 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1082 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_toggle_button_get_active (_tmp1_);
-#line 1076 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1082 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 1076 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1082 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp3_) {
-#line 4976 "ui.c"
+#line 5011 "ui.c"
 		GtkRadioMenuItem* _tmp4_ = NULL;
-#line 1077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = self->priv->custom_crop_menuitem;
-#line 1077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp4_, TRUE);
-#line 4982 "ui.c"
+#line 5017 "ui.c"
 	} else {
 		GtkRadioMenuItem* _tmp5_ = NULL;
-#line 1079 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1085 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = self->priv->no_crop_menuitem;
-#line 1079 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1085 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp5_, TRUE);
-#line 4989 "ui.c"
+#line 5024 "ui.c"
 	}
 }
 
@@ -4993,7 +5028,7 @@ static void user_interface_crop_button_toggled_cb (UserInterface* self, GtkToggl
 static void _user_interface_crop_button_toggled_cb_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_crop_button_toggled_cb ((UserInterface*) self, _sender);
-#line 4997 "ui.c"
+#line 5032 "ui.c"
 }
 
 
@@ -5002,40 +5037,40 @@ static void user_interface_crop_toolbutton_toggled_cb (UserInterface* self, GtkT
 	GtkToggleToolButton* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
-#line 1083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1089 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1089 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1085 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1091 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->updating_page_menu;
-#line 1085 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1091 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
-#line 1086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1092 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 5016 "ui.c"
+#line 5051 "ui.c"
 	}
-#line 1088 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = widget;
-#line 1088 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_);
-#line 1088 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 1088 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp3_) {
-#line 5026 "ui.c"
+#line 5061 "ui.c"
 		GtkRadioMenuItem* _tmp4_ = NULL;
-#line 1089 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = self->priv->custom_crop_menuitem;
-#line 1089 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp4_, TRUE);
-#line 5032 "ui.c"
+#line 5067 "ui.c"
 	} else {
 		GtkRadioMenuItem* _tmp5_ = NULL;
-#line 1091 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1097 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = self->priv->no_crop_menuitem;
-#line 1091 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1097 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp5_, TRUE);
-#line 5039 "ui.c"
+#line 5074 "ui.c"
 	}
 }
 
@@ -5043,7 +5078,7 @@ static void user_interface_crop_toolbutton_toggled_cb (UserInterface* self, GtkT
 static void _user_interface_crop_toolbutton_toggled_cb_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_crop_toolbutton_toggled_cb ((UserInterface*) self, _sender);
-#line 5047 "ui.c"
+#line 5082 "ui.c"
 }
 
 
@@ -5051,21 +5086,21 @@ static void user_interface_four_by_six_menuitem_toggled_cb (UserInterface* self,
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1095 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1101 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1095 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1101 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1097 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1103 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 1097 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1103 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 1097 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1103 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1097 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1103 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 1098 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "4x6");
-#line 5069 "ui.c"
+#line 5104 "ui.c"
 	}
 }
 
@@ -5073,7 +5108,7 @@ static void user_interface_four_by_six_menuitem_toggled_cb (UserInterface* self,
 static void _user_interface_four_by_six_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_four_by_six_menuitem_toggled_cb ((UserInterface*) self, _sender);
-#line 5077 "ui.c"
+#line 5112 "ui.c"
 }
 
 
@@ -5081,21 +5116,21 @@ static void user_interface_legal_menuitem_toggled_cb (UserInterface* self, GtkCh
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1108 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1108 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 1104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 1104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 1105 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "legal");
-#line 5099 "ui.c"
+#line 5134 "ui.c"
 	}
 }
 
@@ -5103,7 +5138,7 @@ static void user_interface_legal_menuitem_toggled_cb (UserInterface* self, GtkCh
 static void _user_interface_legal_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_legal_menuitem_toggled_cb ((UserInterface*) self, _sender);
-#line 5107 "ui.c"
+#line 5142 "ui.c"
 }
 
 
@@ -5111,21 +5146,21 @@ static void user_interface_letter_menuitem_toggled_cb (UserInterface* self, GtkC
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1115 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1115 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1117 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 1111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1117 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 1111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1117 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1117 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 1112 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "letter");
-#line 5129 "ui.c"
+#line 5164 "ui.c"
 	}
 }
 
@@ -5133,7 +5168,7 @@ static void user_interface_letter_menuitem_toggled_cb (UserInterface* self, GtkC
 static void _user_interface_letter_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_letter_menuitem_toggled_cb ((UserInterface*) self, _sender);
-#line 5137 "ui.c"
+#line 5172 "ui.c"
 }
 
 
@@ -5141,21 +5176,21 @@ static void user_interface_a6_menuitem_toggled_cb (UserInterface* self, GtkCheck
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1122 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1122 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 1118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 1118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 1119 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "A6");
-#line 5159 "ui.c"
+#line 5194 "ui.c"
 	}
 }
 
@@ -5163,7 +5198,7 @@ static void user_interface_a6_menuitem_toggled_cb (UserInterface* self, GtkCheck
 static void _user_interface_a6_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_a6_menuitem_toggled_cb ((UserInterface*) self, _sender);
-#line 5167 "ui.c"
+#line 5202 "ui.c"
 }
 
 
@@ -5171,21 +5206,21 @@ static void user_interface_a5_menuitem_toggled_cb (UserInterface* self, GtkCheck
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1123 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1129 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1123 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1129 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1131 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 1125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1131 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 1125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1131 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1131 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 1126 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "A5");
-#line 5189 "ui.c"
+#line 5224 "ui.c"
 	}
 }
 
@@ -5193,7 +5228,7 @@ static void user_interface_a5_menuitem_toggled_cb (UserInterface* self, GtkCheck
 static void _user_interface_a5_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_a5_menuitem_toggled_cb ((UserInterface*) self, _sender);
-#line 5197 "ui.c"
+#line 5232 "ui.c"
 }
 
 
@@ -5201,21 +5236,21 @@ static void user_interface_a4_menuitem_toggled_cb (UserInterface* self, GtkCheck
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1136 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1136 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1138 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 1132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1138 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 1132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1138 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1138 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 1133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "A4");
-#line 5219 "ui.c"
+#line 5254 "ui.c"
 	}
 }
 
@@ -5223,7 +5258,7 @@ static void user_interface_a4_menuitem_toggled_cb (UserInterface* self, GtkCheck
 static void _user_interface_a4_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_a4_menuitem_toggled_cb ((UserInterface*) self, _sender);
-#line 5227 "ui.c"
+#line 5262 "ui.c"
 }
 
 
@@ -5235,44 +5270,44 @@ static void user_interface_crop_rotate_menuitem_activate_cb (UserInterface* self
 	Page* _tmp3_ = NULL;
 	Page* _tmp4_ = NULL;
 	Page* _tmp5_ = NULL;
-#line 1137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1145 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
-#line 1139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1145 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_view_get_selected_page (_tmp0_);
-#line 1139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1145 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1145 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _page_ref0 (_tmp2_);
-#line 1139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1145 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp3_;
-#line 1140 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page;
-#line 1140 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp4_ == NULL) {
-#line 1141 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_page_unref0 (page);
-#line 1141 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 5261 "ui.c"
+#line 5296 "ui.c"
 	}
-#line 1142 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1148 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = page;
-#line 1142 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1148 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page_rotate_crop (_tmp5_);
-#line 1137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 5269 "ui.c"
+#line 5304 "ui.c"
 }
 
 
 static void _user_interface_crop_rotate_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_crop_rotate_menuitem_activate_cb ((UserInterface*) self, _sender);
-#line 5276 "ui.c"
+#line 5311 "ui.c"
 }
 
 
@@ -5287,56 +5322,56 @@ static void user_interface_page_move_left_menuitem_activate_cb (UserInterface* s
 	Page* _tmp5_ = NULL;
 	guint _tmp6_ = 0U;
 	guint _tmp7_ = 0U;
-#line 1146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1148 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1154 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
-#line 1148 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1154 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_view_get_selected_page (_tmp0_);
-#line 1148 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1154 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1148 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1154 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _page_ref0 (_tmp2_);
-#line 1148 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1154 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp3_;
-#line 1149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = self->priv->_book;
-#line 1149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = page;
-#line 1149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = book_get_page_index (_tmp4_, _tmp5_);
-#line 1149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	index = _tmp6_;
-#line 1150 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = index;
-#line 1150 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp7_ > ((guint) 0)) {
-#line 5317 "ui.c"
+#line 5352 "ui.c"
 		Book* _tmp8_ = NULL;
 		Page* _tmp9_ = NULL;
 		guint _tmp10_ = 0U;
-#line 1151 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = self->priv->_book;
-#line 1151 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_ = page;
-#line 1151 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp10_ = index;
-#line 1151 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		book_move_page (_tmp8_, _tmp9_, _tmp10_ - 1);
-#line 5329 "ui.c"
+#line 5364 "ui.c"
 	}
-#line 1146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 5333 "ui.c"
+#line 5368 "ui.c"
 }
 
 
 static void _user_interface_page_move_left_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_move_left_menuitem_activate_cb ((UserInterface*) self, _sender);
-#line 5340 "ui.c"
+#line 5375 "ui.c"
 }
 
 
@@ -5354,68 +5389,68 @@ static void user_interface_page_move_right_menuitem_activate_cb (UserInterface*
 	Book* _tmp8_ = NULL;
 	guint _tmp9_ = 0U;
 	guint _tmp10_ = 0U;
-#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
-#line 1157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_view_get_selected_page (_tmp0_);
-#line 1157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _page_ref0 (_tmp2_);
-#line 1157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp3_;
-#line 1158 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = self->priv->_book;
-#line 1158 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = page;
-#line 1158 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = book_get_page_index (_tmp4_, _tmp5_);
-#line 1158 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	index = _tmp6_;
-#line 1159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = index;
-#line 1159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = self->priv->_book;
-#line 1159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = book_get_n_pages (_tmp8_);
-#line 1159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = _tmp9_;
-#line 1159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp7_ < (_tmp10_ - 1)) {
-#line 5390 "ui.c"
+#line 5425 "ui.c"
 		Book* _tmp11_ = NULL;
 		Page* _tmp12_ = NULL;
 		Book* _tmp13_ = NULL;
 		Page* _tmp14_ = NULL;
 		guint _tmp15_ = 0U;
-#line 1160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp11_ = self->priv->_book;
-#line 1160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp12_ = page;
-#line 1160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp13_ = self->priv->_book;
-#line 1160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp14_ = page;
-#line 1160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = book_get_page_index (_tmp13_, _tmp14_);
-#line 1160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		book_move_page (_tmp11_, _tmp12_, _tmp15_ + 1);
-#line 5408 "ui.c"
+#line 5443 "ui.c"
 	}
-#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 5412 "ui.c"
+#line 5447 "ui.c"
 }
 
 
 static void _user_interface_page_move_right_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_move_right_menuitem_activate_cb ((UserInterface*) self, _sender);
-#line 5419 "ui.c"
+#line 5454 "ui.c"
 }
 
 
@@ -5426,60 +5461,60 @@ static void user_interface_page_delete_menuitem_activate_cb (UserInterface* self
 	BookView* _tmp3_ = NULL;
 	Page* _tmp4_ = NULL;
 	Page* _tmp5_ = NULL;
-#line 1164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
-#line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_view_get_book (_tmp0_);
-#line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->book_view;
-#line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = book_view_get_selected_page (_tmp3_);
-#line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = _tmp4_;
-#line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_delete_page (_tmp2_, _tmp5_);
-#line 5448 "ui.c"
+#line 5483 "ui.c"
 }
 
 
 static void _user_interface_page_delete_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_delete_menuitem_activate_cb ((UserInterface*) self, _sender);
-#line 5455 "ui.c"
+#line 5490 "ui.c"
 }
 
 
 static Block2Data* block2_data_ref (Block2Data* _data2_) {
-#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_atomic_int_inc (&_data2_->_ref_count_);
-#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return _data2_;
-#line 5464 "ui.c"
+#line 5499 "ui.c"
 }
 
 
 static void block2_data_unref (void * _userdata_) {
 	Block2Data* _data2_;
 	_data2_ = (Block2Data*) _userdata_;
-#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (g_atomic_int_dec_and_test (&_data2_->_ref_count_)) {
-#line 5473 "ui.c"
+#line 5508 "ui.c"
 		UserInterface* self;
-#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self = _data2_->self;
-#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (_data2_->dialog);
-#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (self);
-#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_slice_free (Block2Data, _data2_);
-#line 5483 "ui.c"
+#line 5518 "ui.c"
 	}
 }
 
@@ -5490,138 +5525,138 @@ static gboolean __lambda6_ (Block2Data* _data2_, GdkEventKey* e) {
 	gboolean _tmp0_ = FALSE;
 	GdkEventKey* _tmp1_ = NULL;
 	GdkModifierType _tmp2_ = 0;
-#line 1178 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1184 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = _data2_->self;
-#line 1178 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1184 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (e != NULL, FALSE);
-#line 1180 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1186 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = e;
-#line 1180 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1186 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_->state;
-#line 1180 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1186 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_ == 0) {
-#line 5504 "ui.c"
+#line 5539 "ui.c"
 		GdkEventKey* _tmp3_ = NULL;
 		guint _tmp4_ = 0U;
-#line 1180 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1186 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = e;
-#line 1180 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1186 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = _tmp3_->keyval;
-#line 1180 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1186 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = _tmp4_ == ((guint) GDK_KEY_Escape);
-#line 5513 "ui.c"
+#line 5548 "ui.c"
 	} else {
-#line 1180 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1186 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = FALSE;
-#line 5517 "ui.c"
+#line 5552 "ui.c"
 	}
-#line 1180 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1186 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
-#line 1182 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_destroy ((GtkWidget*) _data2_->dialog);
-#line 1183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1189 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = TRUE;
-#line 1183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1189 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 5527 "ui.c"
+#line 5562 "ui.c"
 	}
-#line 1186 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1192 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
-#line 1186 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1192 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 5533 "ui.c"
+#line 5568 "ui.c"
 }
 
 
 static gboolean ___lambda6__gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self) {
 	gboolean result;
 	result = __lambda6_ (self, event);
-#line 1178 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1184 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 5542 "ui.c"
+#line 5577 "ui.c"
 }
 
 
 static void __lambda7_ (Block2Data* _data2_) {
 	UserInterface* self;
 	Book* _tmp0_ = NULL;
-#line 1200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1206 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = _data2_->self;
-#line 1202 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1208 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->_book;
-#line 1202 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1208 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_combine_sides (_tmp0_);
-#line 1203 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1209 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_destroy ((GtkWidget*) _data2_->dialog);
-#line 5557 "ui.c"
+#line 5592 "ui.c"
 }
 
 
 static void ___lambda7__gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1206 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	__lambda7_ (self);
-#line 5564 "ui.c"
+#line 5599 "ui.c"
 }
 
 
 static void __lambda8_ (Block2Data* _data2_) {
 	UserInterface* self;
 	Book* _tmp0_ = NULL;
-#line 1210 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = _data2_->self;
-#line 1212 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1218 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->_book;
-#line 1212 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1218 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_combine_sides_reverse (_tmp0_);
-#line 1213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_destroy ((GtkWidget*) _data2_->dialog);
-#line 5579 "ui.c"
+#line 5614 "ui.c"
 }
 
 
 static void ___lambda8__gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1210 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	__lambda8_ (self);
-#line 5586 "ui.c"
+#line 5621 "ui.c"
 }
 
 
 static void __lambda9_ (Block2Data* _data2_) {
 	UserInterface* self;
 	Book* _tmp0_ = NULL;
-#line 1220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = _data2_->self;
-#line 1222 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1228 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->_book;
-#line 1222 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1228 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_reverse (_tmp0_);
-#line 1223 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_destroy ((GtkWidget*) _data2_->dialog);
-#line 5601 "ui.c"
+#line 5636 "ui.c"
 }
 
 
 static void ___lambda9__gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	__lambda9_ (self);
-#line 5608 "ui.c"
+#line 5643 "ui.c"
 }
 
 
 static void __lambda10_ (Block2Data* _data2_) {
 	UserInterface* self;
-#line 1230 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1236 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = _data2_->self;
-#line 1232 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1238 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_destroy ((GtkWidget*) _data2_->dialog);
-#line 5618 "ui.c"
+#line 5653 "ui.c"
 }
 
 
 static void ___lambda10__gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1230 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1236 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	__lambda10_ (self);
-#line 5625 "ui.c"
+#line 5660 "ui.c"
 }
 
 
@@ -5652,170 +5687,170 @@ static void user_interface_reorder_document (UserInterface* self) {
 	GtkButton* _tmp20_ = NULL;
 	GtkButton* _tmp21_ = NULL;
 	GtkButton* _tmp22_ = NULL;
-#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data2_ = g_slice_new0 (Block2Data);
-#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data2_->_ref_count_ = 1;
-#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data2_->self = g_object_ref (self);
-#line 1171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1177 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = (GtkWindow*) gtk_window_new (GTK_WINDOW_TOPLEVEL);
-#line 1171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1177 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp0_);
-#line 1171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1177 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data2_->dialog = _tmp0_;
-#line 1172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1178 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_type_hint (_data2_->dialog, GDK_WINDOW_TYPE_HINT_DIALOG);
-#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1179 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_modal (_data2_->dialog, TRUE);
-#line 1174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1180 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_container_set_border_width ((GtkContainer*) _data2_->dialog, (guint) 12);
-#line 1176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1182 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _ ("Reorder Pages");
-#line 1176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1182 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_title (_data2_->dialog, _tmp1_);
-#line 1177 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_transient_for (_data2_->dialog, (GtkWindow*) self);
-#line 1178 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1184 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_data ((GtkWidget*) _data2_->dialog, "key-press-event", (GCallback) ___lambda6__gtk_widget_key_press_event, block2_data_ref (_data2_), (GClosureNotify) block2_data_unref, 0);
-#line 1188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _data2_->dialog, TRUE);
-#line 1190 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1196 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = (GtkGrid*) gtk_grid_new ();
-#line 1190 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1196 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp2_);
-#line 1190 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1196 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g = _tmp2_;
-#line 1191 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1197 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_grid_set_row_homogeneous (g, TRUE);
-#line 1192 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1198 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_grid_set_row_spacing (g, 6);
-#line 1193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_grid_set_column_homogeneous (g, TRUE);
-#line 1194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_grid_set_column_spacing (g, 6);
-#line 1195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) g, TRUE);
-#line 1196 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1202 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_container_add ((GtkContainer*) _data2_->dialog, (GtkWidget*) g);
-#line 1199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1205 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _ ("Combine sides");
-#line 1199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1205 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = user_interface_make_reorder_button (self, _tmp3_, "F1F2F3B1B2B3-F1B1F2B2F3B3");
-#line 1199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1205 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	b = _tmp4_;
-#line 1200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1206 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = b;
-#line 1200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1206 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_data (_tmp5_, "clicked", (GCallback) ___lambda7__gtk_button_clicked, block2_data_ref (_data2_), (GClosureNotify) block2_data_unref, 0);
-#line 1205 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1211 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = b;
-#line 1205 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1211 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp6_, TRUE);
-#line 1206 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1212 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = b;
-#line 1206 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1212 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_grid_attach (g, (GtkWidget*) _tmp7_, 0, 0, 1, 1);
-#line 1209 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1215 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = _ ("Combine sides (reverse)");
-#line 1209 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1215 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = user_interface_make_reorder_button (self, _tmp8_, "F1F2F3B3B2B1-F1B1F2B2F3B3");
-#line 1209 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1215 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (b);
-#line 1209 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1215 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	b = _tmp9_;
-#line 1210 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = b;
-#line 1210 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_data (_tmp10_, "clicked", (GCallback) ___lambda8__gtk_button_clicked, block2_data_ref (_data2_), (GClosureNotify) block2_data_unref, 0);
-#line 1215 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1221 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = b;
-#line 1215 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1221 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp11_, TRUE);
-#line 1216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1222 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = b;
-#line 1216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1222 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_grid_attach (g, (GtkWidget*) _tmp12_, 1, 0, 1, 1);
-#line 1219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = _ ("Reverse");
-#line 1219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = user_interface_make_reorder_button (self, _tmp13_, "C1C2C3C4C5C6-C6C5C4C3C2C1");
-#line 1219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (b);
-#line 1219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	b = _tmp14_;
-#line 1220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = b;
-#line 1220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_data (_tmp15_, "clicked", (GCallback) ___lambda9__gtk_button_clicked, block2_data_ref (_data2_), (GClosureNotify) block2_data_unref, 0);
-#line 1225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1231 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = b;
-#line 1225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1231 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp16_, TRUE);
-#line 1226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1232 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp17_ = b;
-#line 1226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1232 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_grid_attach (g, (GtkWidget*) _tmp17_, 0, 2, 1, 1);
-#line 1229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = _ ("Keep unchanged");
-#line 1229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp19_ = user_interface_make_reorder_button (self, _tmp18_, "C1C2C3C4C5C6-C1C2C3C4C5C6");
-#line 1229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (b);
-#line 1229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	b = _tmp19_;
-#line 1230 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1236 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp20_ = b;
-#line 1230 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1236 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_data (_tmp20_, "clicked", (GCallback) ___lambda10__gtk_button_clicked, block2_data_ref (_data2_), (GClosureNotify) block2_data_unref, 0);
-#line 1234 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp21_ = b;
-#line 1234 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp21_, TRUE);
-#line 1235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1241 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp22_ = b;
-#line 1235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1241 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_grid_attach (g, (GtkWidget*) _tmp22_, 1, 2, 1, 1);
-#line 1237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1243 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_present (_data2_->dialog);
-#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (b);
-#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (g);
-#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	block2_data_unref (_data2_);
-#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data2_ = NULL;
-#line 5792 "ui.c"
+#line 5827 "ui.c"
 }
 
 
 void user_interface_reorder_document_activate_cb (UserInterface* self) {
-#line 1240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1246 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1242 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1248 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_reorder_document (self);
-#line 5801 "ui.c"
+#line 5836 "ui.c"
 }
 
 
 static void user_interface_reorder_menuitem_activate_cb (UserInterface* self, GtkWidget* widget) {
-#line 1246 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1246 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1248 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1254 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_reorder_document (self);
-#line 5812 "ui.c"
+#line 5847 "ui.c"
 }
 
 
 static void _user_interface_reorder_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_reorder_menuitem_activate_cb ((UserInterface*) self, _sender);
-#line 5819 "ui.c"
+#line 5854 "ui.c"
 }
 
 
@@ -5831,61 +5866,61 @@ static GtkButton* user_interface_make_reorder_button (UserInterface* self, const
 	GtkBox* rb = NULL;
 	const gchar* _tmp4_ = NULL;
 	GtkBox* _tmp5_ = NULL;
-#line 1251 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1257 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1251 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1257 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (text != NULL, NULL);
-#line 1251 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1257 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (items != NULL, NULL);
-#line 1253 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = (GtkButton*) gtk_button_new ();
-#line 1253 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp0_);
-#line 1253 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	b = _tmp0_;
-#line 1255 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1261 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
-#line 1255 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1261 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp1_);
-#line 1255 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1261 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	vbox = _tmp1_;
-#line 1256 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1262 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) vbox, TRUE);
-#line 1257 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_container_add ((GtkContainer*) b, (GtkWidget*) vbox);
-#line 1259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = text;
-#line 1259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = (GtkLabel*) gtk_label_new (_tmp2_);
-#line 1259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp3_);
-#line 1259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	label = _tmp3_;
-#line 1260 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1266 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) label, TRUE);
-#line 1261 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (vbox, (GtkWidget*) label, TRUE, TRUE, (guint) 0);
-#line 1263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1269 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = items;
-#line 1263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1269 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = user_interface_make_reorder_box (self, _tmp4_);
-#line 1263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1269 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	rb = _tmp5_;
-#line 1264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) rb, TRUE);
-#line 1265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (vbox, (GtkWidget*) rb, TRUE, TRUE, (guint) 0);
-#line 1267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1273 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = b;
-#line 1267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1273 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (rb);
-#line 1267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1273 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (label);
-#line 1267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1273 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (vbox);
-#line 1267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1273 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 5889 "ui.c"
+#line 5924 "ui.c"
 }
 
 
@@ -5903,7 +5938,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 5907 "ui.c"
+#line 5942 "ui.c"
 }
 
 
@@ -5913,35 +5948,35 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar
 	GtkBox* _tmp0_ = NULL;
 	GtkBox* _tmp1_ = NULL;
 	GtkBox* page_box = NULL;
-#line 1270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (items != NULL, NULL);
-#line 1272 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1278 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
-#line 1272 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1278 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp0_);
-#line 1272 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1278 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	box = _tmp0_;
-#line 1273 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = box;
-#line 1273 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp1_, TRUE);
-#line 1275 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page_box = NULL;
-#line 5933 "ui.c"
+#line 5968 "ui.c"
 	{
 		gint i = 0;
-#line 1276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		i = 0;
-#line 5938 "ui.c"
+#line 5973 "ui.c"
 		{
 			gboolean _tmp2_ = FALSE;
-#line 1276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp2_ = TRUE;
-#line 1276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			while (TRUE) {
-#line 5945 "ui.c"
+#line 5980 "ui.c"
 				const gchar* _tmp4_ = NULL;
 				gint _tmp5_ = 0;
 				gchar _tmp6_ = '\0';
@@ -5981,164 +6016,164 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar
 				PageIcon* _tmp49_ = NULL;
 				GtkBox* _tmp50_ = NULL;
 				PageIcon* _tmp51_ = NULL;
-#line 1276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (!_tmp2_) {
-#line 5987 "ui.c"
+#line 6022 "ui.c"
 					gint _tmp3_ = 0;
-#line 1276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp3_ = i;
-#line 1276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					i = _tmp3_ + 1;
-#line 5993 "ui.c"
+#line 6028 "ui.c"
 				}
-#line 1276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp2_ = FALSE;
-#line 1276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp4_ = items;
-#line 1276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp5_ = i;
-#line 1276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp6_ = string_get (_tmp4_, (glong) _tmp5_);
-#line 1276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (!(_tmp6_ != '\0')) {
-#line 1276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					break;
-#line 6007 "ui.c"
+#line 6042 "ui.c"
 				}
-#line 1278 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1284 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp7_ = items;
-#line 1278 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1284 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp8_ = i;
-#line 1278 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1284 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp9_ = string_get (_tmp7_, (glong) _tmp8_);
-#line 1278 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1284 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp9_ == '-') {
-#line 6017 "ui.c"
+#line 6052 "ui.c"
 					GtkArrow* a = NULL;
 					GtkArrow* _tmp10_ = NULL;
 					GtkArrow* _tmp11_ = NULL;
 					GtkBox* _tmp12_ = NULL;
 					GtkArrow* _tmp13_ = NULL;
-#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp10_ = (GtkArrow*) gtk_arrow_new (GTK_ARROW_RIGHT, GTK_SHADOW_NONE);
-#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					g_object_ref_sink (_tmp10_);
-#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					a = _tmp10_;
-#line 1281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp11_ = a;
-#line 1281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_widget_set_visible ((GtkWidget*) _tmp11_, TRUE);
-#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp12_ = box;
-#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp13_ = a;
-#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_box_pack_start (_tmp12_, (GtkWidget*) _tmp13_, FALSE, FALSE, (guint) 0);
-#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_g_object_unref0 (page_box);
-#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					page_box = NULL;
-#line 1284 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_g_object_unref0 (a);
-#line 1284 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					continue;
-#line 6047 "ui.c"
+#line 6082 "ui.c"
 				}
-#line 1288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp14_ = items;
-#line 1288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp15_ = i;
-#line 1288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp16_ = string_get (_tmp14_, (glong) _tmp15_);
-#line 1288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				side = _tmp16_;
-#line 1289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp17_ = i;
-#line 1289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				i = _tmp17_ + 1;
-#line 1290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp18_ = items;
-#line 1290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp19_ = i;
-#line 1290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp20_ = string_get (_tmp18_, (glong) _tmp19_);
-#line 1290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp20_ == '\0') {
-#line 1291 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					break;
-#line 6071 "ui.c"
+#line 6106 "ui.c"
 				}
-#line 1293 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp21_ = page_box;
-#line 1293 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp21_ == NULL) {
-#line 6077 "ui.c"
+#line 6112 "ui.c"
 					GtkBox* _tmp22_ = NULL;
 					GtkBox* _tmp23_ = NULL;
 					GtkBox* _tmp24_ = NULL;
 					GtkBox* _tmp25_ = NULL;
-#line 1295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp22_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
-#line 1295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					g_object_ref_sink (_tmp22_);
-#line 1295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_g_object_unref0 (page_box);
-#line 1295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					page_box = _tmp22_;
-#line 1296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp23_ = page_box;
-#line 1296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_widget_set_visible ((GtkWidget*) _tmp23_, TRUE);
-#line 1297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp24_ = box;
-#line 1297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp25_ = page_box;
-#line 1297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_box_pack_start (_tmp24_, (GtkWidget*) _tmp25_, FALSE, FALSE, (guint) 0);
-#line 6100 "ui.c"
+#line 6135 "ui.c"
 				}
-#line 1301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				r = 1.0;
-#line 1302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				g = 1.0;
-#line 1303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1309 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				b = 1.0;
-#line 1304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp26_ = side;
-#line 1304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				switch (_tmp26_) {
-#line 1304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					case 'F':
-#line 6114 "ui.c"
+#line 6149 "ui.c"
 					{
-#line 1308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1314 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						r = 0x75 / 255.0;
-#line 1309 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1315 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						g = 0x50 / 255.0;
-#line 1310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1316 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						b = 0x7B / 255.0;
-#line 1311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1317 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						break;
-#line 6124 "ui.c"
+#line 6159 "ui.c"
 					}
-#line 1304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					case 'B':
-#line 6128 "ui.c"
+#line 6163 "ui.c"
 					{
-#line 1314 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1320 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						r = 0xF5 / 255.0;
-#line 1315 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						g = 0x79 / 255.0;
-#line 1316 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1322 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						b = 0.0;
-#line 1317 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1323 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						break;
-#line 6138 "ui.c"
+#line 6173 "ui.c"
 					}
-#line 1304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					case 'C':
-#line 6142 "ui.c"
+#line 6177 "ui.c"
 					{
 						gdouble p = 0.0;
 						const gchar* _tmp27_ = NULL;
@@ -6147,129 +6182,129 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar
 						gdouble _tmp30_ = 0.0;
 						gdouble _tmp31_ = 0.0;
 						gdouble _tmp32_ = 0.0;
-#line 1320 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1326 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp27_ = items;
-#line 1320 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1326 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp28_ = i;
-#line 1320 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1326 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp29_ = string_get (_tmp27_, (glong) _tmp28_);
-#line 1320 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1326 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						p = (_tmp29_ - '1') / 5.0;
-#line 1321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1327 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp30_ = p;
-#line 1321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1327 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp31_ = p;
-#line 1321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1327 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						r = ((0xED / 255.0) * (1 - _tmp30_)) + (0xCC * _tmp31_);
-#line 1322 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp32_ = p;
-#line 1322 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						g = (0xD4 / 255.0) * (1 - _tmp32_);
-#line 1323 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1329 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						b = (gdouble) 0;
-#line 1324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1330 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						break;
-#line 6173 "ui.c"
+#line 6208 "ui.c"
 					}
 					default:
-#line 1304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					break;
-#line 6178 "ui.c"
+#line 6213 "ui.c"
 				}
-#line 1328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp33_ = r;
-#line 1328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp34_ = r;
-#line 1328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				r = _tmp33_ + ((1.0 - _tmp34_) * 0.7);
-#line 1329 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp35_ = g;
-#line 1329 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp36_ = g;
-#line 1329 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				g = _tmp35_ + ((1.0 - _tmp36_) * 0.7);
-#line 1330 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp37_ = b;
-#line 1330 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp38_ = b;
-#line 1330 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				b = _tmp37_ + ((1.0 - _tmp38_) * 0.7);
-#line 1332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp39_ = items;
-#line 1332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp40_ = i;
-#line 1332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp41_ = string_get (_tmp39_, (glong) _tmp40_);
-#line 1332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp42_ = g_strdup_printf ("%c", (gint) _tmp41_);
-#line 1332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp43_ = _tmp42_;
-#line 1332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp44_ = r;
-#line 1332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp45_ = g;
-#line 1332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp46_ = b;
-#line 1332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp47_ = page_icon_new (_tmp43_, _tmp44_, _tmp45_, _tmp46_);
-#line 1332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				g_object_ref_sink (_tmp47_);
-#line 1332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp48_ = _tmp47_;
-#line 1332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (_tmp43_);
-#line 1332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				icon = _tmp48_;
-#line 1333 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1339 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp49_ = icon;
-#line 1333 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1339 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				gtk_widget_set_visible ((GtkWidget*) _tmp49_, TRUE);
-#line 1334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1340 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp50_ = page_box;
-#line 1334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1340 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp51_ = icon;
-#line 1334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1340 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				gtk_box_pack_start (_tmp50_, (GtkWidget*) _tmp51_, FALSE, FALSE, (guint) 0);
-#line 1276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_object_unref0 (icon);
-#line 6236 "ui.c"
+#line 6271 "ui.c"
 			}
 		}
 	}
-#line 1337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1343 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = box;
-#line 1337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1343 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (page_box);
-#line 1337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1343 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 6246 "ui.c"
+#line 6281 "ui.c"
 }
 
 
 static void user_interface_save_file_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
-#line 1341 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1347 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1341 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1347 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1343 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1349 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_document (self, FALSE);
-#line 6257 "ui.c"
+#line 6292 "ui.c"
 }
 
 
 static void _user_interface_save_file_button_clicked_cb_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_file_button_clicked_cb ((UserInterface*) self, _sender);
-#line 6264 "ui.c"
+#line 6299 "ui.c"
 }
 
 
 void user_interface_save_document_activate_cb (UserInterface* self) {
-#line 1346 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1352 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1354 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_document (self, FALSE);
-#line 6273 "ui.c"
+#line 6308 "ui.c"
 }
 
 
@@ -6280,76 +6315,76 @@ static void user_interface_copy_to_clipboard_button_clicked_cb (UserInterface* s
 	Page* _tmp2_ = NULL;
 	Page* _tmp3_ = NULL;
 	Page* _tmp4_ = NULL;
-#line 1352 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1352 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1354 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
-#line 1354 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_view_get_selected_page (_tmp0_);
-#line 1354 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1354 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _page_ref0 (_tmp2_);
-#line 1354 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp3_;
-#line 1355 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page;
-#line 1355 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp4_ != NULL) {
-#line 6302 "ui.c"
+#line 6337 "ui.c"
 		Page* _tmp5_ = NULL;
-#line 1356 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = page;
-#line 1356 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		page_copy_to_clipboard (_tmp5_, (GtkWindow*) self);
-#line 6308 "ui.c"
+#line 6343 "ui.c"
 	}
-#line 1352 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 6312 "ui.c"
+#line 6347 "ui.c"
 }
 
 
 static void _user_interface_copy_to_clipboard_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_copy_to_clipboard_button_clicked_cb ((UserInterface*) self, _sender);
-#line 6319 "ui.c"
+#line 6354 "ui.c"
 }
 
 
 static void user_interface_save_as_file_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
-#line 1360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1366 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1366 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1368 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_document (self, TRUE);
-#line 6330 "ui.c"
+#line 6365 "ui.c"
 }
 
 
 static void _user_interface_save_as_file_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_as_file_button_clicked_cb ((UserInterface*) self, _sender);
-#line 6337 "ui.c"
+#line 6372 "ui.c"
 }
 
 
 void user_interface_save_as_document_activate_cb (UserInterface* self) {
-#line 1365 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1371 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1367 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1373 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_document (self, TRUE);
-#line 6346 "ui.c"
+#line 6381 "ui.c"
 }
 
 
 static gpointer _cairo_reference0 (gpointer self) {
-#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self ? cairo_reference (self) : NULL;
-#line 6353 "ui.c"
+#line 6388 "ui.c"
 }
 
 
@@ -6387,118 +6422,118 @@ static void user_interface_draw_page (UserInterface* self, GtkPrintOperation* op
 	GdkPixbuf* _tmp30_ = NULL;
 	cairo_t* _tmp31_ = NULL;
 	cairo_t* _tmp32_ = NULL;
-#line 1370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (operation != NULL);
-#line 1370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (print_context != NULL);
-#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = print_context;
-#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_print_context_get_cairo_context (_tmp0_);
-#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _cairo_reference0 (_tmp1_);
-#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	context = _tmp2_;
-#line 1375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->_book;
-#line 1375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page_number;
-#line 1375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = book_get_page (_tmp3_, _tmp4_);
-#line 1375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp5_;
-#line 1378 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	is_landscape = FALSE;
-#line 1379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1385 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = print_context;
-#line 1379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1385 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = gtk_print_context_get_width (_tmp6_);
-#line 1379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1385 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = print_context;
-#line 1379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1385 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = gtk_print_context_get_height (_tmp8_);
-#line 1379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1385 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp7_ > _tmp9_) {
-#line 1380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1386 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		is_landscape = TRUE;
-#line 6427 "ui.c"
+#line 6462 "ui.c"
 	}
-#line 1381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = page;
-#line 1381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = page_get_is_landscape (_tmp10_);
-#line 1381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = _tmp11_;
-#line 1381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = is_landscape;
-#line 1381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp12_ != _tmp13_) {
-#line 6439 "ui.c"
+#line 6474 "ui.c"
 		cairo_t* _tmp14_ = NULL;
 		GtkPrintContext* _tmp15_ = NULL;
 		gdouble _tmp16_ = 0.0;
 		cairo_t* _tmp17_ = NULL;
-#line 1383 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1389 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp14_ = context;
-#line 1383 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1389 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = print_context;
-#line 1383 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1389 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp16_ = gtk_print_context_get_width (_tmp15_);
-#line 1383 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1389 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		cairo_translate (_tmp14_, _tmp16_, (gdouble) 0);
-#line 1384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp17_ = context;
-#line 1384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		cairo_rotate (_tmp17_, G_PI_2);
-#line 6456 "ui.c"
+#line 6491 "ui.c"
 	}
-#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = context;
-#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp19_ = print_context;
-#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp20_ = gtk_print_context_get_dpi_x (_tmp19_);
-#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp21_ = page;
-#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp22_ = page_get_dpi (_tmp21_);
-#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp23_ = _tmp22_;
-#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp24_ = print_context;
-#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp25_ = gtk_print_context_get_dpi_y (_tmp24_);
-#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp26_ = page;
-#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp27_ = page_get_dpi (_tmp26_);
-#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp28_ = _tmp27_;
-#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_scale (_tmp18_, _tmp20_ / _tmp23_, _tmp25_ / _tmp28_);
-#line 1390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1396 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp29_ = page;
-#line 1390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1396 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp30_ = page_get_image (_tmp29_, TRUE);
-#line 1390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1396 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	image = _tmp30_;
-#line 1391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1397 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp31_ = context;
-#line 1391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1397 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gdk_cairo_set_source_pixbuf (_tmp31_, image, (gdouble) 0, (gdouble) 0);
-#line 1392 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1398 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp32_ = context;
-#line 1392 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1398 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_paint (_tmp32_);
-#line 1370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (image);
-#line 1370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 1370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_cairo_destroy0 (context);
-#line 6502 "ui.c"
+#line 6537 "ui.c"
 }
 
 
@@ -6506,26 +6541,26 @@ static void user_interface_email_button_clicked_cb (UserInterface* self, GtkWidg
 	const gchar* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
-#line 1396 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1396 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1398 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1404 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->document_hint;
-#line 1398 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1404 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_quality (self);
-#line 1398 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1404 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1398 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1404 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_emit_by_name (self, "email", _tmp0_, _tmp2_);
-#line 6522 "ui.c"
+#line 6557 "ui.c"
 }
 
 
 static void _user_interface_email_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_email_button_clicked_cb ((UserInterface*) self, _sender);
-#line 6529 "ui.c"
+#line 6564 "ui.c"
 }
 
 
@@ -6533,24 +6568,24 @@ void user_interface_email_document_activate_cb (UserInterface* self) {
 	const gchar* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
-#line 1401 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1407 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1403 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1409 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->document_hint;
-#line 1403 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1409 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_quality (self);
-#line 1403 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1409 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1403 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1409 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_emit_by_name (self, "email", _tmp0_, _tmp2_);
-#line 6547 "ui.c"
+#line 6582 "ui.c"
 }
 
 
 static void _user_interface_draw_page_gtk_print_operation_draw_page (GtkPrintOperation* _sender, GtkPrintContext* context, gint page_nr, gpointer self) {
-#line 1410 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_draw_page ((UserInterface*) self, _sender, context, page_nr);
-#line 6554 "ui.c"
+#line 6589 "ui.c"
 }
 
 
@@ -6562,29 +6597,29 @@ static void user_interface_print_document (UserInterface* self) {
 	guint _tmp3_ = 0U;
 	guint _tmp6_ = 0U;
 	GError * _inner_error_ = NULL;
-#line 1406 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1408 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1414 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = gtk_print_operation_new ();
-#line 1408 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1414 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	print = _tmp0_;
-#line 1409 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1415 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->_book;
-#line 1409 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1415 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = book_get_n_pages (_tmp1_);
-#line 1409 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1415 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 1409 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1415 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_set (print, "n-pages", (gint) _tmp3_, NULL);
-#line 1410 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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 6582 "ui.c"
+#line 6617 "ui.c"
 	{
-#line 1414 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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 1414 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1420 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6588 "ui.c"
+#line 6623 "ui.c"
 			goto __catch20_g_error;
 		}
 	}
@@ -6594,90 +6629,90 @@ static void user_interface_print_document (UserInterface* self) {
 		GError* e = NULL;
 		GError* _tmp4_ = NULL;
 		const gchar* _tmp5_ = NULL;
-#line 1412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 1412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_inner_error_ = NULL;
 #line 1418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_inner_error_ = NULL;
+#line 1424 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = e;
-#line 1418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1424 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = _tmp4_->message;
+#line 1424 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_warning ("ui.vala:1424: Error printing: %s", _tmp5_);
 #line 1418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_warning ("ui.vala:1418: Error printing: %s", _tmp5_);
-#line 1412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 6610 "ui.c"
+#line 6645 "ui.c"
 	}
 	__finally20:
-#line 1412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (print);
-#line 1412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1418 "/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 1412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 1412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 6623 "ui.c"
+#line 6658 "ui.c"
 	}
-#line 1421 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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);
-#line 1421 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_handlers_disconnect_matched (print, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _user_interface_draw_page_gtk_print_operation_draw_page, self);
-#line 1406 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (print);
-#line 6631 "ui.c"
+#line 6666 "ui.c"
 }
 
 
 static void user_interface_print_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
-#line 1425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1431 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1431 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1433 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_print_document (self);
-#line 6642 "ui.c"
+#line 6677 "ui.c"
 }
 
 
 static void _user_interface_print_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_print_button_clicked_cb ((UserInterface*) self, _sender);
-#line 6649 "ui.c"
+#line 6684 "ui.c"
 }
 
 
 void user_interface_print_document_activate_cb (UserInterface* self) {
-#line 1430 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1436 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1432 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1438 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_print_document (self);
-#line 6658 "ui.c"
+#line 6693 "ui.c"
 }
 
 
 static void user_interface_launch_help (UserInterface* self) {
 	GError * _inner_error_ = NULL;
-#line 1435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 6666 "ui.c"
+#line 6701 "ui.c"
 	{
 		GdkScreen* _tmp0_ = NULL;
 		GdkScreen* _tmp1_ = NULL;
 		guint32 _tmp2_ = 0U;
-#line 1439 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1445 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = gtk_window_get_screen ((GtkWindow*) self);
-#line 1439 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1445 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = _tmp0_;
-#line 1439 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1445 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = gtk_get_current_event_time ();
-#line 1439 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1445 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_show_uri (_tmp1_, "help:simple-scan", _tmp2_, &_inner_error_);
-#line 1439 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1445 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6681 "ui.c"
+#line 6716 "ui.c"
 			goto __catch21_g_error;
 		}
 	}
@@ -6688,60 +6723,60 @@ static void user_interface_launch_help (UserInterface* self) {
 		const gchar* _tmp3_ = NULL;
 		GError* _tmp4_ = NULL;
 		const gchar* _tmp5_ = NULL;
-#line 1437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 1437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_inner_error_ = NULL;
 #line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_inner_error_ = NULL;
+#line 1449 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = _ ("Unable to open help file");
-#line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1449 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = e;
-#line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1449 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = _tmp4_->message;
-#line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1449 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_show_error_dialog (self, _tmp3_, _tmp5_);
-#line 1437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 6706 "ui.c"
+#line 6741 "ui.c"
 	}
 	__finally21:
-#line 1437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1443 "/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 1437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 1437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 6717 "ui.c"
+#line 6752 "ui.c"
 	}
 }
 
 
 static void user_interface_help_contents_menuitem_activate_cb (UserInterface* self, GtkWidget* widget) {
-#line 1450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1456 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1456 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1458 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_launch_help (self);
-#line 6729 "ui.c"
+#line 6764 "ui.c"
 }
 
 
 static void _user_interface_help_contents_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_help_contents_menuitem_activate_cb ((UserInterface*) self, _sender);
-#line 6736 "ui.c"
+#line 6771 "ui.c"
 }
 
 
 void user_interface_help_contents_activate_cb (UserInterface* self) {
-#line 1455 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1461 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1457 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1463 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_launch_help (self);
-#line 6745 "ui.c"
+#line 6780 "ui.c"
 }
 
 
@@ -6761,21 +6796,21 @@ static void user_interface_show_about (UserInterface* self) {
 	const gchar* _tmp6_ = NULL;
 	gchar* _tmp7_ = NULL;
 	const gchar* _tmp8_ = NULL;
-#line 1460 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1466 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = g_strdup ("Robert Ancell <robert.ancell@canonical.com>");
-#line 1462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_new0 (gchar*, 1 + 1);
-#line 1462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_[0] = _tmp0_;
-#line 1462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	authors = _tmp1_;
-#line 1462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	authors_length1 = 1;
-#line 1462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_authors_size_ = authors_length1;
-#line 1465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _ ("This program is free software: you can redistribute it and/or modify\n" \
 "it under the terms of the GNU General Public License as published by\n" \
 "the Free Software Foundation, either version 3 of the License, or\n" \
@@ -6788,62 +6823,62 @@ static void user_interface_show_about (UserInterface* self) {
 "\n" \
 "You should have received a copy of the GNU General Public License\n" \
 "along with this program.  If not, see <http://www.gnu.org/licenses/>.");
-#line 1465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 1465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	license = _tmp3_;
-#line 1468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = _ ("About Simple Scan");
-#line 1468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = g_strdup (_tmp4_);
-#line 1468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	title = _tmp5_;
-#line 1471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1477 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = _ ("Simple document scanning tool");
-#line 1471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1477 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = g_strdup (_tmp6_);
-#line 1471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1477 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	description = _tmp7_;
-#line 1473 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1479 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = _ ("translator-credits");
-#line 1473 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_show_about_dialog ((GtkWindow*) self, "title", title, "program-name", "Simple Scan", "version", VERSION, "comments", description, "logo-icon-name", "scanner", "authors", authors, "translator-credits", _tmp8_, "website", "https://launchpad.net/simple-scan", "copyright", "Copyright © 2009-2011 Canonical Ltd.", "license", license, "wrap-license", TRUE, NULL, NULL);
-#line 1460 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1479 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_show_about_dialog ((GtkWindow*) self, "title", title, "program-name", "Simple Scan", "version", VERSION, "comments", description, "logo-icon-name", "scanner", "authors", authors, "translator-credits", _tmp8_, "website", "https://launchpad.net/simple-scan", "copyright", "Copyright © 2009-2015 Canonical Ltd.", "license", license, "wrap-license", TRUE, NULL, NULL);
+#line 1466 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (description);
-#line 1460 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1466 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (title);
-#line 1460 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1466 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (license);
-#line 1460 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1466 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	authors = (_vala_array_free (authors, authors_length1, (GDestroyNotify) g_free), NULL);
-#line 6809 "ui.c"
+#line 6844 "ui.c"
 }
 
 
 static void user_interface_about_menuitem_activate_cb (UserInterface* self, GtkWidget* widget) {
-#line 1489 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1489 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1491 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1497 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_show_about (self);
-#line 6820 "ui.c"
+#line 6855 "ui.c"
 }
 
 
 static void _user_interface_about_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_about_menuitem_activate_cb ((UserInterface*) self, _sender);
-#line 6827 "ui.c"
+#line 6862 "ui.c"
 }
 
 
 void user_interface_about_activate_cb (UserInterface* self) {
-#line 1494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1500 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_show_about (self);
-#line 6836 "ui.c"
+#line 6871 "ui.c"
 }
 
 
@@ -6854,110 +6889,110 @@ static gboolean user_interface_on_quit (UserInterface* self) {
 	gboolean _tmp2_ = FALSE;
 	guint _tmp3_ = 0U;
 	AutosaveManager* _tmp4_ = NULL;
-#line 1499 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1505 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1501 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1507 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = _ ("Save document before quitting?");
-#line 1501 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1507 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _ ("Quit without Saving");
-#line 1501 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1507 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = user_interface_prompt_to_save (self, _tmp0_, _tmp1_);
-#line 1501 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1507 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp2_) {
-#line 1505 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1511 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = FALSE;
-#line 1505 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1511 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 6861 "ui.c"
+#line 6896 "ui.c"
 	}
-#line 1507 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1513 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_destroy ((GtkWidget*) self);
-#line 1509 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1515 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->save_state_timeout;
-#line 1509 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1515 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp3_ != ((guint) 0)) {
-#line 1510 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_save_state (self, TRUE);
-#line 6871 "ui.c"
+#line 6906 "ui.c"
 	}
-#line 1512 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1518 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = self->priv->autosave_manager;
-#line 1512 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1518 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	autosave_manager_cleanup (_tmp4_);
-#line 1514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1520 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = TRUE;
-#line 1514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1520 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 6881 "ui.c"
+#line 6916 "ui.c"
 }
 
 
 static void user_interface_quit_menuitem_activate_cb (UserInterface* self, GtkWidget* widget) {
-#line 1518 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1518 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1520 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1526 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_on_quit (self);
-#line 6892 "ui.c"
+#line 6927 "ui.c"
 }
 
 
 static void _user_interface_quit_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_quit_menuitem_activate_cb ((UserInterface*) self, _sender);
-#line 6899 "ui.c"
+#line 6934 "ui.c"
 }
 
 
 void user_interface_quit_activate_cb (UserInterface* self) {
-#line 1523 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1529 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1525 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1531 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_on_quit (self);
-#line 6908 "ui.c"
+#line 6943 "ui.c"
 }
 
 
 static gboolean user_interface_simple_scan_window_configure_event_cb (UserInterface* self, GtkWidget* widget, GdkEventConfigure* event) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 1529 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1535 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1529 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1535 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (widget != NULL, FALSE);
-#line 1529 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1535 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1531 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1537 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->window_is_maximized;
-#line 1531 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1537 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp0_) {
-#line 6925 "ui.c"
+#line 6960 "ui.c"
 		GdkEventConfigure* _tmp1_ = NULL;
 		gint _tmp2_ = 0;
 		GdkEventConfigure* _tmp3_ = NULL;
 		gint _tmp4_ = 0;
-#line 1533 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = event;
-#line 1533 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = _tmp1_->width;
-#line 1533 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->window_width = _tmp2_;
-#line 1534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1540 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = event;
-#line 1534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1540 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = _tmp3_->height;
-#line 1534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1540 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->window_height = _tmp4_;
-#line 1535 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1541 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_save_state (self, FALSE);
-#line 6944 "ui.c"
+#line 6979 "ui.c"
 	}
-#line 1538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1544 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
-#line 1538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1544 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 6950 "ui.c"
+#line 6985 "ui.c"
 }
 
 
@@ -6966,101 +7001,101 @@ 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 6959 "ui.c"
+#line 6994 "ui.c"
 }
 
 
 static void user_interface_info_bar_response_cb (UserInterface* self, GtkInfoBar* widget, gint response_id) {
 	gint _tmp0_ = 0;
-#line 1541 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1547 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1541 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1547 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1543 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1549 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = response_id;
-#line 1543 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1549 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	switch (_tmp0_) {
-#line 1543 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1549 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case 1:
-#line 6975 "ui.c"
+#line 7010 "ui.c"
 		{
 			GtkComboBox* _tmp1_ = NULL;
 			GtkDialog* _tmp2_ = NULL;
-#line 1547 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1553 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp1_ = self->priv->device_combo;
-#line 1547 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1553 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			gtk_widget_grab_focus ((GtkWidget*) _tmp1_);
-#line 1548 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1554 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp2_ = self->priv->preferences_dialog;
-#line 1548 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1554 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			gtk_window_present ((GtkWindow*) _tmp2_);
-#line 1549 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1555 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 6989 "ui.c"
+#line 7024 "ui.c"
 		}
-#line 1543 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1549 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case 2:
-#line 6993 "ui.c"
+#line 7028 "ui.c"
 		{
-#line 1552 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1558 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			user_interface_install_drivers (self);
-#line 1553 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 6999 "ui.c"
+#line 7034 "ui.c"
 		}
 		default:
 		{
-#line 1555 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1561 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			self->priv->have_error = FALSE;
-#line 1556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_free0 (self->priv->error_title);
-#line 1556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			self->priv->error_title = NULL;
-#line 1557 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_free0 (self->priv->error_text);
-#line 1557 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			self->priv->error_text = NULL;
-#line 1558 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			user_interface_update_info_bar (self);
-#line 1559 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 7017 "ui.c"
+#line 7052 "ui.c"
 		}
 	}
 }
 
 
 static Block3Data* block3_data_ref (Block3Data* _data3_) {
-#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_atomic_int_inc (&_data3_->_ref_count_);
-#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return _data3_;
-#line 7028 "ui.c"
+#line 7063 "ui.c"
 }
 
 
 static void block3_data_unref (void * _userdata_) {
 	Block3Data* _data3_;
 	_data3_ = (Block3Data*) _userdata_;
-#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (g_atomic_int_dec_and_test (&_data3_->_ref_count_)) {
-#line 7037 "ui.c"
+#line 7072 "ui.c"
 		UserInterface* self;
-#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self = _data3_->self;
-#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (_data3_->instructions_label);
-#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (_data3_->status_label);
-#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (_data3_->spinner);
-#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (_data3_->stack);
-#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (self);
-#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_slice_free (Block3Data, _data3_);
-#line 7053 "ui.c"
+#line 7088 "ui.c"
 	}
 }
 
@@ -7070,9 +7105,9 @@ static void ___lambda12_ (UserInterface* self) {
 
 
 static void ____lambda12__pk_progress_callback (PkProgress* progress, PkProgressType type, gpointer self) {
-#line 1640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	___lambda12_ ((UserInterface*) self);
-#line 7065 "ui.c"
+#line 7100 "ui.c"
 }
 
 
@@ -7087,36 +7122,37 @@ static void ___lambda13_ (Block3Data* _data3_, GObject* object, GAsyncResult* _r
 	const gchar* _tmp5_ = NULL;
 	gchar* _tmp6_ = NULL;
 	GtkLabel* _tmp23_ = NULL;
+	const gchar* _tmp24_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = _data3_->self;
-#line 1640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (_result_ != NULL);
-#line 1642 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = _data3_->status_label;
-#line 1642 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp0_, TRUE);
-#line 1643 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1649 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _data3_->spinner;
-#line 1643 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1649 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_set (_tmp1_, "active", FALSE, NULL);
-#line 1644 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _data3_->status_label;
-#line 1644 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_label_set_text (_tmp2_, "☒");
-#line 1645 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _data3_->stack;
-#line 1645 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = _data3_->status_label;
-#line 1645 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_stack_set_visible_child (_tmp3_, (GtkWidget*) _tmp4_);
-#line 1647 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = _ ("Drivers installed successfully!");
-#line 1647 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = g_strdup (_tmp5_);
-#line 1647 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result_text = _tmp6_;
-#line 7109 "ui.c"
+#line 7145 "ui.c"
 	{
 		PkResults* results = NULL;
 		GAsyncResult* _tmp7_ = NULL;
@@ -7124,68 +7160,67 @@ static void ___lambda13_ (Block3Data* _data3_, GObject* object, GAsyncResult* _r
 		PkError* _tmp9_ = NULL;
 		PkError* _tmp10_ = NULL;
 		gboolean _tmp11_ = FALSE;
-#line 1650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = _result_;
-#line 1650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = user_interface_install_packages_finish (self, _tmp7_, &_inner_error_);
-#line 1650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		results = _tmp8_;
-#line 1650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7125 "ui.c"
+#line 7161 "ui.c"
 			goto __catch22_g_error;
 		}
-#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_ = pk_results_get_error_code (results);
-#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp10_ = _tmp9_;
-#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp11_ = _tmp10_ == NULL;
-#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (_tmp10_);
-#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp11_) {
-#line 7138 "ui.c"
+#line 7174 "ui.c"
 			GtkLabel* _tmp12_ = NULL;
-#line 1652 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp12_ = _data3_->status_label;
-#line 1652 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			gtk_label_set_text (_tmp12_, "☑");
-#line 7144 "ui.c"
+#line 7180 "ui.c"
 		} else {
 			PkError* e = NULL;
 			PkError* _tmp13_ = NULL;
-			gchar* error_text = NULL;
 			const gchar* _tmp14_ = NULL;
 			PkError* _tmp15_ = NULL;
 			PkErrorEnum _tmp16_ = 0;
 			PkErrorEnum _tmp17_ = 0;
 			gchar* _tmp18_ = NULL;
-#line 1655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1661 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp13_ = pk_results_get_error_code (results);
-#line 1655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1661 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			e = _tmp13_;
-#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp14_ = _ ("Failed to install drivers (error code %d).");
-#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp15_ = e;
-#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			g_object_get (_tmp15_, "code", &_tmp16_, NULL);
-#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp17_ = _tmp16_;
-#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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"
-			error_text = _tmp18_;
-#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_g_free0 (error_text);
-#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_object_unref0 (e);
-#line 7174 "ui.c"
+#line 7209 "ui.c"
 		}
-#line 1648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (results);
-#line 7178 "ui.c"
+#line 7213 "ui.c"
 	}
 	goto __finally22;
 	__catch22_g_error:
@@ -7195,57 +7230,59 @@ static void ___lambda13_ (Block3Data* _data3_, GObject* object, GAsyncResult* _r
 		gchar* _tmp20_ = NULL;
 		GError* _tmp21_ = NULL;
 		const gchar* _tmp22_ = NULL;
-#line 1648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 1648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 1664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1669 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp19_ = _ ("Failed to install drivers.");
-#line 1664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1669 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp20_ = g_strdup (_tmp19_);
-#line 1664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (self->priv->error_text);
-#line 1664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		self->priv->error_text = _tmp20_;
-#line 1665 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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 1665 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp22_ = _tmp21_->message;
-#line 1665 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_warning ("ui.vala:1665: Failed to install drivers: %s", _tmp22_);
-#line 1648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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 7208 "ui.c"
+#line 7243 "ui.c"
 	}
 	__finally22:
-#line 1648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (result_text);
-#line 1648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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 1648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 1648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 7221 "ui.c"
+#line 7256 "ui.c"
 	}
-#line 1667 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1672 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp23_ = _data3_->instructions_label;
-#line 1667 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_label_set_text (_tmp23_, result_text);
-#line 1640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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 7229 "ui.c"
+#line 7266 "ui.c"
 }
 
 
 static void ____lambda13__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self) {
-#line 1640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	___lambda13_ (self, source_object, res);
-#line 1640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	block3_data_unref (self);
-#line 7238 "ui.c"
+#line 7275 "ui.c"
 }
 
 
@@ -7262,21 +7299,21 @@ static void user_interface_install_drivers (UserInterface* self) {
 	const gchar* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
 	GQuark _tmp6_ = 0U;
-#line 1567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	static GQuark _tmp5_label0 = 0;
-#line 1567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	static GQuark _tmp5_label1 = 0;
-#line 1567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	static GQuark _tmp5_label2 = 0;
-#line 1567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	static GQuark _tmp5_label3 = 0;
-#line 1567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	static GQuark _tmp5_label4 = 0;
-#line 1567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	static GQuark _tmp5_label5 = 0;
-#line 1567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	static GQuark _tmp5_label6 = 0;
-#line 7269 "ui.c"
+#line 7306 "ui.c"
 	GtkDialog* dialog = NULL;
 	const gchar* _tmp23_ = NULL;
 	const gchar* _tmp24_ = NULL;
@@ -7330,397 +7367,397 @@ static void user_interface_install_drivers (UserInterface* self) {
 	gint _tmp69__length1 = 0;
 	GtkDialog* _tmp75_ = NULL;
 	GtkDialog* _tmp76_ = NULL;
-#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data3_ = g_slice_new0 (Block3Data);
-#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data3_->_ref_count_ = 1;
-#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data3_->self = g_object_ref (self);
-#line 1565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = g_strdup ("");
-#line 1565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	message = _tmp0_;
-#line 1565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_strdup ("");
-#line 1565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	instructions = _tmp1_;
-#line 1566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = g_new0 (gchar*, 0 + 1);
-#line 1566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	packages_to_install = _tmp2_;
-#line 1566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	packages_to_install_length1 = 0;
-#line 1566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_packages_to_install_size_ = packages_to_install_length1;
-#line 1567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->missing_driver;
-#line 1567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = _tmp3_;
-#line 1567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = (NULL == _tmp4_) ? 0 : g_quark_from_string (_tmp4_);
-#line 1567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if ((((_tmp6_ == ((0 != _tmp5_label0) ? _tmp5_label0 : (_tmp5_label0 = g_quark_from_static_string ("brscan")))) || (_tmp6_ == ((0 != _tmp5_label1) ? _tmp5_label1 : (_tmp5_label1 = g_quark_from_static_string ("brscan2"))))) || (_tmp6_ == ((0 != _tmp5_label2) ? _tmp5_label2 : (_tmp5_label2 = g_quark_from_static_string ("brscan3"))))) || (_tmp6_ == ((0 != _tmp5_label3) ? _tmp5_label3 : (_tmp5_label3 = g_quark_from_static_string ("brscan4"))))) {
-#line 1567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		switch (0) {
-#line 7357 "ui.c"
+#line 7394 "ui.c"
 			default:
 			{
 				const gchar* _tmp7_ = NULL;
 				gchar* _tmp8_ = NULL;
 				const gchar* _tmp9_ = NULL;
 				gchar* _tmp10_ = NULL;
-#line 1574 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp7_ = _ ("You appear to have a Brother scanner.");
-#line 1574 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp8_ = g_strdup (_tmp7_);
-#line 1574 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (message);
-#line 1574 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				message = _tmp8_;
-#line 1576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp9_ = _ ("Drivers for this are available on the <a href=\"http://support.brother" \
 ".com\">Brother website</a>.");
-#line 1576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp10_ = g_strdup (_tmp9_);
-#line 1576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (instructions);
-#line 1576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				instructions = _tmp10_;
-#line 1577 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1583 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 7382 "ui.c"
+#line 7419 "ui.c"
 			}
 		}
 	} else if (_tmp6_ == ((0 != _tmp5_label4) ? _tmp5_label4 : (_tmp5_label4 = g_quark_from_static_string ("samsung")))) {
-#line 1567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		switch (0) {
-#line 7388 "ui.c"
+#line 7425 "ui.c"
 			default:
 			{
 				const gchar* _tmp11_ = NULL;
 				gchar* _tmp12_ = NULL;
 				const gchar* _tmp13_ = NULL;
 				gchar* _tmp14_ = NULL;
-#line 1580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1586 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp11_ = _ ("You appear to have a Samsung scanner.");
-#line 1580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1586 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp12_ = g_strdup (_tmp11_);
-#line 1580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1586 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (message);
-#line 1580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1586 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				message = _tmp12_;
-#line 1582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp13_ = _ ("Drivers for this are available on the <a href=\"http://samsung.com/sup" \
 "port\">Samsung website</a>.");
-#line 1582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp14_ = g_strdup (_tmp13_);
-#line 1582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (instructions);
-#line 1582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				instructions = _tmp14_;
-#line 1583 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1589 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 7413 "ui.c"
+#line 7450 "ui.c"
 			}
 		}
 	} else if (_tmp6_ == ((0 != _tmp5_label5) ? _tmp5_label5 : (_tmp5_label5 = g_quark_from_static_string ("hpaio")))) {
-#line 1567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		switch (0) {
-#line 7419 "ui.c"
+#line 7456 "ui.c"
 			default:
 			{
 				const gchar* _tmp15_ = NULL;
 				gchar* _tmp16_ = NULL;
 				gchar* _tmp17_ = NULL;
 				gchar** _tmp18_ = NULL;
-#line 1586 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1592 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp15_ = _ ("You appear to have an HP scanner.");
-#line 1586 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1592 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp16_ = g_strdup (_tmp15_);
-#line 1586 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1592 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (message);
-#line 1586 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1592 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				message = _tmp16_;
-#line 1587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp17_ = g_strdup ("libsane-hpaio");
-#line 1587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp18_ = g_new0 (gchar*, 1 + 1);
-#line 1587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp18_[0] = _tmp17_;
-#line 1587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				packages_to_install = (_vala_array_free (packages_to_install, packages_to_install_length1, (GDestroyNotify) g_free), NULL);
-#line 1587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				packages_to_install = _tmp18_;
-#line 1587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				packages_to_install_length1 = 1;
-#line 1587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_packages_to_install_size_ = packages_to_install_length1;
-#line 1588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 7450 "ui.c"
+#line 7487 "ui.c"
 			}
 		}
 	} else if (_tmp6_ == ((0 != _tmp5_label6) ? _tmp5_label6 : (_tmp5_label6 = g_quark_from_static_string ("epkowa")))) {
-#line 1567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		switch (0) {
-#line 7456 "ui.c"
+#line 7493 "ui.c"
 			default:
 			{
 				const gchar* _tmp19_ = NULL;
 				gchar* _tmp20_ = NULL;
 				const gchar* _tmp21_ = NULL;
 				gchar* _tmp22_ = NULL;
-#line 1591 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp19_ = _ ("You appear to have an Epson scanner.");
-#line 1591 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp20_ = g_strdup (_tmp19_);
-#line 1591 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (message);
-#line 1591 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				message = _tmp20_;
-#line 1593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp21_ = _ ("Drivers for this are available on the <a href=\"http://support.epsom.c" \
 "om\">Epson website</a>.");
-#line 1593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp22_ = g_strdup (_tmp21_);
-#line 1593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (instructions);
-#line 1593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				instructions = _tmp22_;
-#line 1594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 7481 "ui.c"
+#line 7518 "ui.c"
 			}
 		}
 	}
-#line 1596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1602 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp23_ = _ ("Install drivers");
-#line 1596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1602 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp24_ = _ ("_Close");
-#line 1596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1602 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp25_ = (GtkDialog*) gtk_dialog_new_with_buttons (_tmp23_, (GtkWindow*) self, GTK_DIALOG_MODAL, _tmp24_, GTK_RESPONSE_CLOSE, NULL);
-#line 1596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1602 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp25_);
-#line 1596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1602 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	dialog = _tmp25_;
-#line 1598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp26_ = dialog;
-#line 1598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp27_ = (GtkBox*) gtk_dialog_get_content_area (_tmp26_);
-#line 1598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_container_set_border_width ((GtkContainer*) _tmp27_, (guint) 12);
-#line 1599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1605 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp28_ = dialog;
-#line 1599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1605 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp29_ = (GtkBox*) gtk_dialog_get_content_area (_tmp28_);
-#line 1599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1605 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_set_spacing (_tmp29_, 6);
-#line 1601 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp30_ = message;
-#line 1601 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp31_ = (GtkLabel*) gtk_label_new (_tmp30_);
-#line 1601 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp31_);
-#line 1601 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	label = _tmp31_;
-#line 1602 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1608 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp32_ = label;
-#line 1602 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1608 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp32_, TRUE);
-#line 1603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp33_ = label;
-#line 1603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_label_set_xalign (_tmp33_, 0.f);
-#line 1604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1610 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp34_ = dialog;
-#line 1604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1610 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp35_ = (GtkBox*) gtk_dialog_get_content_area (_tmp34_);
-#line 1604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1610 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp36_ = label;
-#line 1604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1610 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (_tmp35_, (GtkWidget*) _tmp36_, TRUE, TRUE, (guint) 0);
-#line 1606 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp37_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
-#line 1606 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp37_);
-#line 1606 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	instructions_box = _tmp37_;
-#line 1607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1613 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp38_ = instructions_box;
-#line 1607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1613 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp38_, TRUE);
-#line 1608 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1614 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp39_ = dialog;
-#line 1608 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1614 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp40_ = (GtkBox*) gtk_dialog_get_content_area (_tmp39_);
-#line 1608 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1614 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp41_ = instructions_box;
-#line 1608 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1614 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (_tmp40_, (GtkWidget*) _tmp41_, TRUE, TRUE, (guint) 0);
-#line 1610 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1616 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp42_ = (GtkStack*) gtk_stack_new ();
-#line 1610 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1616 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp42_);
-#line 1610 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1616 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data3_->stack = _tmp42_;
-#line 1611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp43_ = instructions_box;
-#line 1611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp44_ = _data3_->stack;
-#line 1611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (_tmp43_, (GtkWidget*) _tmp44_, FALSE, FALSE, (guint) 0);
-#line 1613 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp45_ = (GtkSpinner*) gtk_spinner_new ();
-#line 1613 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp45_);
-#line 1613 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data3_->spinner = _tmp45_;
-#line 1614 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp46_ = _data3_->spinner;
-#line 1614 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp46_, TRUE);
-#line 1615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp47_ = _data3_->stack;
-#line 1615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp48_ = _data3_->spinner;
-#line 1615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_container_add ((GtkContainer*) _tmp47_, (GtkWidget*) _tmp48_);
-#line 1617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp49_ = (GtkLabel*) gtk_label_new ("");
-#line 1617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp49_);
-#line 1617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data3_->status_label = _tmp49_;
-#line 1618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1624 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp50_ = _data3_->status_label;
-#line 1618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1624 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp50_, TRUE);
-#line 1619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1625 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp51_ = _data3_->stack;
-#line 1619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1625 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp52_ = _data3_->status_label;
-#line 1619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1625 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_container_add ((GtkContainer*) _tmp51_, (GtkWidget*) _tmp52_);
-#line 1621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp53_ = instructions;
-#line 1621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp54_ = (GtkLabel*) gtk_label_new (_tmp53_);
-#line 1621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp54_);
-#line 1621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data3_->instructions_label = _tmp54_;
-#line 1622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp55_ = _data3_->instructions_label;
-#line 1622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp55_, TRUE);
-#line 1623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp56_ = _data3_->instructions_label;
-#line 1623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_label_set_xalign (_tmp56_, 0.f);
-#line 1624 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp57_ = _data3_->instructions_label;
-#line 1624 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_label_set_use_markup (_tmp57_, TRUE);
-#line 1625 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp58_ = instructions_box;
-#line 1625 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp59_ = _data3_->instructions_label;
-#line 1625 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (_tmp58_, (GtkWidget*) _tmp59_, FALSE, FALSE, (guint) 0);
-#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp60_ = _ ("Once installed you will need to restart Simple Scan.");
-#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp61_ = (GtkLabel*) gtk_label_new (_tmp60_);
-#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp61_);
-#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (label);
-#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	label = _tmp61_;
-#line 1629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp62_ = label;
-#line 1629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp62_, TRUE);
-#line 1630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp63_ = label;
-#line 1630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_label_set_xalign (_tmp63_, 0.f);
-#line 1631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp64_ = dialog;
-#line 1631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp65_ = (GtkBox*) gtk_dialog_get_content_area (_tmp64_);
-#line 1631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_container_set_border_width ((GtkContainer*) _tmp65_, (guint) 12);
-#line 1632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp66_ = dialog;
-#line 1632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp67_ = (GtkBox*) gtk_dialog_get_content_area (_tmp66_);
-#line 1632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp68_ = label;
-#line 1632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (_tmp67_, (GtkWidget*) _tmp68_, TRUE, TRUE, (guint) 0);
-#line 1634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp69_ = packages_to_install;
-#line 1634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp69__length1 = packages_to_install_length1;
-#line 1634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp69__length1 > 0) {
-#line 7657 "ui.c"
+#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 1636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1642 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp70_ = _data3_->stack;
-#line 1636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1642 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_set_visible ((GtkWidget*) _tmp70_, TRUE);
-#line 1637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1643 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp71_ = _data3_->spinner;
-#line 1637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1643 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_object_set (_tmp71_, "active", TRUE, NULL);
-#line 1638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1644 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp72_ = _data3_->instructions_label;
-#line 1638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1644 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp73_ = _ ("Installing drivers...");
-#line 1638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1644 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_label_set_text (_tmp72_, _tmp73_);
-#line 1640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp74_ = packages_to_install;
-#line 1640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp74__length1 = packages_to_install_length1;
-#line 1640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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 7684 "ui.c"
+#line 7721 "ui.c"
 	}
-#line 1671 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1676 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp75_ = dialog;
-#line 1671 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1676 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_dialog_run (_tmp75_);
-#line 1672 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1677 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp76_ = dialog;
-#line 1672 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1677 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_destroy ((GtkWidget*) _tmp76_);
-#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (instructions_box);
-#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (label);
-#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (dialog);
-#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	packages_to_install = (_vala_array_free (packages_to_install, packages_to_install_length1, (GDestroyNotify) g_free), NULL);
-#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (instructions);
-#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (message);
-#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	block3_data_unref (_data3_);
-#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data3_ = NULL;
-#line 7710 "ui.c"
+#line 7747 "ui.c"
 }
 
 
@@ -7733,7 +7770,7 @@ static void user_interface_install_packages_data_free (gpointer _data) {
 	_g_object_unref0 (_data_->self);
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_slice_free (UserInterfaceInstallPackagesData, _data_);
-#line 7723 "ui.c"
+#line 7760 "ui.c"
 }
 
 
@@ -7772,7 +7809,7 @@ static void user_interface_install_packages (UserInterface* self, gchar** packag
 	_data_->progress_callback_target = _tmp2__target;
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_install_packages_co (_data_);
-#line 7762 "ui.c"
+#line 7799 "ui.c"
 }
 
 
@@ -7783,7 +7820,7 @@ static PkResults* user_interface_install_packages_finish (UserInterface* self, G
 	if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (_res_), error)) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return NULL;
-#line 7773 "ui.c"
+#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_));
@@ -7793,21 +7830,21 @@ static PkResults* user_interface_install_packages_finish (UserInterface* self, G
 	_data_->result = NULL;
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 7783 "ui.c"
+#line 7820 "ui.c"
 }
 
 
 static void user_interface_install_packages_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_) {
 	UserInterfaceInstallPackagesData* _data_;
-#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_ = _user_data_;
-#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_source_object_ = source_object;
-#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_res_ = _res_;
-#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_install_packages_co (_data_);
-#line 7797 "ui.c"
+#line 7834 "ui.c"
 }
 
 
@@ -7822,7 +7859,7 @@ static gint g_ptr_array_get_length (GPtrArray* self) {
 	result = (gint) _tmp0_;
 #line 4428 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	return result;
-#line 7812 "ui.c"
+#line 7849 "ui.c"
 }
 
 
@@ -7834,446 +7871,446 @@ static void g_ptr_array_set_length (GPtrArray* self, gint value) {
 	_tmp0_ = value;
 #line 4429 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	g_ptr_array_set_size (self, _tmp0_);
-#line 7824 "ui.c"
+#line 7861 "ui.c"
 }
 
 
 static gboolean user_interface_install_packages_co (UserInterfaceInstallPackagesData* _data_) {
-#line 1675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	switch (_data_->_state_) {
-#line 1675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case 0:
-#line 7833 "ui.c"
+#line 7870 "ui.c"
 		goto _state_0;
-#line 1675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case 1:
-#line 7837 "ui.c"
+#line 7874 "ui.c"
 		goto _state_1;
-#line 1675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case 2:
-#line 7841 "ui.c"
+#line 7878 "ui.c"
 		goto _state_2;
 		default:
-#line 1675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_assert_not_reached ();
-#line 7846 "ui.c"
+#line 7883 "ui.c"
 	}
 	_state_0:
-#line 1677 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1682 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp0_ = NULL;
-#line 1677 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1682 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp0_ = pk_task_new ();
-#line 1677 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1682 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->task = _data_->_tmp0_;
-#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp2_ = NULL;
-#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp2_ = _data_->task;
-#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp3_ = NULL;
-#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp3__length1 = 0;
-#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp3_ = _data_->packages;
-#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp3__length1 = _data_->packages_length1;
-#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp4_ = NULL;
-#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp4__target = NULL;
-#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp4_ = _data_->progress_callback;
-#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp4__target = _data_->progress_callback_target;
-#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_state_ = 1;
-#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return FALSE;
-#line 7881 "ui.c"
+#line 7918 "ui.c"
 	_state_1:
-#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp5_ = NULL;
-#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp1_ = _data_->_tmp5_;
-#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
-#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_error_free (_data_->_inner_error_);
-#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (_data_->results);
-#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (_data_->task);
-#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_data_->_state_ == 0) {
-#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			g_simple_async_result_complete_in_idle (_data_->_async_result);
-#line 7903 "ui.c"
+#line 7940 "ui.c"
 		} else {
-#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			g_simple_async_result_complete (_data_->_async_result);
-#line 7907 "ui.c"
+#line 7944 "ui.c"
 		}
-#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_object_unref (_data_->_async_result);
-#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return FALSE;
-#line 7913 "ui.c"
+#line 7950 "ui.c"
 	}
-#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp6_ = NULL;
-#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp6_ = _data_->_tmp1_;
-#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp1_ = NULL;
-#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (_data_->results);
-#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->results = _data_->_tmp6_;
-#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp8_ = NULL;
-#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp8_ = _data_->results;
-#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_data_->_tmp8_ == NULL) {
-#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_data_->_tmp7_ = TRUE;
-#line 7933 "ui.c"
+#line 7970 "ui.c"
 	} else {
-#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_data_->_tmp9_ = NULL;
-#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_data_->_tmp9_ = _data_->results;
-#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_data_->_tmp10_ = NULL;
-#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_data_->_tmp10_ = pk_results_get_error_code (_data_->_tmp9_);
-#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_data_->_tmp11_ = NULL;
-#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_data_->_tmp11_ = _data_->_tmp10_;
-#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_data_->_tmp7_ = _data_->_tmp11_ != NULL;
-#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (_data_->_tmp11_);
-#line 7951 "ui.c"
+#line 7988 "ui.c"
 	}
-#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_data_->_tmp7_) {
-#line 1681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_data_->result = _data_->results;
-#line 1681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (_data_->_tmp1_);
-#line 1681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (_data_->task);
-#line 1681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_data_->_state_ == 0) {
-#line 1681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			g_simple_async_result_complete_in_idle (_data_->_async_result);
-#line 7965 "ui.c"
+#line 8002 "ui.c"
 		} else {
-#line 1681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			g_simple_async_result_complete (_data_->_async_result);
-#line 7969 "ui.c"
+#line 8006 "ui.c"
 		}
-#line 1681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_object_unref (_data_->_async_result);
-#line 1681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return FALSE;
-#line 7975 "ui.c"
+#line 8012 "ui.c"
 	}
-#line 1683 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp12_ = NULL;
-#line 1683 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp12_ = _data_->results;
-#line 1683 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp13_ = NULL;
-#line 1683 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp13_ = pk_results_get_package_array (_data_->_tmp12_);
-#line 1683 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->package_array = _data_->_tmp13_;
-#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp14_ = NULL;
-#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp14_ = _data_->package_array;
-#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp15_ = 0;
-#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp15_ = g_ptr_array_get_length (_data_->_tmp14_);
-#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp16_ = 0;
-#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp16_ = _data_->_tmp15_;
-#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp17_ = NULL;
-#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp17_ = g_new0 (gchar*, (_data_->_tmp16_ + 1) + 1);
-#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->package_ids_length1 = 0;
-#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_package_ids_size_ = 0;
-#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->package_ids = _data_->_tmp17_;
-#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->package_ids_length1 = _data_->_tmp16_ + 1;
-#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_package_ids_size_ = _data_->package_ids_length1;
-#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp18_ = NULL;
-#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp18__length1 = 0;
-#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp18_ = _data_->package_ids;
-#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp18__length1 = _data_->package_ids_length1;
-#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp19_ = NULL;
-#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp19_ = _data_->package_array;
-#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp20_ = 0;
-#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp20_ = g_ptr_array_get_length (_data_->_tmp19_);
-#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp21_ = 0;
-#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp21_ = _data_->_tmp20_;
-#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (_data_->_tmp18_[_data_->_tmp21_]);
-#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp18_[_data_->_tmp21_] = NULL;
-#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp22_ = NULL;
-#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp22_ = _data_->_tmp18_[_data_->_tmp21_];
-#line 8041 "ui.c"
+#line 8078 "ui.c"
 	{
-#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_data_->i = 0;
-#line 8045 "ui.c"
+#line 8082 "ui.c"
 		{
-#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_data_->_tmp23_ = TRUE;
-#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			while (TRUE) {
-#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (!_data_->_tmp23_) {
-#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_data_->_tmp24_ = 0;
-#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_data_->_tmp24_ = _data_->i;
-#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_data_->i = _data_->_tmp24_ + 1;
-#line 8059 "ui.c"
+#line 8096 "ui.c"
 				}
-#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp23_ = FALSE;
-#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp25_ = 0;
-#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp25_ = _data_->i;
-#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp26_ = NULL;
-#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp26_ = _data_->package_array;
-#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp27_ = 0;
-#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp27_ = g_ptr_array_get_length (_data_->_tmp26_);
-#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp28_ = 0;
-#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp28_ = _data_->_tmp27_;
-#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (!(_data_->_tmp25_ < _data_->_tmp28_)) {
-#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					break;
-#line 8083 "ui.c"
+#line 8120 "ui.c"
 				}
-#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp29_ = NULL;
-#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp29__length1 = 0;
-#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp29_ = _data_->package_ids;
-#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp29__length1 = _data_->package_ids_length1;
-#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp30_ = 0;
-#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp30_ = _data_->i;
-#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp31_ = NULL;
-#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp31_ = _data_->package_array;
-#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp32_ = NULL;
-#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp32__length1 = 0;
-#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp32_ = _data_->_tmp31_->pdata;
-#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp32__length1 = (gint) _data_->_tmp31_->len;
-#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp33_ = 0;
-#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp33_ = _data_->i;
-#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp34_ = NULL;
-#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp34_ = _data_->_tmp32_[_data_->_tmp33_];
-#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp35_ = NULL;
-#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp35_ = pk_package_get_id (_data_->_tmp34_);
-#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp36_ = NULL;
-#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp36_ = g_strdup (_data_->_tmp35_);
-#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (_data_->_tmp29_[_data_->_tmp30_]);
-#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp29_[_data_->_tmp30_] = _data_->_tmp36_;
-#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp37_ = NULL;
-#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp37_ = _data_->_tmp29_[_data_->_tmp30_];
-#line 8133 "ui.c"
+#line 8170 "ui.c"
 			}
 		}
 	}
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp39_ = NULL;
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp39_ = _data_->task;
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp40_ = NULL;
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp40__length1 = 0;
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp40_ = _data_->package_ids;
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp40__length1 = _data_->package_ids_length1;
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp41_ = NULL;
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp41__target = NULL;
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp41_ = _data_->progress_callback;
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp41__target = _data_->progress_callback_target;
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_state_ = 2;
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return FALSE;
-#line 8163 "ui.c"
+#line 8200 "ui.c"
 	_state_2:
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp42_ = NULL;
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp38_ = _data_->_tmp42_;
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_error_free (_data_->_inner_error_);
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_ptr_array_unref0 (_data_->package_array);
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (_data_->_tmp1_);
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (_data_->results);
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (_data_->task);
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_data_->_state_ == 0) {
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			g_simple_async_result_complete_in_idle (_data_->_async_result);
-#line 8191 "ui.c"
+#line 8228 "ui.c"
 		} else {
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			g_simple_async_result_complete (_data_->_async_result);
-#line 8195 "ui.c"
+#line 8232 "ui.c"
 		}
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_object_unref (_data_->_async_result);
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return FALSE;
-#line 8201 "ui.c"
+#line 8238 "ui.c"
 	}
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp43_ = NULL;
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp43_ = _data_->_tmp38_;
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp38_ = NULL;
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->result = _data_->_tmp43_;
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (_data_->_tmp38_);
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_ptr_array_unref0 (_data_->package_array);
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (_data_->_tmp1_);
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (_data_->results);
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (_data_->task);
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_data_->_state_ == 0) {
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_simple_async_result_complete_in_idle (_data_->_async_result);
-#line 8227 "ui.c"
+#line 8264 "ui.c"
 	} else {
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_simple_async_result_complete (_data_->_async_result);
-#line 8231 "ui.c"
+#line 8268 "ui.c"
 	}
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_unref (_data_->_async_result);
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return FALSE;
-#line 1675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (_data_->_tmp38_);
-#line 1675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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 1675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_ptr_array_unref0 (_data_->package_array);
-#line 1675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (_data_->_tmp1_);
-#line 1675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (_data_->results);
-#line 1675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (_data_->task);
-#line 1675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_data_->_state_ == 0) {
-#line 1675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_simple_async_result_complete_in_idle (_data_->_async_result);
-#line 8253 "ui.c"
+#line 8290 "ui.c"
 	} else {
-#line 1675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_simple_async_result_complete (_data_->_async_result);
-#line 8257 "ui.c"
+#line 8294 "ui.c"
 	}
-#line 1675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_unref (_data_->_async_result);
-#line 1675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return FALSE;
-#line 8263 "ui.c"
+#line 8300 "ui.c"
 }
 
 
@@ -8281,36 +8318,36 @@ static gboolean user_interface_simple_scan_window_window_state_event_cb (UserInt
 	gboolean result = FALSE;
 	GdkEventWindowState* _tmp0_ = NULL;
 	GdkWindowState _tmp1_ = 0;
-#line 1693 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1693 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (widget != NULL, FALSE);
-#line 1693 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = event;
-#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _tmp0_->changed_mask;
-#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if ((_tmp1_ & GDK_WINDOW_STATE_MAXIMIZED) != 0) {
-#line 8283 "ui.c"
+#line 8320 "ui.c"
 		GdkEventWindowState* _tmp2_ = NULL;
 		GdkWindowState _tmp3_ = 0;
-#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1702 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = event;
-#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1702 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = _tmp2_->new_window_state;
-#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1702 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->window_is_maximized = (_tmp3_ & GDK_WINDOW_STATE_MAXIMIZED) != 0;
-#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1703 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_save_state (self, FALSE);
-#line 8294 "ui.c"
+#line 8331 "ui.c"
 	}
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1705 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1705 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 8300 "ui.c"
+#line 8337 "ui.c"
 }
 
 
@@ -8319,26 +8356,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 8309 "ui.c"
+#line 8346 "ui.c"
 }
 
 
 static gboolean user_interface_window_delete_event_cb (UserInterface* self, GtkWidget* widget, GdkEventAny* event) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 1704 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1709 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1704 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1709 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (widget != NULL, FALSE);
-#line 1704 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1709 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1706 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1711 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = user_interface_on_quit (self);
-#line 1706 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1711 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = !_tmp0_;
-#line 1706 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1711 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 8328 "ui.c"
+#line 8365 "ui.c"
 }
 
 
@@ -8347,7 +8384,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 8337 "ui.c"
+#line 8374 "ui.c"
 }
 
 
@@ -8361,37 +8398,37 @@ static void user_interface_page_size_changed_cb (UserInterface* self, Page* page
 	Page* _tmp6_ = NULL;
 	gint _tmp7_ = 0;
 	gint _tmp8_ = 0;
-#line 1709 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1714 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1709 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1714 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (page != NULL);
-#line 1711 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1716 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = page;
-#line 1711 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1716 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = page_get_width (_tmp0_);
-#line 1711 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1716 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1711 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1716 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_width = _tmp2_;
-#line 1712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1717 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = page;
-#line 1712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1717 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page_get_height (_tmp3_);
-#line 1712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1717 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = _tmp4_;
-#line 1712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1717 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_height = _tmp5_;
-#line 1713 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = page;
-#line 1713 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = page_get_dpi (_tmp6_);
-#line 1713 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = _tmp7_;
-#line 1713 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_dpi = _tmp8_;
-#line 1714 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1719 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_state (self, FALSE);
-#line 8381 "ui.c"
+#line 8418 "ui.c"
 }
 
 
@@ -8399,35 +8436,35 @@ static void user_interface_page_scan_direction_changed_cb (UserInterface* self,
 	Page* _tmp0_ = NULL;
 	ScanDirection _tmp1_ = 0;
 	ScanDirection _tmp2_ = 0;
-#line 1717 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1722 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1717 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1722 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (page != NULL);
-#line 1719 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1724 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = page;
-#line 1719 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1724 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = page_get_scan_direction (_tmp0_);
-#line 1719 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1724 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1719 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1724 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_scan_direction = _tmp2_;
-#line 1720 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1725 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_state (self, FALSE);
-#line 8403 "ui.c"
+#line 8440 "ui.c"
 }
 
 
 static void _user_interface_page_size_changed_cb_page_size_changed (Page* _sender, gpointer self) {
-#line 1727 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_size_changed_cb ((UserInterface*) self, _sender);
-#line 8410 "ui.c"
+#line 8447 "ui.c"
 }
 
 
 static void _user_interface_page_scan_direction_changed_cb_page_scan_direction_changed (Page* _sender, gpointer self) {
-#line 1728 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_scan_direction_changed_cb ((UserInterface*) self, _sender);
-#line 8417 "ui.c"
+#line 8454 "ui.c"
 }
 
 
@@ -8438,46 +8475,46 @@ static void user_interface_page_added_cb (UserInterface* self, Book* book, Page*
 	ScanDirection _tmp3_ = 0;
 	Page* _tmp4_ = NULL;
 	Page* _tmp5_ = NULL;
-#line 1723 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1728 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1723 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1728 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (book != NULL);
-#line 1723 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1728 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (page != NULL);
-#line 1725 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1730 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = page;
-#line 1725 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1730 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_size_changed_cb (self, _tmp0_);
-#line 1726 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1731 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = page;
-#line 1726 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1731 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = page_get_scan_direction (_tmp1_);
-#line 1726 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1731 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 1726 "/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 = _tmp3_;
-#line 1727 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page;
-#line 1727 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1732 "/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 1728 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = page;
-#line 1728 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1733 "/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 1730 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_page_menu (self);
-#line 8456 "ui.c"
+#line 8493 "ui.c"
 }
 
 
 static void user_interface_reordered_cb (UserInterface* self, Book* book) {
-#line 1733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1738 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1738 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (book != NULL);
-#line 1735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_page_menu (self);
-#line 8467 "ui.c"
+#line 8504 "ui.c"
 }
 
 
@@ -8489,39 +8526,39 @@ static void user_interface_page_removed_cb (UserInterface* self, Book* book, Pag
 	Book* _tmp4_ = NULL;
 	guint _tmp5_ = 0U;
 	guint _tmp6_ = 0U;
-#line 1738 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1743 "/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 1743 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (book != NULL);
-#line 1738 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1743 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (page != NULL);
-#line 1740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1745 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = page;
-#line 1740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1745 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_parse_name ("size-changed", TYPE_PAGE, &_tmp1_, NULL, FALSE);
-#line 1740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1745 "/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 1741 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = page;
-#line 1741 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_parse_name ("scan-direction-changed", TYPE_PAGE, &_tmp3_, NULL, FALSE);
-#line 1741 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1746 "/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 1744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1749 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = book;
-#line 1744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1749 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = book_get_n_pages (_tmp4_);
-#line 1744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1749 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = _tmp5_;
-#line 1744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1749 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp6_ == ((guint) 0)) {
-#line 1745 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1750 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_add_default_page (self);
-#line 8507 "ui.c"
+#line 8544 "ui.c"
 	}
-#line 1747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1752 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_page_menu (self);
-#line 8511 "ui.c"
+#line 8548 "ui.c"
 }
 
 
@@ -8543,79 +8580,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 1750 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1755 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1750 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1755 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (combo != NULL);
-#line 1752 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 1752 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp0_);
-#line 1752 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	renderer = _tmp0_;
-#line 1753 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = combo;
-#line 1753 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = renderer;
-#line 1753 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp1_, (GtkCellRenderer*) _tmp2_, TRUE);
-#line 1754 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1759 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = combo;
-#line 1754 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1759 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = renderer;
-#line 1754 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1759 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp3_, (GtkCellRenderer*) _tmp4_, "text", 1);
-#line 1756 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = combo;
-#line 1756 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = gtk_combo_box_get_model (_tmp5_);
-#line 1756 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = _tmp6_;
-#line 1756 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1761 "/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 1756 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	model = _tmp8_;
-#line 1757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = g_new0 (gint, 6);
-#line 1757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_[0] = 75;
-#line 1757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_[1] = 150;
-#line 1757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_[2] = 300;
-#line 1757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_[3] = 600;
-#line 1757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_[4] = 1200;
-#line 1757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_[5] = 2400;
-#line 1757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	scan_resolutions = _tmp9_;
-#line 1757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	scan_resolutions_length1 = 6;
-#line 1757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_scan_resolutions_size_ = scan_resolutions_length1;
-#line 1758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = scan_resolutions;
-#line 1758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10__length1 = scan_resolutions_length1;
-#line 8589 "ui.c"
+#line 8626 "ui.c"
 	{
 		gint* dpi_collection = NULL;
 		gint dpi_collection_length1 = 0;
 		gint _dpi_collection_size_ = 0;
 		gint dpi_it = 0;
-#line 1758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		dpi_collection = _tmp10_;
-#line 1758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		dpi_collection_length1 = _tmp10__length1;
-#line 1758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		for (dpi_it = 0; dpi_it < _tmp10__length1; dpi_it = dpi_it + 1) {
-#line 8601 "ui.c"
+#line 8638 "ui.c"
 			gint dpi = 0;
-#line 1758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			dpi = dpi_collection[dpi_it];
-#line 8605 "ui.c"
+#line 8642 "ui.c"
 			{
 				gchar* label = NULL;
 				gint _tmp11_ = 0;
@@ -8629,133 +8666,133 @@ static void user_interface_set_dpi_combo (UserInterface* self, GtkComboBox* comb
 				const gchar* _tmp32_ = NULL;
 				gint _tmp33_ = 0;
 				gint _tmp34_ = 0;
-#line 1761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp11_ = dpi;
-#line 1761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp12_ = default_dpi;
-#line 1761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp11_ == _tmp12_) {
-#line 8625 "ui.c"
+#line 8662 "ui.c"
 					const gchar* _tmp13_ = NULL;
 					gint _tmp14_ = 0;
 					gchar* _tmp15_ = NULL;
-#line 1763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp13_ = _ ("%d dpi (default)");
-#line 1763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp14_ = dpi;
-#line 1763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp15_ = g_strdup_printf (_tmp13_, _tmp14_);
-#line 1763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_g_free0 (label);
-#line 1763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					label = _tmp15_;
-#line 8639 "ui.c"
+#line 8676 "ui.c"
 				} else {
 					gint _tmp16_ = 0;
-#line 1764 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp16_ = dpi;
-#line 1764 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					if (_tmp16_ == 75) {
-#line 8646 "ui.c"
+#line 8683 "ui.c"
 						const gchar* _tmp17_ = NULL;
 						gint _tmp18_ = 0;
 						gchar* _tmp19_ = NULL;
-#line 1766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1771 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp17_ = _ ("%d dpi (draft)");
-#line 1766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1771 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp18_ = dpi;
-#line 1766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1771 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp19_ = g_strdup_printf (_tmp17_, _tmp18_);
-#line 1766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1771 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_g_free0 (label);
-#line 1766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1771 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						label = _tmp19_;
-#line 8660 "ui.c"
+#line 8697 "ui.c"
 					} else {
 						gint _tmp20_ = 0;
-#line 1767 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp20_ = dpi;
-#line 1767 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						if (_tmp20_ == 1200) {
-#line 8667 "ui.c"
+#line 8704 "ui.c"
 							const gchar* _tmp21_ = NULL;
 							gint _tmp22_ = 0;
 							gchar* _tmp23_ = NULL;
-#line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1774 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp21_ = _ ("%d dpi (high resolution)");
-#line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1774 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp22_ = dpi;
-#line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1774 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp23_ = g_strdup_printf (_tmp21_, _tmp22_);
-#line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1774 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_g_free0 (label);
-#line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1774 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							label = _tmp23_;
-#line 8681 "ui.c"
+#line 8718 "ui.c"
 						} else {
 							const gchar* _tmp24_ = NULL;
 							gint _tmp25_ = 0;
 							gchar* _tmp26_ = NULL;
-#line 1772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1777 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp24_ = _ ("%d dpi");
-#line 1772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1777 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp25_ = dpi;
-#line 1772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1777 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp26_ = g_strdup_printf (_tmp24_, _tmp25_);
-#line 1772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1777 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_g_free0 (label);
-#line 1772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1777 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							label = _tmp26_;
-#line 8696 "ui.c"
+#line 8733 "ui.c"
 						}
 					}
 				}
-#line 1775 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1780 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp27_ = model;
-#line 1775 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1780 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				gtk_list_store_append (_tmp27_, &_tmp28_);
-#line 1775 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1780 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				iter = _tmp28_;
-#line 1776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp29_ = model;
-#line 1776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp30_ = iter;
-#line 1776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp31_ = dpi;
-#line 1776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp32_ = label;
-#line 1776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				gtk_list_store_set (_tmp29_, &_tmp30_, 0, _tmp31_, 1, _tmp32_, -1, -1);
-#line 1778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1783 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp33_ = dpi;
-#line 1778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1783 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp34_ = current_dpi;
-#line 1778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1783 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp33_ == _tmp34_) {
-#line 8722 "ui.c"
+#line 8759 "ui.c"
 					GtkComboBox* _tmp35_ = NULL;
 					GtkTreeIter _tmp36_ = {0};
-#line 1779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1784 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp35_ = combo;
-#line 1779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1784 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp36_ = iter;
-#line 1779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1784 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_combo_box_set_active_iter (_tmp35_, &_tmp36_);
-#line 8731 "ui.c"
+#line 8768 "ui.c"
 				}
-#line 1758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (label);
-#line 8735 "ui.c"
+#line 8772 "ui.c"
 			}
 		}
 	}
-#line 1750 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1755 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	scan_resolutions = (g_free (scan_resolutions), NULL);
-#line 1750 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1755 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (model);
-#line 1750 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1755 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (renderer);
-#line 8745 "ui.c"
+#line 8782 "ui.c"
 }
 
 
@@ -8776,128 +8813,128 @@ static void user_interface_needs_saving_cb (UserInterface* self, Book* book) {
 	gboolean _tmp13_ = FALSE;
 	gboolean _tmp14_ = FALSE;
 	GtkMenuItem* _tmp16_ = NULL;
-#line 1783 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1783 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (book != NULL);
-#line 1785 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->save_menuitem;
-#line 1785 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book;
-#line 1785 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = book_get_needs_saving (_tmp1_);
-#line 1785 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 1785 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp0_, _tmp3_);
-#line 1786 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = self->priv->save_button;
-#line 1786 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = book;
-#line 1786 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = book_get_needs_saving (_tmp5_);
-#line 1786 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = _tmp6_;
-#line 1786 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp4_, _tmp7_);
-#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = self->priv->save_toolbutton;
-#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = book;
-#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = book_get_needs_saving (_tmp9_);
-#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = _tmp10_;
-#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp8_, _tmp11_);
-#line 1788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = book;
-#line 1788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = book_get_needs_saving (_tmp12_);
-#line 1788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = _tmp13_;
-#line 1788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp14_) {
-#line 8808 "ui.c"
+#line 8845 "ui.c"
 		GtkMenuItem* _tmp15_ = NULL;
-#line 1789 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = self->priv->save_as_menuitem;
-#line 1789 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_set_sensitive ((GtkWidget*) _tmp15_, TRUE);
-#line 8814 "ui.c"
+#line 8851 "ui.c"
 	}
-#line 1790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1795 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = self->priv->copy_to_clipboard_menuitem;
-#line 1790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1795 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp16_, TRUE);
-#line 8820 "ui.c"
+#line 8857 "ui.c"
 }
 
 
 static void _user_interface_info_bar_response_cb_gtk_info_bar_response (GtkInfoBar* _sender, gint response_id, gpointer self) {
-#line 1850 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1855 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_info_bar_response_cb ((UserInterface*) self, _sender, response_id);
-#line 8827 "ui.c"
+#line 8864 "ui.c"
 }
 
 
 static void __lambda14_ (UserInterface* self) {
 	GSettings* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 1894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->settings;
-#line 1894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_text_dpi (self);
-#line 1894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp0_, "text-dpi", _tmp1_);
-#line 8840 "ui.c"
+#line 8877 "ui.c"
 }
 
 
 static void ___lambda14__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	__lambda14_ ((UserInterface*) self);
-#line 8847 "ui.c"
+#line 8884 "ui.c"
 }
 
 
 static void __lambda15_ (UserInterface* self) {
 	GSettings* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 1899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1904 "/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 1904 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_photo_dpi (self);
-#line 1899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1904 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp0_, "photo-dpi", _tmp1_);
-#line 8860 "ui.c"
+#line 8897 "ui.c"
 }
 
 
 static void ___lambda15__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1904 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	__lambda15_ ((UserInterface*) self);
-#line 8867 "ui.c"
+#line 8904 "ui.c"
 }
 
 
 static void __lambda16_ (UserInterface* self) {
 	GSettings* _tmp0_ = NULL;
 	ScanType _tmp1_ = 0;
-#line 1909 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1914 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->settings;
-#line 1909 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1914 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_page_side (self);
-#line 1909 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1914 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_enum (_tmp0_, "page-side", (gint) _tmp1_);
-#line 8880 "ui.c"
+#line 8917 "ui.c"
 }
 
 
 static void ___lambda16__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1909 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1914 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	__lambda16_ ((UserInterface*) self);
-#line 8887 "ui.c"
+#line 8924 "ui.c"
 }
 
 
@@ -8908,28 +8945,28 @@ static void __lambda17_ (UserInterface* self) {
 	gint _tmp1_ = 0;
 	GSettings* _tmp2_ = NULL;
 	GSettings* _tmp3_ = NULL;
-#line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_get_paper_size (self, &_tmp0_, &_tmp1_);
-#line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	w = _tmp0_;
-#line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	h = _tmp1_;
-#line 1921 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = self->priv->settings;
-#line 1921 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp2_, "paper-width", w);
-#line 1922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1927 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->settings;
-#line 1922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1927 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp3_, "paper-height", h);
-#line 8912 "ui.c"
+#line 8949 "ui.c"
 }
 
 
 static void ___lambda17__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1917 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	__lambda17_ ((UserInterface*) self);
-#line 8919 "ui.c"
+#line 8956 "ui.c"
 }
 
 
@@ -8937,22 +8974,22 @@ static void __lambda18_ (UserInterface* self) {
 	GSettings* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
-#line 1933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->settings;
-#line 1933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_brightness (self);
-#line 1933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp0_, "brightness", _tmp2_);
-#line 8935 "ui.c"
+#line 8972 "ui.c"
 }
 
 
 static void ___lambda18__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
-#line 1933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	__lambda18_ ((UserInterface*) self);
-#line 8942 "ui.c"
+#line 8979 "ui.c"
 }
 
 
@@ -8960,22 +8997,22 @@ static void __lambda19_ (UserInterface* self) {
 	GSettings* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
-#line 1943 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->settings;
-#line 1943 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_contrast (self);
-#line 1943 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1943 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp0_, "contrast", _tmp2_);
-#line 8958 "ui.c"
+#line 8995 "ui.c"
 }
 
 
 static void ___lambda19__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
-#line 1943 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	__lambda19_ ((UserInterface*) self);
-#line 8965 "ui.c"
+#line 9002 "ui.c"
 }
 
 
@@ -8983,50 +9020,50 @@ static void __lambda20_ (UserInterface* self) {
 	GSettings* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
-#line 1953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->settings;
-#line 1953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_quality (self);
-#line 1953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp0_, "jpeg-quality", _tmp2_);
-#line 8981 "ui.c"
+#line 9018 "ui.c"
 }
 
 
 static void ___lambda20__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
-#line 1953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	__lambda20_ ((UserInterface*) self);
-#line 8988 "ui.c"
+#line 9025 "ui.c"
 }
 
 
 static void _user_interface_page_selected_cb_book_view_page_selected (BookView* _sender, Page* page, gpointer self) {
-#line 1969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1967 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_selected_cb ((UserInterface*) self, _sender, page);
-#line 8995 "ui.c"
+#line 9032 "ui.c"
 }
 
 
 static void _user_interface_show_page_cb_book_view_show_page (BookView* _sender, Page* page, gpointer self) {
-#line 1970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_show_page_cb ((UserInterface*) self, _sender, page);
-#line 9002 "ui.c"
+#line 9039 "ui.c"
 }
 
 
 static void _user_interface_show_page_menu_cb_book_view_show_menu (BookView* _sender, gpointer self) {
-#line 1971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_show_page_menu_cb ((UserInterface*) self, _sender);
-#line 9009 "ui.c"
+#line 9046 "ui.c"
 }
 
 
 static void _user_interface_book_saving_cb_book_saving (Book* _sender, gint i, gpointer self) {
-#line 1990 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1988 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_book_saving_cb ((UserInterface*) self, i);
-#line 9016 "ui.c"
+#line 9053 "ui.c"
 }
 
 
@@ -9213,104 +9250,100 @@ static void user_interface_load (UserInterface* self) {
 	GSettings* _tmp215_ = NULL;
 	gint _tmp216_ = 0;
 	GtkAdjustment* _tmp217_ = NULL;
-	gchar* device = NULL;
+	gchar* document_type = NULL;
 	GSettings* _tmp218_ = NULL;
 	gchar* _tmp219_ = NULL;
 	const gchar* _tmp220_ = NULL;
-	gchar* document_type = NULL;
-	GSettings* _tmp226_ = NULL;
-	gchar* _tmp227_ = NULL;
-	const gchar* _tmp228_ = NULL;
-	Book* _tmp230_ = NULL;
-	BookView* _tmp231_ = NULL;
-	BookView* _tmp232_ = NULL;
-	GtkBox* _tmp233_ = NULL;
-	BookView* _tmp234_ = NULL;
-	BookView* _tmp235_ = NULL;
-	BookView* _tmp236_ = NULL;
-	BookView* _tmp237_ = NULL;
-	BookView* _tmp238_ = NULL;
-	GtkDialog* _tmp239_ = NULL;
-	GtkDialog* _tmp240_ = NULL;
-	gint _tmp241_ = 0;
-	gint _tmp242_ = 0;
-	gint _tmp243_ = 0;
-	gint _tmp244_ = 0;
-	gboolean _tmp245_ = FALSE;
-	const gchar* _tmp246_ = NULL;
-	ProgressBarDialog* _tmp247_ = NULL;
-	Book* _tmp248_ = NULL;
-#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	Book* _tmp222_ = NULL;
+	BookView* _tmp223_ = NULL;
+	BookView* _tmp224_ = NULL;
+	GtkBox* _tmp225_ = NULL;
+	BookView* _tmp226_ = NULL;
+	BookView* _tmp227_ = NULL;
+	BookView* _tmp228_ = NULL;
+	BookView* _tmp229_ = NULL;
+	BookView* _tmp230_ = NULL;
+	GtkDialog* _tmp231_ = NULL;
+	GtkDialog* _tmp232_ = NULL;
+	gint _tmp233_ = 0;
+	gint _tmp234_ = 0;
+	gint _tmp235_ = 0;
+	gint _tmp236_ = 0;
+	gboolean _tmp237_ = FALSE;
+	const gchar* _tmp238_ = NULL;
+	ProgressBarDialog* _tmp239_ = NULL;
+	Book* _tmp240_ = NULL;
+#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1795 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = gtk_icon_theme_get_default ();
-#line 1795 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_icon_theme_append_search_path (_tmp0_, ICON_DIR);
-#line 1797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1802 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_default_icon_name ("scanner");
-#line 1799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1804 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_application_get_default ();
-#line 1799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1804 "/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 1799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1804 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	app = _tmp2_;
-#line 1801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = user_interface_is_desktop (self, "Unity");
-#line 1801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp6_) {
-#line 1801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = TRUE;
-#line 9250 "ui.c"
+#line 9283 "ui.c"
 	} else {
 		gboolean _tmp7_ = FALSE;
-#line 1801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = user_interface_is_desktop (self, "XFCE");
-#line 1801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = _tmp7_;
-#line 9257 "ui.c"
+#line 9290 "ui.c"
 	}
-#line 1801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp5_) {
-#line 1801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = TRUE;
-#line 9263 "ui.c"
+#line 9296 "ui.c"
 	} else {
 		gboolean _tmp8_ = FALSE;
-#line 1801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = user_interface_is_desktop (self, "MATE");
-#line 1801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = _tmp8_;
-#line 9270 "ui.c"
+#line 9303 "ui.c"
 	}
-#line 1801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp4_) {
-#line 1801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = TRUE;
-#line 9276 "ui.c"
+#line 9309 "ui.c"
 	} else {
 		gboolean _tmp9_ = FALSE;
-#line 1801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_ = user_interface_is_desktop (self, "LXDE");
-#line 1801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = _tmp9_;
-#line 9283 "ui.c"
+#line 9316 "ui.c"
 	}
-#line 1801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp3_) {
-#line 9287 "ui.c"
+#line 9320 "ui.c"
 		GtkMenuBar* _tmp10_ = NULL;
 		GtkToolbar* _tmp11_ = NULL;
-#line 1803 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_window_set_titlebar ((GtkWindow*) self, NULL);
-#line 1804 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp10_ = self->priv->menubar;
-#line 1804 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_set_visible ((GtkWidget*) _tmp10_, TRUE);
-#line 1805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1810 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp11_ = self->priv->toolbar;
-#line 1805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1810 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_set_visible ((GtkWidget*) _tmp11_, TRUE);
-#line 9300 "ui.c"
+#line 9333 "ui.c"
 	} else {
 		GtkApplication* _tmp12_ = NULL;
 		GMenu* appmenu = NULL;
@@ -9362,853 +9395,817 @@ static void user_interface_load (UserInterface* self) {
 		GtkApplication* _tmp56_ = NULL;
 		GtkApplication* _tmp57_ = NULL;
 		GtkApplication* _tmp58_ = NULL;
-#line 1809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp12_ = app;
-#line 1809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1814 "/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 1811 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1816 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp13_ = g_menu_new ();
-#line 1811 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1816 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		appmenu = _tmp13_;
-#line 1812 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1817 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp14_ = g_menu_new ();
-#line 1812 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1817 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		section = _tmp14_;
-#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = appmenu;
-#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp16_ = section;
-#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append_section (_tmp15_, NULL, (GMenuModel*) _tmp16_);
-#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp17_ = section;
-#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp18_ = _ ("New Document");
-#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append (_tmp17_, _tmp18_, "app.new_document");
-#line 1816 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1821 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp19_ = g_menu_new ();
-#line 1816 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1821 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (section);
-#line 1816 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1821 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		section = _tmp19_;
-#line 1817 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp20_ = appmenu;
-#line 1817 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp21_ = section;
-#line 1817 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append_section (_tmp20_, NULL, (GMenuModel*) _tmp21_);
-#line 1818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1823 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp22_ = g_menu_new ();
-#line 1818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1823 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		menu = _tmp22_;
-#line 1819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1824 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp23_ = section;
-#line 1819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1824 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp24_ = _ ("Document");
-#line 1819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1824 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp25_ = menu;
-#line 1819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1824 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append_submenu (_tmp23_, _tmp24_, (GMenuModel*) _tmp25_);
-#line 1820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp26_ = menu;
-#line 1820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp27_ = _ ("Reorder Pages");
-#line 1820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append (_tmp26_, _tmp27_, "app.reorder");
-#line 1821 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp28_ = menu;
-#line 1821 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp29_ = _ ("Save");
-#line 1821 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append (_tmp28_, _tmp29_, "app.save");
-#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1827 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp30_ = menu;
-#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1827 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp31_ = _ ("Save As...");
-#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1827 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append (_tmp30_, _tmp31_, "app.save_as");
-#line 1823 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1828 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp32_ = menu;
-#line 1823 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1828 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp33_ = _ ("Email...");
-#line 1823 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1828 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append (_tmp32_, _tmp33_, "app.email");
-#line 1824 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp34_ = menu;
-#line 1824 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp35_ = _ ("Print...");
-#line 1824 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append (_tmp34_, _tmp35_, "app.print");
-#line 1826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp36_ = g_menu_new ();
-#line 1826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (section);
-#line 1826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		section = _tmp36_;
-#line 1827 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1832 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp37_ = appmenu;
-#line 1827 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1832 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp38_ = section;
-#line 1827 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1832 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append_section (_tmp37_, NULL, (GMenuModel*) _tmp38_);
-#line 1828 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp39_ = section;
-#line 1828 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp40_ = _ ("Preferences");
-#line 1828 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append (_tmp39_, _tmp40_, "app.preferences");
-#line 1830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1835 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp41_ = g_menu_new ();
-#line 1830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1835 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (section);
-#line 1830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1835 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		section = _tmp41_;
-#line 1831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1836 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp42_ = appmenu;
-#line 1831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1836 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp43_ = section;
-#line 1831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1836 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append_section (_tmp42_, NULL, (GMenuModel*) _tmp43_);
-#line 1832 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1837 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp44_ = section;
-#line 1832 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1837 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp45_ = _ ("Help");
-#line 1832 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1837 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append (_tmp44_, _tmp45_, "app.help");
-#line 1833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp46_ = section;
-#line 1833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp47_ = _ ("About");
-#line 1833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append (_tmp46_, _tmp47_, "app.about");
-#line 1834 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp48_ = section;
-#line 1834 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp49_ = _ ("Quit");
-#line 1834 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append (_tmp48_, _tmp49_, "app.quit");
-#line 1836 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp50_ = app;
-#line 1836 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp51_ = appmenu;
-#line 1836 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_application_set_app_menu (_tmp50_, (GMenuModel*) _tmp51_);
-#line 1838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1843 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp52_ = app;
-#line 1838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1843 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_application_add_accelerator (_tmp52_, "<Ctrl>N", "app.new_document", NULL);
-#line 1839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp53_ = app;
-#line 1839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_application_add_accelerator (_tmp53_, "<Ctrl>S", "app.save", NULL);
-#line 1840 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp54_ = app;
-#line 1840 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_application_add_accelerator (_tmp54_, "<Shift><Ctrl>S", "app.save_as", NULL);
-#line 1841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1846 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp55_ = app;
-#line 1841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1846 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_application_add_accelerator (_tmp55_, "<Ctrl>E", "app.email", NULL);
-#line 1842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1847 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp56_ = app;
-#line 1842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1847 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_application_add_accelerator (_tmp56_, "<Ctrl>P", "app.print", NULL);
-#line 1843 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp57_ = app;
-#line 1843 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_application_add_accelerator (_tmp57_, "F1", "app.help", NULL);
-#line 1844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp58_ = app;
-#line 1844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_application_add_accelerator (_tmp58_, "<Ctrl>Q", "app.quit", NULL);
-#line 1801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (menu);
-#line 1801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (section);
-#line 1801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (appmenu);
-#line 9518 "ui.c"
+#line 9551 "ui.c"
 	}
-#line 1846 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1851 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp59_ = app;
-#line 1846 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1851 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_application_add_window (_tmp59_, (GtkWindow*) self);
-#line 1849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1854 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp60_ = (GtkInfoBar*) gtk_info_bar_new ();
-#line 1849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1854 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp60_);
-#line 1849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1854 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar);
-#line 1849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1854 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->info_bar = _tmp60_;
-#line 1850 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1855 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp61_ = self->priv->info_bar;
-#line 1850 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1855 "/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 1851 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp62_ = self->priv->main_vbox;
-#line 1851 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp63_ = self->priv->info_bar;
-#line 1851 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (_tmp62_, (GtkWidget*) _tmp63_, FALSE, TRUE, (guint) 0);
-#line 1852 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp64_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
-#line 1852 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp64_);
-#line 1852 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	hbox = _tmp64_;
-#line 1853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1858 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp65_ = self->priv->info_bar;
-#line 1853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1858 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp66_ = gtk_info_bar_get_content_area (_tmp65_);
-#line 1853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1858 "/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 1853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1858 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	content_area = _tmp67_;
-#line 1854 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp68_ = content_area;
-#line 1854 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp69_ = hbox;
-#line 1854 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_container_add (_tmp68_, (GtkWidget*) _tmp69_);
-#line 1855 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1860 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp70_ = hbox;
-#line 1855 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1860 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp70_, TRUE);
-#line 1857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp71_ = (GtkImage*) gtk_image_new_from_icon_name ("dialog-warning", GTK_ICON_SIZE_DIALOG);
-#line 1857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp71_);
-#line 1857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar_image);
-#line 1857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->info_bar_image = _tmp71_;
-#line 1858 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp72_ = hbox;
-#line 1858 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp73_ = self->priv->info_bar_image;
-#line 1858 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (_tmp72_, (GtkWidget*) _tmp73_, FALSE, TRUE, (guint) 0);
-#line 1859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp74_ = self->priv->info_bar_image;
-#line 1859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp74_, TRUE);
-#line 1861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp75_ = (GtkLabel*) gtk_label_new (NULL);
-#line 1861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp75_);
-#line 1861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar_label);
-#line 1861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->info_bar_label = _tmp75_;
-#line 1862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp76_ = self->priv->info_bar_label;
-#line 1862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_misc_set_alignment ((GtkMisc*) _tmp76_, 0.0f, 0.5f);
-#line 1863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp77_ = hbox;
-#line 1863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp78_ = self->priv->info_bar_label;
-#line 1863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (_tmp77_, (GtkWidget*) _tmp78_, TRUE, TRUE, (guint) 0);
-#line 1864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1869 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp79_ = self->priv->info_bar_label;
-#line 1864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1869 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp79_, TRUE);
-#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp80_ = self->priv->info_bar;
-#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp81_ = _ ("_Close");
-#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp82_ = gtk_info_bar_add_button (_tmp80_, _tmp81_, (gint) GTK_RESPONSE_CLOSE);
-#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1871 "/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 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar_close_button);
-#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->info_bar_close_button = _tmp83_;
-#line 1867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1872 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp84_ = self->priv->info_bar;
-#line 1867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1872 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp85_ = _ ("Change _Scanner");
-#line 1867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1872 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp86_ = gtk_info_bar_add_button (_tmp84_, _tmp85_, 1);
-#line 1867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1872 "/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 1867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1872 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar_change_scanner_button);
-#line 1867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1872 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->info_bar_change_scanner_button = _tmp87_;
-#line 1869 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1874 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp88_ = self->priv->info_bar;
-#line 1869 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1874 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp89_ = _ ("_Install Drivers");
-#line 1869 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1874 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp90_ = gtk_info_bar_add_button (_tmp88_, _tmp89_, 2);
-#line 1869 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1874 "/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 1869 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1874 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar_install_button);
-#line 1869 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1874 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->info_bar_install_button = _tmp91_;
-#line 1873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp92_ = self->priv->paper_size_model;
-#line 1873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_append (_tmp92_, &_tmp93_);
-#line 1873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp93_;
-#line 1874 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp94_ = self->priv->paper_size_model;
-#line 1874 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp95_ = iter;
-#line 1874 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp96_ = _ ("Automatic");
-#line 1874 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_set (_tmp94_, &_tmp95_, 0, 0, 1, 0, 2, _tmp96_, -1, -1);
-#line 1877 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1882 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp97_ = self->priv->paper_size_model;
-#line 1877 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1882 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_append (_tmp97_, &_tmp98_);
-#line 1877 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1882 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp98_;
-#line 1878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp99_ = self->priv->paper_size_model;
-#line 1878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp100_ = iter;
-#line 1878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_set (_tmp99_, &_tmp100_, 0, 1050, 1, 1480, 2, "A6", -1, -1);
-#line 1879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1884 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp101_ = self->priv->paper_size_model;
-#line 1879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1884 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_append (_tmp101_, &_tmp102_);
-#line 1879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1884 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp102_;
-#line 1880 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp103_ = self->priv->paper_size_model;
-#line 1880 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp104_ = iter;
-#line 1880 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_set (_tmp103_, &_tmp104_, 0, 1480, 1, 2100, 2, "A5", -1, -1);
-#line 1881 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1886 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp105_ = self->priv->paper_size_model;
-#line 1881 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1886 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_append (_tmp105_, &_tmp106_);
-#line 1881 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1886 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp106_;
-#line 1882 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp107_ = self->priv->paper_size_model;
-#line 1882 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp108_ = iter;
-#line 1882 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_set (_tmp107_, &_tmp108_, 0, 2100, 1, 2970, 2, "A4", -1, -1);
-#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp109_ = self->priv->paper_size_model;
-#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_append (_tmp109_, &_tmp110_);
-#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp110_;
-#line 1884 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1889 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp111_ = self->priv->paper_size_model;
-#line 1884 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1889 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp112_ = iter;
-#line 1884 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1889 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_set (_tmp111_, &_tmp112_, 0, 2159, 1, 2794, 2, "Letter", -1, -1);
-#line 1885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp113_ = self->priv->paper_size_model;
-#line 1885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_append (_tmp113_, &_tmp114_);
-#line 1885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp114_;
-#line 1886 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1891 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp115_ = self->priv->paper_size_model;
-#line 1886 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1891 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp116_ = iter;
-#line 1886 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1891 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_set (_tmp115_, &_tmp116_, 0, 2159, 1, 3556, 2, "Legal", -1, -1);
-#line 1887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1892 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp117_ = self->priv->paper_size_model;
-#line 1887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1892 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_append (_tmp117_, &_tmp118_);
-#line 1887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1892 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp118_;
-#line 1888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp119_ = self->priv->paper_size_model;
-#line 1888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp120_ = iter;
-#line 1888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1893 "/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 1890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp121_ = self->priv->settings;
-#line 1890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp122_ = g_settings_get_int (_tmp121_, "text-dpi");
-#line 1890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	dpi = _tmp122_;
-#line 1891 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp123_ = dpi;
-#line 1891 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp123_ <= 0) {
-#line 1892 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1897 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		dpi = USER_INTERFACE_DEFAULT_TEXT_DPI;
-#line 9740 "ui.c"
+#line 9773 "ui.c"
 	}
-#line 1893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp124_ = self->priv->text_dpi_combo;
-#line 1893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp125_ = dpi;
-#line 1893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_set_dpi_combo (self, _tmp124_, USER_INTERFACE_DEFAULT_TEXT_DPI, _tmp125_);
-#line 1894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp126_ = self->priv->text_dpi_combo;
-#line 1894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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 1895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp127_ = self->priv->settings;
-#line 1895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp128_ = g_settings_get_int (_tmp127_, "photo-dpi");
-#line 1895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	dpi = _tmp128_;
-#line 1896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1901 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp129_ = dpi;
-#line 1896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1901 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp129_ <= 0) {
-#line 1897 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		dpi = USER_INTERFACE_DEFAULT_PHOTO_DPI;
-#line 9764 "ui.c"
+#line 9797 "ui.c"
 	}
-#line 1898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1903 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp130_ = self->priv->photo_dpi_combo;
-#line 1898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1903 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp131_ = dpi;
-#line 1898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1903 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_set_dpi_combo (self, _tmp130_, USER_INTERFACE_DEFAULT_PHOTO_DPI, _tmp131_);
-#line 1899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1904 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp132_ = self->priv->photo_dpi_combo;
-#line 1899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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 1901 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1906 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp133_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 1901 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1906 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp133_);
-#line 1901 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1906 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	renderer = _tmp133_;
-#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp134_ = self->priv->device_combo;
-#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp135_ = renderer;
-#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp134_, (GtkCellRenderer*) _tmp135_, TRUE);
-#line 1903 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1908 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp136_ = self->priv->device_combo;
-#line 1903 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1908 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp137_ = renderer;
-#line 1903 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1908 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp136_, (GtkCellRenderer*) _tmp137_, "text", 1);
-#line 1905 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1910 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp138_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 1905 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1910 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp138_);
-#line 1905 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1910 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (renderer);
-#line 1905 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1910 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	renderer = _tmp138_;
-#line 1906 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp139_ = self->priv->page_side_combo;
-#line 1906 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp140_ = renderer;
-#line 1906 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp139_, (GtkCellRenderer*) _tmp140_, TRUE);
-#line 1907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1912 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp141_ = self->priv->page_side_combo;
-#line 1907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1912 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp142_ = renderer;
-#line 1907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1912 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp141_, (GtkCellRenderer*) _tmp142_, "text", 1);
-#line 1908 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1913 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp143_ = self->priv->settings;
-#line 1908 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1913 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp144_ = g_settings_get_enum (_tmp143_, "page-side");
-#line 1908 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1913 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_set_page_side (self, (ScanType) _tmp144_);
-#line 1909 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1914 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp145_ = self->priv->page_side_combo;
-#line 1909 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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 1911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1916 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp146_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 1911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1916 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp146_);
-#line 1911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1916 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (renderer);
-#line 1911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1916 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	renderer = _tmp146_;
-#line 1912 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1917 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp147_ = self->priv->paper_size_combo;
-#line 1912 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1917 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp148_ = renderer;
-#line 1912 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1917 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp147_, (GtkCellRenderer*) _tmp148_, TRUE);
-#line 1913 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1918 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp149_ = self->priv->paper_size_combo;
-#line 1913 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1918 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp150_ = renderer;
-#line 1913 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1918 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp149_, (GtkCellRenderer*) _tmp150_, "text", 2);
-#line 1914 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1919 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp151_ = self->priv->settings;
-#line 1914 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1919 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp152_ = g_settings_get_int (_tmp151_, "paper-width");
-#line 1914 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1919 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	paper_width = _tmp152_;
-#line 1915 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp153_ = self->priv->settings;
-#line 1915 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp154_ = g_settings_get_int (_tmp153_, "paper-height");
-#line 1915 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	paper_height = _tmp154_;
-#line 1916 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1921 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp155_ = paper_width;
-#line 1916 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1921 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp156_ = paper_height;
-#line 1916 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1921 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_set_paper_size (self, _tmp155_, _tmp156_);
-#line 1917 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp157_ = self->priv->paper_size_combo;
-#line 1917 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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 1925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1930 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp158_ = self->priv->brightness_adjustment;
-#line 1925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1930 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp159_ = gtk_adjustment_get_lower (_tmp158_);
-#line 1925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1930 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp160_ = _tmp159_;
-#line 1925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1930 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	lower = _tmp160_;
-#line 1926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1931 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp161_ = _ ("Darker");
-#line 1926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1931 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp162_ = g_strdup_printf ("<small>%s</small>", _tmp161_);
-#line 1926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1931 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	darker_label = _tmp162_;
-#line 1927 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp163_ = self->priv->brightness_adjustment;
-#line 1927 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp164_ = gtk_adjustment_get_upper (_tmp163_);
-#line 1927 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp165_ = _tmp164_;
-#line 1927 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	upper = _tmp165_;
-#line 1928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp166_ = _ ("Lighter");
-#line 1928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp167_ = g_strdup_printf ("<small>%s</small>", _tmp166_);
-#line 1928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	lighter_label = _tmp167_;
-#line 1929 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp168_ = self->priv->brightness_scale;
-#line 1929 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp169_ = lower;
-#line 1929 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp170_ = darker_label;
-#line 1929 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_scale_add_mark (_tmp168_, _tmp169_, GTK_POS_BOTTOM, _tmp170_);
-#line 1930 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1935 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp171_ = self->priv->brightness_scale;
-#line 1930 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1935 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_scale_add_mark (_tmp171_, (gdouble) 0, GTK_POS_BOTTOM, NULL);
-#line 1931 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp172_ = self->priv->brightness_scale;
-#line 1931 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp173_ = upper;
-#line 1931 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp174_ = lighter_label;
-#line 1931 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_scale_add_mark (_tmp172_, _tmp173_, GTK_POS_BOTTOM, _tmp174_);
-#line 1932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1937 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp175_ = self->priv->settings;
-#line 1932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1937 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp176_ = g_settings_get_int (_tmp175_, "brightness");
-#line 1932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1937 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_set_brightness (self, _tmp176_);
-#line 1933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp177_ = self->priv->brightness_adjustment;
-#line 1933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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 1935 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1940 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp178_ = self->priv->contrast_adjustment;
-#line 1935 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1940 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp179_ = gtk_adjustment_get_lower (_tmp178_);
-#line 1935 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1940 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp180_ = _tmp179_;
-#line 1935 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1940 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	lower = _tmp180_;
-#line 1936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1941 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp181_ = _ ("Less");
-#line 1936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1941 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp182_ = g_strdup_printf ("<small>%s</small>", _tmp181_);
-#line 1936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1941 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	less_label = _tmp182_;
-#line 1937 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp183_ = self->priv->contrast_adjustment;
-#line 1937 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp184_ = gtk_adjustment_get_upper (_tmp183_);
-#line 1937 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp185_ = _tmp184_;
-#line 1937 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	upper = _tmp185_;
-#line 1938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1943 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp186_ = _ ("More");
-#line 1938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1943 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp187_ = g_strdup_printf ("<small>%s</small>", _tmp186_);
-#line 1938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1943 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	more_label = _tmp187_;
-#line 1939 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp188_ = self->priv->contrast_scale;
-#line 1939 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp189_ = lower;
-#line 1939 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp190_ = less_label;
-#line 1939 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_scale_add_mark (_tmp188_, _tmp189_, GTK_POS_BOTTOM, _tmp190_);
-#line 1940 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1945 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp191_ = self->priv->contrast_scale;
-#line 1940 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1945 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_scale_add_mark (_tmp191_, (gdouble) 0, GTK_POS_BOTTOM, NULL);
-#line 1941 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp192_ = self->priv->contrast_scale;
-#line 1941 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp193_ = upper;
-#line 1941 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp194_ = more_label;
-#line 1941 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_scale_add_mark (_tmp192_, _tmp193_, GTK_POS_BOTTOM, _tmp194_);
-#line 1942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp195_ = self->priv->settings;
-#line 1942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp196_ = g_settings_get_int (_tmp195_, "contrast");
-#line 1942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_set_contrast (self, _tmp196_);
-#line 1943 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp197_ = self->priv->contrast_adjustment;
-#line 1943 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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 1945 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp198_ = self->priv->quality_adjustment;
-#line 1945 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp199_ = gtk_adjustment_get_lower (_tmp198_);
-#line 1945 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp200_ = _tmp199_;
-#line 1945 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	lower = _tmp200_;
-#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp201_ = _ ("Minimum");
-#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp202_ = g_strdup_printf ("<small>%s</small>", _tmp201_);
-#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	minimum_label = _tmp202_;
-#line 1947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp203_ = self->priv->quality_adjustment;
-#line 1947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp204_ = gtk_adjustment_get_upper (_tmp203_);
-#line 1947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp205_ = _tmp204_;
-#line 1947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	upper = _tmp205_;
-#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp206_ = _ ("Maximum");
-#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp207_ = g_strdup_printf ("<small>%s</small>", _tmp206_);
-#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	maximum_label = _tmp207_;
-#line 1949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp208_ = self->priv->quality_scale;
-#line 1949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp209_ = lower;
-#line 1949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp210_ = minimum_label;
-#line 1949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_scale_add_mark (_tmp208_, _tmp209_, GTK_POS_BOTTOM, _tmp210_);
-#line 1950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp211_ = self->priv->quality_scale;
-#line 1950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_scale_add_mark (_tmp211_, (gdouble) 75, GTK_POS_BOTTOM, NULL);
-#line 1951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp212_ = self->priv->quality_scale;
-#line 1951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp213_ = upper;
-#line 1951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp214_ = maximum_label;
-#line 1951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_scale_add_mark (_tmp212_, _tmp213_, GTK_POS_BOTTOM, _tmp214_);
-#line 1952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp215_ = self->priv->settings;
-#line 1952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp216_ = g_settings_get_int (_tmp215_, "jpeg-quality");
-#line 1952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_set_quality (self, _tmp216_);
-#line 1953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp217_ = self->priv->quality_adjustment;
-#line 1953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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 1955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp218_ = self->priv->settings;
-#line 1955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp219_ = g_settings_get_string (_tmp218_, "selected-device");
-#line 1955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	device = _tmp219_;
-#line 1956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp220_ = device;
-#line 1956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1960 "/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"
+	document_type = _tmp219_;
+#line 1961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp220_ = document_type;
+#line 1961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp220_ != NULL) {
-#line 10050 "ui.c"
+#line 10083 "ui.c"
 		const gchar* _tmp221_ = NULL;
-		GtkTreeIter _tmp222_ = {0};
-		gboolean _tmp223_ = FALSE;
-#line 1958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp221_ = device;
-#line 1958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp223_ = user_interface_find_scan_device (self, _tmp221_, &_tmp222_);
-#line 1958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		iter = _tmp222_;
-#line 1958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (_tmp223_) {
-#line 10062 "ui.c"
-			GtkComboBox* _tmp224_ = NULL;
-			GtkTreeIter _tmp225_ = {0};
-#line 1959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp224_ = self->priv->device_combo;
-#line 1959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp225_ = iter;
-#line 1959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			gtk_combo_box_set_active_iter (_tmp224_, &_tmp225_);
-#line 10071 "ui.c"
-		}
-	}
 #line 1962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp226_ = self->priv->settings;
+		_tmp221_ = document_type;
 #line 1962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp227_ = g_settings_get_string (_tmp226_, "document-type");
-#line 1962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	document_type = _tmp227_;
-#line 1963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp228_ = document_type;
-#line 1963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp228_ != NULL) {
-#line 10084 "ui.c"
-		const gchar* _tmp229_ = NULL;
+		user_interface_set_document_hint (self, _tmp221_, FALSE);
+#line 10089 "ui.c"
+	}
 #line 1964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp229_ = document_type;
+	_tmp222_ = self->priv->_book;
 #line 1964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_set_document_hint (self, _tmp229_, FALSE);
-#line 10090 "ui.c"
-	}
-#line 1966 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp230_ = self->priv->_book;
-#line 1966 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp231_ = book_view_new (_tmp230_);
+	_tmp223_ = book_view_new (_tmp222_);
+#line 1964 "/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"
+	_g_object_unref0 (self->priv->book_view);
+#line 1964 "/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"
+	_tmp224_ = self->priv->book_view;
+#line 1965 "/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"
-	g_object_ref_sink (_tmp231_);
+	_tmp225_ = self->priv->main_vbox;
 #line 1966 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->book_view);
+	_tmp226_ = self->priv->book_view;
 #line 1966 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->book_view = _tmp231_;
+	gtk_box_pack_end (_tmp225_, (GtkWidget*) _tmp226_, TRUE, TRUE, (guint) 0);
 #line 1967 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp232_ = self->priv->book_view;
+	_tmp227_ = self->priv->book_view;
 #line 1967 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_container_set_border_width ((GtkContainer*) _tmp232_, (guint) 18);
-#line 1968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp233_ = self->priv->main_vbox;
+	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"
-	_tmp234_ = self->priv->book_view;
+	_tmp228_ = self->priv->book_view;
 #line 1968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_box_pack_end (_tmp233_, (GtkWidget*) _tmp234_, TRUE, TRUE, (guint) 0);
+	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"
-	_tmp235_ = self->priv->book_view;
+	_tmp229_ = self->priv->book_view;
 #line 1969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp235_, "page-selected", (GCallback) _user_interface_page_selected_cb_book_view_page_selected, self, 0);
+	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"
-	_tmp236_ = self->priv->book_view;
+	_tmp230_ = self->priv->book_view;
 #line 1970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp236_, "show-page", (GCallback) _user_interface_show_page_cb_book_view_show_page, self, 0);
-#line 1971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp237_ = self->priv->book_view;
-#line 1971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp237_, "show-menu", (GCallback) _user_interface_show_page_menu_cb_book_view_show_menu, self, 0);
+	gtk_widget_set_visible ((GtkWidget*) _tmp230_, TRUE);
 #line 1972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp238_ = self->priv->book_view;
+	_tmp231_ = self->priv->authorize_dialog;
 #line 1972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp238_, TRUE);
-#line 1974 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp239_ = self->priv->authorize_dialog;
-#line 1974 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_window_set_transient_for ((GtkWindow*) _tmp239_, (GtkWindow*) self);
-#line 1975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp240_ = self->priv->preferences_dialog;
-#line 1975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_window_set_transient_for ((GtkWindow*) _tmp240_, (GtkWindow*) self);
-#line 1978 "/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"
+	_tmp232_ = self->priv->preferences_dialog;
+#line 1973 "/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"
 	user_interface_load_state (self);
+#line 1979 "/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"
+	_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"
+	_tmp235_ = self->priv->window_width;
+#line 1980 "/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"
+	gtk_window_set_default_size ((GtkWindow*) self, _tmp235_, _tmp236_);
 #line 1981 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp241_ = self->priv->window_width;
-#line 1981 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp242_ = self->priv->window_height;
+	_tmp237_ = self->priv->window_is_maximized;
 #line 1981 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_debug ("ui.vala:1981: Restoring window to %dx%d pixels", _tmp241_, _tmp242_);
-#line 1982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp243_ = self->priv->window_width;
-#line 1982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp244_ = self->priv->window_height;
-#line 1982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_window_set_default_size ((GtkWindow*) self, _tmp243_, _tmp244_);
+	if (_tmp237_) {
 #line 1983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp245_ = self->priv->window_is_maximized;
-#line 1983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp245_) {
-#line 1985 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_debug ("ui.vala:1985: Restoring window to maximized");
-#line 1986 "/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"
 		gtk_window_maximize ((GtkWindow*) self);
-#line 10158 "ui.c"
-	}
-#line 1989 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp246_ = _ ("Saving document...");
-#line 1989 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp247_ = progress_bar_dialog_new ((GtkApplicationWindow*) self, _tmp246_);
-#line 1989 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp247_);
-#line 1989 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 10157 "ui.c"
+	}
+#line 1987 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp238_ = _ ("Saving document...");
+#line 1987 "/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"
+	g_object_ref_sink (_tmp239_);
+#line 1987 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->progress_dialog);
-#line 1989 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->progress_dialog = _tmp247_;
-#line 1990 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp248_ = self->priv->_book;
-#line 1990 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp248_, "saving", (GCallback) _user_interface_book_saving_cb_book_saving, self, 0);
-#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1987 "/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"
+	_tmp240_ = self->priv->_book;
+#line 1988 "/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"
 	_g_free0 (document_type);
-#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (device);
-#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (maximum_label);
-#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (minimum_label);
-#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (more_label);
-#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (less_label);
-#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (lighter_label);
-#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (darker_label);
-#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (renderer);
-#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (content_area);
-#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (hbox);
-#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (app);
-#line 10198 "ui.c"
+#line 10195 "ui.c"
 }
 
 
@@ -10221,89 +10218,89 @@ static gboolean user_interface_is_desktop (UserInterface* self, const gchar* nam
 	const gchar* _tmp3_ = NULL;
 	gchar** _tmp4_ = NULL;
 	gchar** _tmp5_ = NULL;
-#line 1993 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1991 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1993 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1991 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (name != NULL, FALSE);
-#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1993 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = g_getenv ("XDG_CURRENT_DESKTOP");
-#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1993 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1993 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	desktop_name_list = _tmp1_;
-#line 1996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1994 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = desktop_name_list;
-#line 1996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1994 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_ == NULL) {
-#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = FALSE;
-#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (desktop_name_list);
-#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 10231 "ui.c"
+#line 10228 "ui.c"
 	}
-#line 1999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = desktop_name_list;
-#line 1999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = _tmp4_ = g_strsplit (_tmp3_, ":", 0);
-#line 10237 "ui.c"
+#line 10234 "ui.c"
 	{
 		gchar** n_collection = NULL;
 		gint n_collection_length1 = 0;
 		gint _n_collection_size_ = 0;
 		gint n_it = 0;
-#line 1999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		n_collection = _tmp5_;
-#line 1999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		n_collection_length1 = _vala_array_length (_tmp4_);
-#line 1999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1997 "/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 10249 "ui.c"
+#line 10246 "ui.c"
 			gchar* _tmp6_ = NULL;
 			gchar* n = NULL;
-#line 1999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp6_ = g_strdup (n_collection[n_it]);
-#line 1999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			n = _tmp6_;
-#line 10256 "ui.c"
+#line 10253 "ui.c"
 			{
 				const gchar* _tmp7_ = NULL;
 				const gchar* _tmp8_ = NULL;
-#line 2000 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1998 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp7_ = n;
-#line 2000 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1998 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp8_ = name;
-#line 2000 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1998 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (g_strcmp0 (_tmp7_, _tmp8_) == 0) {
-#line 2001 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					result = TRUE;
-#line 2001 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_g_free0 (n);
-#line 2001 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					n_collection = (_vala_array_free (n_collection, n_collection_length1, (GDestroyNotify) g_free), NULL);
-#line 2001 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1999 "/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 1999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					return result;
-#line 10276 "ui.c"
+#line 10273 "ui.c"
 				}
-#line 1999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (n);
-#line 10280 "ui.c"
+#line 10277 "ui.c"
 			}
 		}
-#line 1999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		n_collection = (_vala_array_free (n_collection, n_collection_length1, (GDestroyNotify) g_free), NULL);
-#line 10285 "ui.c"
+#line 10282 "ui.c"
 	}
-#line 2003 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2001 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
-#line 2003 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2001 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (desktop_name_list);
-#line 2003 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2001 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 10293 "ui.c"
+#line 10290 "ui.c"
 }
 
 
@@ -10331,51 +10328,51 @@ static void user_interface_load_state (UserInterface* self) {
 	gchar* _tmp26_ = NULL;
 	gchar* _tmp27_ = NULL;
 	GQuark _tmp29_ = 0U;
-#line 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	static GQuark _tmp28_label0 = 0;
-#line 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	static GQuark _tmp28_label1 = 0;
-#line 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	static GQuark _tmp28_label2 = 0;
-#line 10327 "ui.c"
+#line 10324 "ui.c"
 	GError * _inner_error_ = NULL;
-#line 2011 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2009 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2013 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2011 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = user_interface_get_state_filename (self);
-#line 2013 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2011 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _tmp0_;
-#line 2013 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2011 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 2013 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_debug ("ui.vala:2013: Loading state from %s", _tmp2_);
-#line 2013 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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"
 	_g_free0 (_tmp2_);
-#line 2015 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2013 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = g_key_file_new ();
-#line 2015 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2013 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	f = _tmp3_;
-#line 10345 "ui.c"
+#line 10342 "ui.c"
 	{
 		GKeyFile* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 2018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = f;
-#line 2018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = user_interface_get_state_filename (self);
-#line 2018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = _tmp5_;
-#line 2018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = _tmp6_;
-#line 2018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_key_file_load_from_file (_tmp4_, _tmp7_, G_KEY_FILE_NONE, &_inner_error_);
-#line 2018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_tmp7_);
-#line 2018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10365 "ui.c"
+#line 10362 "ui.c"
 			goto __catch23_g_error;
 		}
 	}
@@ -10384,310 +10381,310 @@ static void user_interface_load_state (UserInterface* self) {
 	{
 		GError* e = NULL;
 		GError* _tmp8_ = NULL;
-#line 2016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 2016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 2022 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2020 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = e;
-#line 2022 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2020 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (!g_error_matches (_tmp8_, G_FILE_ERROR, G_FILE_ERROR_NOENT)) {
-#line 10382 "ui.c"
+#line 10379 "ui.c"
 			GError* _tmp9_ = NULL;
 			const gchar* _tmp10_ = NULL;
-#line 2023 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2021 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp9_ = e;
-#line 2023 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2021 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp10_ = _tmp9_->message;
-#line 2023 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			g_warning ("ui.vala:2023: Failed to load state: %s", _tmp10_);
-#line 10391 "ui.c"
+#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 2016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 10395 "ui.c"
+#line 10392 "ui.c"
 	}
 	__finally23:
-#line 2016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_key_file_unref0 (f);
-#line 2016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2014 "/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 2016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 2016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 10408 "ui.c"
+#line 10405 "ui.c"
 	}
-#line 2025 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2023 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = f;
-#line 2025 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2023 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = user_interface_state_get_integer (self, _tmp11_, "window", "width", 600);
-#line 2025 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2023 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->window_width = _tmp12_;
-#line 2026 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2024 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = self->priv->window_width;
-#line 2026 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2024 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp13_ <= 0) {
-#line 2027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2025 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->window_width = 600;
-#line 10422 "ui.c"
+#line 10419 "ui.c"
 	}
-#line 2028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2026 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = f;
-#line 2028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2026 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = user_interface_state_get_integer (self, _tmp14_, "window", "height", 400);
-#line 2028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2026 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->window_height = _tmp15_;
-#line 2029 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = self->priv->window_height;
-#line 2029 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp16_ <= 0) {
-#line 2030 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->window_height = 400;
-#line 10436 "ui.c"
+#line 10433 "ui.c"
 	}
-#line 2031 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2029 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp17_ = f;
-#line 2031 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2029 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = user_interface_state_get_boolean (self, _tmp17_, "window", "is-maximized", FALSE);
-#line 2031 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2029 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->window_is_maximized = _tmp18_;
-#line 2032 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2030 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp19_ = f;
-#line 2032 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2030 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp20_ = user_interface_state_get_integer (self, _tmp19_, "last-page", "width", 595);
-#line 2032 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2030 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_width = _tmp20_;
-#line 2033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2031 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp21_ = f;
-#line 2033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2031 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp22_ = user_interface_state_get_integer (self, _tmp21_, "last-page", "height", 842);
-#line 2033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2031 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_height = _tmp22_;
-#line 2034 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2032 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp23_ = f;
-#line 2034 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2032 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp24_ = user_interface_state_get_integer (self, _tmp23_, "last-page", "dpi", 72);
-#line 2034 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2032 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_dpi = _tmp24_;
-#line 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp25_ = f;
-#line 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2033 "/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 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp27_ = _tmp26_;
-#line 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp29_ = (NULL == _tmp27_) ? 0 : g_quark_from_string (_tmp27_);
-#line 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_free (_tmp27_);
-#line 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2033 "/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 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		switch (0) {
-#line 10476 "ui.c"
+#line 10473 "ui.c"
 			default:
 			{
-#line 2042 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				self->priv->default_page_scan_direction = SCAN_DIRECTION_BOTTOM_TO_TOP;
-#line 2043 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2041 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 10483 "ui.c"
+#line 10480 "ui.c"
 			}
 		}
 	} else if (_tmp29_ == ((0 != _tmp28_label1) ? _tmp28_label1 : (_tmp28_label1 = g_quark_from_static_string ("left-to-right")))) {
-#line 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		switch (0) {
-#line 10489 "ui.c"
+#line 10486 "ui.c"
 			default:
 			{
-#line 2045 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2043 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				self->priv->default_page_scan_direction = SCAN_DIRECTION_LEFT_TO_RIGHT;
-#line 2046 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2044 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 10496 "ui.c"
+#line 10493 "ui.c"
 			}
 		}
 	} else if (_tmp29_ == ((0 != _tmp28_label2) ? _tmp28_label2 : (_tmp28_label2 = g_quark_from_static_string ("right-to-left")))) {
-#line 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		switch (0) {
-#line 10502 "ui.c"
+#line 10499 "ui.c"
 			default:
 			{
-#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2046 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				self->priv->default_page_scan_direction = SCAN_DIRECTION_RIGHT_TO_LEFT;
-#line 2049 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2047 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 10509 "ui.c"
+#line 10506 "ui.c"
 			}
 		}
 	} else {
-#line 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		switch (0) {
-#line 10515 "ui.c"
+#line 10512 "ui.c"
 			default:
 			{
-#line 2039 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2037 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				self->priv->default_page_scan_direction = SCAN_DIRECTION_TOP_TO_BOTTOM;
-#line 2040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2038 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 10522 "ui.c"
+#line 10519 "ui.c"
 			}
 		}
 	}
-#line 2011 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2009 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_key_file_unref0 (f);
-#line 10528 "ui.c"
+#line 10525 "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 2053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2051 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 2053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2051 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (f != NULL, 0);
-#line 2053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2051 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (group_name != NULL, 0);
-#line 2053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2051 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (key != NULL, 0);
-#line 10543 "ui.c"
+#line 10540 "ui.c"
 	{
 		gint _tmp0_ = 0;
 		GKeyFile* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
 		gint _tmp4_ = 0;
-#line 2057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = f;
-#line 2057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = group_name;
-#line 2057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = key;
-#line 2057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = g_key_file_get_integer (_tmp1_, _tmp2_, _tmp3_, &_inner_error_);
-#line 2057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = _tmp4_;
-#line 2057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10562 "ui.c"
+#line 10559 "ui.c"
 			goto __catch24_g_error;
 		}
-#line 2057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = _tmp0_;
-#line 2057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 10569 "ui.c"
+#line 10566 "ui.c"
 	}
 	goto __finally24;
 	__catch24_g_error:
 	{
 		gint _tmp5_ = 0;
-#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 2061 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2059 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = _default_;
-#line 2061 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2059 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = _tmp5_;
-#line 2061 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2059 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 10585 "ui.c"
+#line 10582 "ui.c"
 	}
 	__finally24:
-#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2053 "/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 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_clear_error (&_inner_error_);
-#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return 0;
-#line 10594 "ui.c"
+#line 10591 "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 2065 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 2065 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (f != NULL, FALSE);
-#line 2065 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (group_name != NULL, FALSE);
-#line 2065 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (key != NULL, FALSE);
-#line 10609 "ui.c"
+#line 10606 "ui.c"
 	{
 		gboolean _tmp0_ = FALSE;
 		GKeyFile* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
-#line 2069 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2067 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = f;
-#line 2069 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2067 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = group_name;
-#line 2069 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2067 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = key;
-#line 2069 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2067 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = g_key_file_get_boolean (_tmp1_, _tmp2_, _tmp3_, &_inner_error_);
-#line 2069 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2067 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = _tmp4_;
-#line 2069 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2067 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10628 "ui.c"
+#line 10625 "ui.c"
 			goto __catch25_g_error;
 		}
-#line 2069 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2067 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = _tmp0_;
-#line 2069 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2067 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 10635 "ui.c"
+#line 10632 "ui.c"
 	}
 	goto __finally25;
 	__catch25_g_error:
 	{
 		gboolean _tmp5_ = FALSE;
-#line 2067 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2065 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 2067 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2065 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 2073 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2071 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = _default_;
-#line 2073 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2071 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = _tmp5_;
-#line 2073 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2071 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 10651 "ui.c"
+#line 10648 "ui.c"
 	}
 	__finally25:
-#line 2067 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2065 "/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 2067 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2065 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_clear_error (&_inner_error_);
-#line 2067 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2065 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return FALSE;
-#line 10660 "ui.c"
+#line 10657 "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 2077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2075 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 2077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2075 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (f != NULL, NULL);
-#line 2077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2075 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (group_name != NULL, NULL);
-#line 2077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2075 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (key != NULL, NULL);
-#line 2077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2075 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (_default_ != NULL, NULL);
-#line 10677 "ui.c"
+#line 10674 "ui.c"
 	{
 		gchar* _tmp0_ = NULL;
 		GKeyFile* _tmp1_ = NULL;
@@ -10695,83 +10692,83 @@ static gchar* user_interface_state_get_string (UserInterface* self, GKeyFile* f,
 		const gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 2081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2079 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = f;
-#line 2081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2079 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = group_name;
-#line 2081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2079 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = key;
-#line 2081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2079 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = g_key_file_get_string (_tmp1_, _tmp2_, _tmp3_, &_inner_error_);
-#line 2081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2079 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = _tmp4_;
-#line 2081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2079 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10697 "ui.c"
+#line 10694 "ui.c"
 			goto __catch26_g_error;
 		}
-#line 2081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2079 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = _tmp0_;
-#line 2081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2079 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = NULL;
-#line 2081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2079 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = _tmp5_;
-#line 2081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2079 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_tmp0_);
-#line 2081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2079 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 10710 "ui.c"
+#line 10707 "ui.c"
 	}
 	goto __finally26;
 	__catch26_g_error:
 	{
 		const gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 2079 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 2079 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 2085 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = _default_;
-#line 2085 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = g_strdup (_tmp6_);
-#line 2085 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = _tmp7_;
-#line 2085 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 10729 "ui.c"
+#line 10726 "ui.c"
 	}
 	__finally26:
-#line 2079 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2077 "/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 2079 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_clear_error (&_inner_error_);
-#line 2079 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return NULL;
-#line 10738 "ui.c"
+#line 10735 "ui.c"
 }
 
 
 static gboolean ___lambda11_ (UserInterface* self) {
 	gboolean result = FALSE;
-#line 2097 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2095 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_state (self, TRUE);
-#line 2098 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2096 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->save_state_timeout = (guint) 0;
-#line 2099 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2097 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
-#line 2099 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2097 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 10752 "ui.c"
+#line 10749 "ui.c"
 }
 
 
 static gboolean ____lambda11__gsource_func (gpointer self) {
 	gboolean result;
 	result = ___lambda11_ ((UserInterface*) self);
-#line 2095 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2093 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 10761 "ui.c"
+#line 10758 "ui.c"
 }
 
 
@@ -10796,145 +10793,145 @@ static void user_interface_save_state (UserInterface* self, gboolean force) {
 	gint _tmp19_ = 0;
 	ScanDirection _tmp20_ = 0;
 	GError * _inner_error_ = NULL;
-#line 2089 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2087 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2091 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2089 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = force;
-#line 2091 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2089 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp0_) {
-#line 10792 "ui.c"
+#line 10789 "ui.c"
 		guint _tmp1_ = 0U;
 		guint _tmp3_ = 0U;
-#line 2093 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2091 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = self->priv->save_state_timeout;
-#line 2093 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2091 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp1_ != ((guint) 0)) {
-#line 10799 "ui.c"
+#line 10796 "ui.c"
 			guint _tmp2_ = 0U;
-#line 2094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2092 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp2_ = self->priv->save_state_timeout;
-#line 2094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2092 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			g_source_remove (_tmp2_);
-#line 10805 "ui.c"
+#line 10802 "ui.c"
 		}
-#line 2095 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2093 "/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 2095 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2093 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->save_state_timeout = _tmp3_;
-#line 2101 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2099 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 10813 "ui.c"
+#line 10810 "ui.c"
 	}
-#line 2104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = user_interface_get_state_filename (self);
-#line 2104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = _tmp4_;
-#line 2104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = _tmp5_;
-#line 2104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_debug ("ui.vala:2104: Saving state to %s", _tmp6_);
-#line 2104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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"
 	_g_free0 (_tmp6_);
-#line 2106 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = g_key_file_new ();
-#line 2106 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	f = _tmp7_;
-#line 2107 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2105 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = f;
-#line 2107 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2105 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = self->priv->window_width;
-#line 2107 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2105 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_key_file_set_integer (_tmp8_, "window", "width", _tmp9_);
-#line 2108 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2106 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = f;
-#line 2108 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2106 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = self->priv->window_height;
-#line 2108 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2106 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_key_file_set_integer (_tmp10_, "window", "height", _tmp11_);
-#line 2109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2107 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = f;
-#line 2109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2107 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = self->priv->window_is_maximized;
-#line 2109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2107 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_key_file_set_boolean (_tmp12_, "window", "is-maximized", _tmp13_);
-#line 2110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2108 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = f;
-#line 2110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2108 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = self->priv->default_page_width;
-#line 2110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2108 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_key_file_set_integer (_tmp14_, "last-page", "width", _tmp15_);
-#line 2111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = f;
-#line 2111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp17_ = self->priv->default_page_height;
-#line 2111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_key_file_set_integer (_tmp16_, "last-page", "height", _tmp17_);
-#line 2112 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = f;
-#line 2112 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp19_ = self->priv->default_page_dpi;
-#line 2112 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_key_file_set_integer (_tmp18_, "last-page", "dpi", _tmp19_);
-#line 2113 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp20_ = self->priv->default_page_scan_direction;
-#line 2113 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	switch (_tmp20_) {
-#line 2113 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case SCAN_DIRECTION_TOP_TO_BOTTOM:
-#line 10871 "ui.c"
+#line 10868 "ui.c"
 		{
 			GKeyFile* _tmp21_ = NULL;
-#line 2116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp21_ = f;
-#line 2116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			g_key_file_set_value (_tmp21_, "last-page", "scan-direction", "top-to-bottom");
-#line 2117 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2115 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 10880 "ui.c"
+#line 10877 "ui.c"
 		}
-#line 2113 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case SCAN_DIRECTION_BOTTOM_TO_TOP:
-#line 10884 "ui.c"
+#line 10881 "ui.c"
 		{
 			GKeyFile* _tmp22_ = NULL;
-#line 2119 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2117 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp22_ = f;
-#line 2119 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2117 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			g_key_file_set_value (_tmp22_, "last-page", "scan-direction", "bottom-to-top");
-#line 2120 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 10893 "ui.c"
+#line 10890 "ui.c"
 		}
-#line 2113 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case SCAN_DIRECTION_LEFT_TO_RIGHT:
-#line 10897 "ui.c"
+#line 10894 "ui.c"
 		{
 			GKeyFile* _tmp23_ = NULL;
-#line 2122 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2120 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp23_ = f;
-#line 2122 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2120 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			g_key_file_set_value (_tmp23_, "last-page", "scan-direction", "left-to-right");
-#line 2123 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2121 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 10906 "ui.c"
+#line 10903 "ui.c"
 		}
-#line 2113 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case SCAN_DIRECTION_RIGHT_TO_LEFT:
-#line 10910 "ui.c"
+#line 10907 "ui.c"
 		{
 			GKeyFile* _tmp24_ = NULL;
-#line 2125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2123 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp24_ = f;
-#line 2125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2123 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			g_key_file_set_value (_tmp24_, "last-page", "scan-direction", "right-to-left");
-#line 2126 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 10919 "ui.c"
+#line 10916 "ui.c"
 		}
 		default:
-#line 2113 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 10924 "ui.c"
+#line 10921 "ui.c"
 	}
 	{
 		gchar* _tmp25_ = NULL;
@@ -10943,27 +10940,27 @@ static void user_interface_save_state (UserInterface* self, gboolean force) {
 		GKeyFile* _tmp28_ = NULL;
 		gchar* _tmp29_ = NULL;
 		gchar* _tmp30_ = NULL;
-#line 2130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp25_ = user_interface_get_state_filename (self);
-#line 2130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp26_ = _tmp25_;
-#line 2130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp27_ = _tmp26_;
-#line 2130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp28_ = f;
-#line 2130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp29_ = g_key_file_to_data (_tmp28_, NULL, NULL);
-#line 2130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp30_ = _tmp29_;
-#line 2130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_file_set_contents (_tmp27_, _tmp30_, (gssize) (-1), &_inner_error_);
-#line 2130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_tmp30_);
-#line 2130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_tmp27_);
-#line 2130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10953 "ui.c"
+#line 10950 "ui.c"
 			goto __catch27_g_error;
 		}
 	}
@@ -10973,60 +10970,60 @@ static void user_interface_save_state (UserInterface* self, gboolean force) {
 		GError* e = NULL;
 		GError* _tmp31_ = NULL;
 		const gchar* _tmp32_ = NULL;
-#line 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2126 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2126 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 2134 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp31_ = e;
-#line 2134 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp32_ = _tmp31_->message;
-#line 2134 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_warning ("ui.vala:2134: Failed to write state: %s", _tmp32_);
-#line 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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"
 		_g_error_free0 (e);
-#line 10975 "ui.c"
+#line 10972 "ui.c"
 	}
 	__finally27:
-#line 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2126 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2126 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_key_file_unref0 (f);
-#line 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2126 "/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 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2126 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2126 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 10988 "ui.c"
+#line 10985 "ui.c"
 	}
-#line 2089 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2087 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_key_file_unref0 (f);
-#line 10992 "ui.c"
+#line 10989 "ui.c"
 }
 
 
 static gboolean ___lambda21_ (UserInterface* self) {
 	gboolean result = FALSE;
 	ProgressBarDialog* _tmp0_ = NULL;
-#line 2149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->progress_dialog;
-#line 2149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp0_, FALSE);
-#line 2150 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2148 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
-#line 2150 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2148 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 11007 "ui.c"
+#line 11004 "ui.c"
 }
 
 
 static gboolean ____lambda21__gsource_func (gpointer self) {
 	gboolean result;
 	result = ___lambda21_ ((UserInterface*) self);
-#line 2148 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 11016 "ui.c"
+#line 11013 "ui.c"
 }
 
 
@@ -11049,97 +11046,97 @@ static void user_interface_book_saving_cb (UserInterface* self, gint page_number
 	ProgressBarDialog* _tmp12_ = NULL;
 	gdouble _tmp13_ = 0.0;
 	ProgressBarDialog* _tmp14_ = NULL;
-#line 2138 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2136 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2141 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	while (TRUE) {
-#line 11043 "ui.c"
+#line 11040 "ui.c"
 		gboolean _tmp0_ = FALSE;
-#line 2141 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = gtk_events_pending ();
-#line 2141 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (!_tmp0_) {
-#line 2141 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 11051 "ui.c"
+#line 11048 "ui.c"
 		}
-#line 2142 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2140 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_main_iteration ();
-#line 11055 "ui.c"
+#line 11052 "ui.c"
 	}
-#line 2144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2142 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->_book;
-#line 2144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2142 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = book_get_n_pages (_tmp1_);
-#line 2144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2142 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 2144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2142 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	total = (gint) _tmp3_;
-#line 2145 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page_number;
-#line 2145 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = total;
-#line 2145 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	fraction = (_tmp4_ + 1.0) / _tmp5_;
-#line 2146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = fraction;
-#line 2146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	complete = _tmp6_ == 1.0;
-#line 2147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2145 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = complete;
-#line 2147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2145 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp7_) {
-#line 2148 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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 11081 "ui.c"
+#line 11078 "ui.c"
 	}
-#line 2152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2150 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = _ ("Saving page %d out of %d");
-#line 2152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2150 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = page_number;
-#line 2152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2150 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = total;
-#line 2152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2150 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = g_strdup_printf (_tmp8_, _tmp9_ + 1, _tmp10_);
-#line 2152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2150 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	message = _tmp11_;
-#line 2154 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = self->priv->progress_dialog;
-#line 2154 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = fraction;
-#line 2154 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	progress_bar_dialog_set_fraction (_tmp12_, _tmp13_);
-#line 2155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = self->priv->progress_dialog;
-#line 2155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	progress_bar_dialog_set_message (_tmp14_, message);
-#line 2138 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2136 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (message);
-#line 11105 "ui.c"
+#line 11102 "ui.c"
 }
 
 
 void user_interface_show_progress_dialog (UserInterface* self) {
 	ProgressBarDialog* _tmp0_ = NULL;
-#line 2158 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2158 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->progress_dialog;
-#line 2160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2158 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp0_, TRUE);
-#line 11117 "ui.c"
+#line 11114 "ui.c"
 }
 
 
 void user_interface_hide_progress_dialog (UserInterface* self) {
 	ProgressBarDialog* _tmp0_ = NULL;
-#line 2163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->progress_dialog;
-#line 2165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp0_, FALSE);
-#line 11129 "ui.c"
+#line 11126 "ui.c"
 }
 
 
@@ -11149,46 +11146,46 @@ void user_interface_show_error (UserInterface* self, const gchar* error_title, c
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 2168 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2168 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (error_title != NULL);
-#line 2168 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (error_text != NULL);
-#line 2170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2168 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->have_error = TRUE;
-#line 2171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = error_title;
-#line 2171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 2171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->error_title);
-#line 2171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->error_title = _tmp1_;
-#line 2172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = error_text;
-#line 2172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 2172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->error_text);
-#line 2172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->error_text = _tmp3_;
-#line 2173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = change_scanner_hint;
-#line 2173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->error_change_scanner_hint = _tmp4_;
-#line 2174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_info_bar (self);
-#line 11169 "ui.c"
+#line 11166 "ui.c"
 }
 
 
 void user_interface_start (UserInterface* self) {
-#line 2177 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2179 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2177 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) self, TRUE);
-#line 11178 "ui.c"
+#line 11175 "ui.c"
 }
 
 
@@ -11203,14 +11200,14 @@ Book* user_interface_get_book (UserInterface* self) {
 	result = _tmp0_;
 #line 164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 11193 "ui.c"
+#line 11190 "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 11200 "ui.c"
+#line 11197 "ui.c"
 }
 
 
@@ -11229,7 +11226,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 11219 "ui.c"
+#line 11216 "ui.c"
 }
 
 
@@ -11250,7 +11247,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 11240 "ui.c"
+#line 11237 "ui.c"
 }
 
 
@@ -11267,7 +11264,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 11257 "ui.c"
+#line 11254 "ui.c"
 }
 
 
@@ -11282,7 +11279,7 @@ gboolean user_interface_get_scanning (UserInterface* self) {
 	result = _tmp0_;
 #line 193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 11272 "ui.c"
+#line 11269 "ui.c"
 }
 
 
@@ -11336,7 +11333,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 11326 "ui.c"
+#line 11323 "ui.c"
 }
 
 
@@ -11357,7 +11354,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 11347 "ui.c"
+#line 11344 "ui.c"
 }
 
 
@@ -11374,7 +11371,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 11364 "ui.c"
+#line 11361 "ui.c"
 }
 
 
@@ -11395,7 +11392,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 11385 "ui.c"
+#line 11382 "ui.c"
 }
 
 
@@ -11412,7 +11409,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 11402 "ui.c"
+#line 11399 "ui.c"
 }
 
 
@@ -11433,7 +11430,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 11423 "ui.c"
+#line 11420 "ui.c"
 }
 
 
@@ -11450,7 +11447,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 11440 "ui.c"
+#line 11437 "ui.c"
 }
 
 
@@ -11470,7 +11467,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 11460 "ui.c"
+#line 11457 "ui.c"
 		gchar* device = NULL;
 		GtkListStore* _tmp3_ = NULL;
 		GtkTreeIter _tmp4_ = {0};
@@ -11484,13 +11481,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 11474 "ui.c"
+#line 11471 "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 11480 "ui.c"
+#line 11477 "ui.c"
 }
 
 
@@ -11513,7 +11510,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 11503 "ui.c"
+#line 11500 "ui.c"
 	}
 #line 251 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->device_combo;
@@ -11525,7 +11522,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 11515 "ui.c"
+#line 11512 "ui.c"
 }
 
 
@@ -11533,17 +11530,17 @@ static gchar* user_interface_get_state_filename (UserInterface* self) {
 	gchar* result;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 2008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2006 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 2008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2006 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = g_get_user_cache_dir ();
-#line 2008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2006 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_build_filename (_tmp0_, "simple-scan", "state", NULL);
-#line 2008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2006 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = _tmp1_;
-#line 2008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2006 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 11533 "ui.c"
+#line 11530 "ui.c"
 }
 
 
@@ -11562,19 +11559,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 11552 "ui.c"
+#line 11549 "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 11558 "ui.c"
+#line 11555 "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 11564 "ui.c"
+#line 11561 "ui.c"
 }
 
 
@@ -11593,19 +11590,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 11583 "ui.c"
+#line 11580 "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 11589 "ui.c"
+#line 11586 "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 11595 "ui.c"
+#line 11592 "ui.c"
 }
 
 
@@ -11829,7 +11826,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 11819 "ui.c"
+#line 11816 "ui.c"
 }
 
 
@@ -11849,7 +11846,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 11839 "ui.c"
+#line 11836 "ui.c"
 }
 
 
@@ -12025,7 +12022,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 12015 "ui.c"
+#line 12012 "ui.c"
 }
 
 
@@ -12088,13 +12085,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 12078 "ui.c"
+#line 12075 "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 12084 "ui.c"
+#line 12081 "ui.c"
 	}
 }
 
@@ -12146,13 +12143,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 12136 "ui.c"
+#line 12133 "ui.c"
 		default:
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 12142 "ui.c"
+#line 12139 "ui.c"
 	}
 }
 
@@ -12171,92 +12168,92 @@ ProgressBarDialog* progress_bar_dialog_construct (GType object_type, GtkApplicat
 	const gchar* _tmp7_ = NULL;
 	GtkApplicationWindow* _tmp8_ = NULL;
 	GtkProgressBar* _tmp9_ = NULL;
-#line 2199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2197 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (parent != NULL, NULL);
-#line 2199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2197 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (title != NULL, NULL);
-#line 2199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2197 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = (ProgressBarDialog*) g_object_new (object_type, NULL);
-#line 2201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = (GtkProgressBar*) gtk_progress_bar_new ();
-#line 2201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp0_);
-#line 2201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->bar);
-#line 2201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->bar = _tmp0_;
-#line 2202 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
-#line 2202 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp1_);
-#line 2202 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	hbox = _tmp1_;
-#line 2203 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-#line 2203 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp2_);
-#line 2203 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	vbox = _tmp2_;
-#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2202 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_hexpand ((GtkWidget*) hbox, TRUE);
-#line 2206 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->bar;
-#line 2206 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_progress_bar_set_text (_tmp3_, "");
-#line 2207 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2205 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = self->priv->bar;
-#line 2207 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2205 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_progress_bar_set_show_text (_tmp4_, TRUE);
-#line 2208 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2206 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = self->priv->bar;
-#line 2208 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2206 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_size_request ((GtkWidget*) _tmp5_, 225, 25);
-#line 2209 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2207 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_size_request ((GtkWidget*) self, 250, 50);
-#line 2211 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2209 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = self->priv->bar;
-#line 2211 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2209 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (vbox, (GtkWidget*) _tmp6_, TRUE, FALSE, (guint) 0);
-#line 2212 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2210 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (hbox, (GtkWidget*) vbox, TRUE, FALSE, (guint) 0);
-#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2211 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_container_add ((GtkContainer*) self, (GtkWidget*) hbox);
-#line 2214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2212 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = title;
-#line 2214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2212 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_title ((GtkWindow*) self, _tmp7_);
-#line 2216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = parent;
-#line 2216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_transient_for ((GtkWindow*) self, (GtkWindow*) _tmp8_);
-#line 2217 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2215 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_position ((GtkWindow*) self, GTK_WIN_POS_CENTER_ON_PARENT);
-#line 2218 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_modal ((GtkWindow*) self, TRUE);
-#line 2219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2217 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_resizable ((GtkWindow*) self, FALSE);
-#line 2221 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) hbox, TRUE);
-#line 2222 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) vbox, TRUE);
-#line 2223 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2221 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = self->priv->bar;
-#line 2223 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2221 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp9_, TRUE);
-#line 2199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2197 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (vbox);
-#line 2199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2197 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (hbox);
-#line 2199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2197 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self;
-#line 12239 "ui.c"
+#line 12236 "ui.c"
 }
 
 
 ProgressBarDialog* progress_bar_dialog_new (GtkApplicationWindow* parent, const gchar* title) {
-#line 2199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2197 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return progress_bar_dialog_construct (TYPE_PROGRESS_BAR_DIALOG, parent, title);
-#line 12246 "ui.c"
+#line 12243 "ui.c"
 }
 
 
@@ -12265,36 +12262,36 @@ gdouble progress_bar_dialog_get_fraction (ProgressBarDialog* self) {
 	GtkProgressBar* _tmp0_ = NULL;
 	gdouble _tmp1_ = 0.0;
 	gdouble _tmp2_ = 0.0;
-#line 2189 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, 0.0);
-#line 2189 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->bar;
-#line 2189 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_progress_bar_get_fraction (_tmp0_);
-#line 2189 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 2189 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = _tmp2_;
-#line 2189 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 12267 "ui.c"
+#line 12264 "ui.c"
 }
 
 
 void progress_bar_dialog_set_fraction (ProgressBarDialog* self, gdouble value) {
 	GtkProgressBar* _tmp0_ = NULL;
 	gdouble _tmp1_ = 0.0;
-#line 2190 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2190 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->bar;
-#line 2190 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = value;
-#line 2190 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_progress_bar_set_fraction (_tmp0_, _tmp1_);
-#line 2190 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_notify ((GObject *) self, "fraction");
-#line 12284 "ui.c"
+#line 12281 "ui.c"
 }
 
 
@@ -12303,74 +12300,74 @@ const gchar* progress_bar_dialog_get_message (ProgressBarDialog* self) {
 	GtkProgressBar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
-#line 2195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 2195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->bar;
-#line 2195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_progress_bar_get_text (_tmp0_);
-#line 2195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 2195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = _tmp2_;
-#line 2195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 12305 "ui.c"
+#line 12302 "ui.c"
 }
 
 
 void progress_bar_dialog_set_message (ProgressBarDialog* self, const gchar* value) {
 	GtkProgressBar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 2196 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2196 "/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 2196 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = value;
-#line 2196 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_progress_bar_set_text (_tmp0_, _tmp1_);
-#line 2196 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_notify ((GObject *) self, "message");
-#line 12322 "ui.c"
+#line 12319 "ui.c"
 }
 
 
 static void progress_bar_dialog_class_init (ProgressBarDialogClass * klass) {
-#line 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	progress_bar_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_type_class_add_private (klass, sizeof (ProgressBarDialogPrivate));
-#line 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (klass)->get_property = _vala_progress_bar_dialog_get_property;
-#line 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (klass)->set_property = _vala_progress_bar_dialog_set_property;
-#line 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (klass)->finalize = progress_bar_dialog_finalize;
-#line 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2181 "/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 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2181 "/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 12341 "ui.c"
+#line 12338 "ui.c"
 }
 
 
 static void progress_bar_dialog_instance_init (ProgressBarDialog * self) {
-#line 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv = PROGRESS_BAR_DIALOG_GET_PRIVATE (self);
-#line 12348 "ui.c"
+#line 12345 "ui.c"
 }
 
 
 static void progress_bar_dialog_finalize (GObject* obj) {
 	ProgressBarDialog * self;
-#line 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PROGRESS_BAR_DIALOG, ProgressBarDialog);
-#line 2185 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->bar);
 #line 2183 "/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"
 	G_OBJECT_CLASS (progress_bar_dialog_parent_class)->finalize (obj);
-#line 12360 "ui.c"
+#line 12357 "ui.c"
 }
 
 
@@ -12389,27 +12386,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 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	switch (property_id) {
-#line 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case PROGRESS_BAR_DIALOG_FRACTION:
-#line 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_value_set_double (value, progress_bar_dialog_get_fraction (self));
-#line 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case PROGRESS_BAR_DIALOG_MESSAGE:
-#line 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_value_set_string (value, progress_bar_dialog_get_message (self));
-#line 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 12393 "ui.c"
+#line 12390 "ui.c"
 		default:
-#line 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-#line 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 12399 "ui.c"
+#line 12396 "ui.c"
 	}
 }
 
@@ -12417,27 +12414,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 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	switch (property_id) {
-#line 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case PROGRESS_BAR_DIALOG_FRACTION:
-#line 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		progress_bar_dialog_set_fraction (self, g_value_get_double (value));
-#line 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case PROGRESS_BAR_DIALOG_MESSAGE:
-#line 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		progress_bar_dialog_set_message (self, g_value_get_string (value));
-#line 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 12421 "ui.c"
+#line 12418 "ui.c"
 		default:
-#line 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-#line 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 12427 "ui.c"
+#line 12424 "ui.c"
 	}
 }
 
@@ -12450,45 +12447,45 @@ gchar* get_temporary_filename (const gchar* prefix, const gchar* extension) {
 	gchar* _tmp2_ = NULL;
 	gchar* path = NULL;
 	GError * _inner_error_ = NULL;
-#line 2228 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (prefix != NULL, NULL);
-#line 2228 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (extension != NULL, NULL);
-#line 2233 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2231 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = prefix;
-#line 2233 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2231 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = extension;
-#line 2233 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2231 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = g_strdup_printf ("%sXXXXXX.%s", _tmp0_, _tmp1_);
-#line 2233 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2231 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	filename = _tmp2_;
-#line 12452 "ui.c"
+#line 12449 "ui.c"
 	{
 		gint fd = 0;
 		const gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
-#line 2237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = filename;
-#line 2237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = g_file_open_tmp (_tmp3_, &_tmp4_, &_inner_error_);
-#line 2237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 2237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		path = _tmp4_;
-#line 2237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		fd = _tmp5_;
-#line 2237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12471 "ui.c"
+#line 12468 "ui.c"
 			goto __catch28_g_error;
 		}
-#line 2238 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2236 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = fd;
-#line 2238 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2236 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		close (_tmp6_);
-#line 12478 "ui.c"
+#line 12475 "ui.c"
 	}
 	goto __finally28;
 	__catch28_g_error:
@@ -12496,50 +12493,50 @@ gchar* get_temporary_filename (const gchar* prefix, const gchar* extension) {
 		GError* e = NULL;
 		GError* _tmp7_ = NULL;
 		const gchar* _tmp8_ = NULL;
-#line 2235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2233 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 2235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2233 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 2242 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = e;
-#line 2242 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = _tmp7_->message;
-#line 2242 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_warning ("ui.vala:2242: Error saving email attachment: %s", _tmp8_);
-#line 2243 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#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"
 		result = NULL;
-#line 2243 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2241 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 2243 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2241 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 2243 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2241 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (filename);
-#line 2243 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2241 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 12506 "ui.c"
+#line 12503 "ui.c"
 	}
 	__finally28:
-#line 2235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2233 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2233 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 2235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2233 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (filename);
-#line 2235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2233 "/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 2235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2233 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 2235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2233 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return NULL;
-#line 12521 "ui.c"
+#line 12518 "ui.c"
 	}
-#line 2246 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2244 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = path;
-#line 2246 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2244 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (filename);
-#line 2246 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2244 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 12529 "ui.c"
+#line 12526 "ui.c"
 }
 
 
@@ -12550,40 +12547,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 2257 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2255 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (text != NULL, NULL);
-#line 2257 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2255 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = (PageIcon*) g_object_new (object_type, NULL);
-#line 2259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2257 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = text;
-#line 2259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2257 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 2259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2257 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->text);
-#line 2259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2257 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->text = _tmp1_;
-#line 2260 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2258 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = r;
-#line 2260 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2258 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->r = _tmp2_;
-#line 2261 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = g;
-#line 2261 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->g = _tmp3_;
-#line 2262 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2260 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = b;
-#line 2262 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2260 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->b = _tmp4_;
-#line 2257 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2255 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self;
-#line 12566 "ui.c"
+#line 12563 "ui.c"
 }
 
 
 PageIcon* page_icon_new (const gchar* text, gdouble r, gdouble g, gdouble b) {
-#line 2257 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2255 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return page_icon_construct (TYPE_PAGE_ICON, text, r, g, b);
-#line 12573 "ui.c"
+#line 12570 "ui.c"
 }
 
 
@@ -12591,23 +12588,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 2265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = (PageIcon*) base;
-#line 2267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_natural_width = PAGE_ICON_MINIMUM_WIDTH;
-#line 2267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_vala_minimum_width = _vala_natural_width;
 #line 2265 "/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"
 	if (minimum_width) {
-#line 2265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*minimum_width = _vala_minimum_width;
-#line 12591 "ui.c"
+#line 12588 "ui.c"
 	}
-#line 2265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (natural_width) {
-#line 2265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*natural_width = _vala_natural_width;
-#line 12597 "ui.c"
+#line 12594 "ui.c"
 	}
 }
 
@@ -12617,25 +12614,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 2270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = (PageIcon*) base;
-#line 2272 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = round (PAGE_ICON_MINIMUM_WIDTH * G_SQRT2);
-#line 2272 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_natural_height = (gint) _tmp0_;
-#line 2272 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_vala_minimum_height = _vala_natural_height;
 #line 2270 "/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"
 	if (minimum_height) {
-#line 2270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*minimum_height = _vala_minimum_height;
-#line 12619 "ui.c"
+#line 12616 "ui.c"
 	}
-#line 2270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (natural_height) {
-#line 2270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*natural_height = _vala_natural_height;
-#line 12625 "ui.c"
+#line 12622 "ui.c"
 	}
 }
 
@@ -12645,25 +12642,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 2275 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2273 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = (PageIcon*) base;
-#line 2277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2275 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = width;
-#line 2277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2275 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_natural_height = (gint) (_tmp0_ * G_SQRT2);
-#line 2277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_vala_minimum_height = _vala_natural_height;
 #line 2275 "/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"
 	if (minimum_height) {
-#line 2275 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2273 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*minimum_height = _vala_minimum_height;
-#line 12647 "ui.c"
+#line 12644 "ui.c"
 	}
-#line 2275 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2273 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (natural_height) {
-#line 2275 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2273 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*natural_height = _vala_natural_height;
-#line 12653 "ui.c"
+#line 12650 "ui.c"
 	}
 }
 
@@ -12673,25 +12670,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 2280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2278 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = (PageIcon*) base;
-#line 2282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = height;
-#line 2282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_natural_width = (gint) (_tmp0_ / G_SQRT2);
-#line 2282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_vala_minimum_width = _vala_natural_width;
 #line 2280 "/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"
 	if (minimum_width) {
-#line 2280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2278 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*minimum_width = _vala_minimum_width;
-#line 12675 "ui.c"
+#line 12672 "ui.c"
 	}
-#line 2280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2278 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (natural_width) {
-#line 2280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2278 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*natural_width = _vala_natural_width;
-#line 12681 "ui.c"
+#line 12678 "ui.c"
 	}
 }
 
@@ -12734,166 +12731,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 2285 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = (PageIcon*) base;
-#line 2285 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (c != NULL, FALSE);
-#line 2287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2285 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = gtk_widget_get_allocated_width ((GtkWidget*) self);
-#line 2287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2285 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	w = _tmp0_;
-#line 2288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_widget_get_allocated_height ((GtkWidget*) self);
-#line 2288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	h = _tmp1_;
-#line 2289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = w;
-#line 2289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = h;
-#line 2289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if ((_tmp2_ * G_SQRT2) > ((gdouble) _tmp3_)) {
-#line 12742 "ui.c"
+#line 12739 "ui.c"
 		gint _tmp4_ = 0;
 		gdouble _tmp5_ = 0.0;
-#line 2290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = h;
-#line 2290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = round (_tmp4_ / G_SQRT2);
-#line 2290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		w = (gint) _tmp5_;
-#line 12751 "ui.c"
+#line 12748 "ui.c"
 	} else {
 		gint _tmp6_ = 0;
 		gdouble _tmp7_ = 0.0;
-#line 2292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = w;
-#line 2292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = round (_tmp6_ * G_SQRT2);
-#line 2292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		h = (gint) _tmp7_;
-#line 12761 "ui.c"
+#line 12758 "ui.c"
 	}
-#line 2294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = c;
-#line 2294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = gtk_widget_get_allocated_width ((GtkWidget*) self);
-#line 2294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = w;
-#line 2294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = gtk_widget_get_allocated_height ((GtkWidget*) self);
-#line 2294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = h;
-#line 2294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_translate (_tmp8_, (gdouble) ((_tmp9_ - _tmp10_) / 2), (gdouble) ((_tmp11_ - _tmp12_) / 2));
-#line 2296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = c;
-#line 2296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = w;
-#line 2296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = h;
-#line 2296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_rectangle (_tmp13_, 0.5, 0.5, (gdouble) (_tmp14_ - 1), (gdouble) (_tmp15_ - 1));
-#line 2298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = c;
-#line 2298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp17_ = self->priv->r;
-#line 2298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = self->priv->g;
-#line 2298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp19_ = self->priv->b;
-#line 2298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_set_source_rgb (_tmp16_, _tmp17_, _tmp18_, _tmp19_);
-#line 2299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp20_ = c;
-#line 2299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_fill_preserve (_tmp20_);
-#line 2301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp21_ = c;
-#line 2301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_set_line_width (_tmp21_, 1.0);
-#line 2302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2300 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp22_ = c;
-#line 2302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2300 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_set_source_rgb (_tmp22_, 0.0, 0.0, 0.0);
-#line 2303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp23_ = c;
-#line 2303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_stroke (_tmp23_);
-#line 2306 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp24_ = c;
-#line 2306 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp25_ = self->priv->text;
-#line 2306 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_text_extents (_tmp24_, _tmp25_, &_tmp26_);
-#line 2306 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	extents = _tmp26_;
-#line 2307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp27_ = c;
-#line 2307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp28_ = w;
-#line 2307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp29_ = extents;
-#line 2307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp30_ = _tmp29_.width;
-#line 2307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp31_ = h;
-#line 2307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp32_ = extents;
-#line 2307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp33_ = _tmp32_.height;
-#line 2307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2305 "/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 2308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2306 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp34_ = c;
-#line 2308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2306 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp35_ = self->priv->text;
-#line 2308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2306 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_show_text (_tmp34_, _tmp35_);
-#line 2310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = TRUE;
-#line 2310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 12843 "ui.c"
+#line 12840 "ui.c"
 }
 
 
 static void page_icon_class_init (PageIconClass * klass) {
-#line 2249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page_icon_parent_class = g_type_class_peek_parent (klass);
-#line 2249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_type_class_add_private (klass, sizeof (PageIconPrivate));
-#line 2249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	((GtkWidgetClass *) klass)->get_preferred_width = page_icon_real_get_preferred_width;
-#line 2249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	((GtkWidgetClass *) klass)->get_preferred_height = page_icon_real_get_preferred_height;
-#line 2249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2247 "/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 2249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2247 "/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 2249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	((GtkWidgetClass *) klass)->draw = page_icon_real_draw;
-#line 2249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (klass)->finalize = page_icon_finalize;
-#line 12864 "ui.c"
+#line 12861 "ui.c"
 }
 
 
 static void page_icon_instance_init (PageIcon * self) {
-#line 2249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv = PAGE_ICON_GET_PRIVATE (self);
-#line 12871 "ui.c"
+#line 12868 "ui.c"
 }
 
 
 static void page_icon_finalize (GObject* obj) {
 	PageIcon * self;
-#line 2249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PAGE_ICON, PageIcon);
-#line 2251 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (self->priv->text);
 #line 2249 "/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"
 	G_OBJECT_CLASS (page_icon_parent_class)->finalize (obj);
-#line 12883 "ui.c"
+#line 12880 "ui.c"
 }
 
 
diff --git a/src/ui.vala b/src/ui.vala
index 17392bc..ab1cfd4 100644
--- a/src/ui.vala
+++ b/src/ui.vala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2011 Canonical Ltd.
+ * Copyright (C) 2009-2015 Canonical Ltd.
  * Author: Robert Ancell <robert.ancell@canonical.com>,
  *         Eduard Gotwig <g@ox.io>
  *
@@ -467,9 +467,15 @@ public class UserInterface : Gtk.ApplicationWindow
         while (device_model.iter_nth_child (out iter, null, index))
             device_model.remove (iter);
 
-        /* Select the first available device */
-        if (!have_selection && devices != null)
-            device_combo.set_active (0);
+        /* Select the previously selected device or the first available device */
+        if (!have_selection)
+        {
+            var device = settings.get_string ("selected-device");
+            if (device != null && find_scan_device (device, out iter))
+                device_combo.set_active_iter (iter);
+            else
+                device_combo.set_active (0);
+        }
 
         setting_devices = false;
 
@@ -1479,7 +1485,7 @@ public class UserInterface : Gtk.ApplicationWindow
                                "authors", authors,
                                "translator-credits", _("translator-credits"),
                                "website", "https://launchpad.net/simple-scan",
-                               "copyright", "Copyright © 2009-2011 Canonical Ltd.",
+                               "copyright", "Copyright © 2009-2015 Canonical Ltd.",
                                "license", license,
                                "wrap-license", true,
                                null);
@@ -1654,14 +1660,13 @@ public class UserInterface : Gtk.ApplicationWindow
                     {
                         var e = results.get_error_code ();
                         /* Label shown if failed to install drivers */
-                        var error_text = _("Failed to install drivers (error code %d).").printf (e.code);
+                        result_text = _("Failed to install drivers (error code %d).").printf (e.code);
                     }
-
                 }
                 catch (Error e)
                 {
                     /* Label shown if failed to install drivers */
-                    error_text = _("Failed to install drivers.");
+                    result_text = _("Failed to install drivers.");
                     warning ("Failed to install drivers: %s", e.message);
                 }
                 instructions_label.set_text (result_text);
@@ -1952,13 +1957,6 @@ public class UserInterface : Gtk.ApplicationWindow
         quality = settings.get_int ("jpeg-quality");
         quality_adjustment.value_changed.connect (() => { settings.set_int ("jpeg-quality", quality); });
 
-        var device = settings.get_string ("selected-device");
-        if (device != null)
-        {
-            if (find_scan_device (device, out iter))
-                device_combo.set_active_iter (iter);
-        }
-
         var document_type = settings.get_string ("document-type");
         if (document_type != null)
             set_document_hint (document_type);
author	Jörg Frings-Fürst <debian@jff-webhosting.net>	2015-09-27 14:23:15 +0200
committer	Jörg Frings-Fürst <debian@jff-webhosting.net>	2015-09-27 14:23:15 +0200
commit	f64f5d0c9e37828bc1a42f8e69bbc4d3d8c549f5 (patch)
tree	4b288591003df04deea71d2acfb71f81849ea2f2
parent	05e2631353c9f9522564ca06efc8fc5ba3a863cb (diff)