diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-12-01 10:01:51 +0100 | 
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-12-01 10:01:51 +0100 | 
| commit | 00a801ea2b55d7a57ea0b2e7b2a230b131a4aa5b (patch) | |
| tree | fae6b71e7b35677f2dd436d44c88db2d3c49e4e5 | |
| parent | 6e13fec9c301b741035eafb7702d8ed7c9347584 (diff) | |
Imported Upstream version 3.15.2upstream/3.15.2
| -rw-r--r-- | NEWS | 5 | ||||
| -rwxr-xr-x | configure | 20 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | po/af.po | 4 | ||||
| -rw-r--r-- | po/ar.po | 4 | ||||
| -rw-r--r-- | po/ast.po | 4 | ||||
| -rw-r--r-- | po/az.po | 4 | ||||
| -rw-r--r-- | po/bg.po | 4 | ||||
| -rw-r--r-- | po/bo.po | 4 | ||||
| -rw-r--r-- | po/ca.po | 4 | ||||
| -rw-r--r-- | po/ca@valencia.po | 4 | ||||
| -rw-r--r-- | po/ce.po | 4 | ||||
| -rw-r--r-- | po/cs.po | 5 | ||||
| -rw-r--r-- | po/da.po | 30 | ||||
| -rw-r--r-- | po/de.po | 4 | ||||
| -rw-r--r-- | po/el.po | 4 | ||||
| -rw-r--r-- | po/en_GB.po | 4 | ||||
| -rw-r--r-- | po/eo.po | 4 | ||||
| -rw-r--r-- | po/es.po | 4 | ||||
| -rw-r--r-- | po/et.po | 4 | ||||
| -rw-r--r-- | po/eu.po | 4 | ||||
| -rw-r--r-- | po/fi.po | 4 | ||||
| -rw-r--r-- | po/fr.po | 4 | ||||
| -rw-r--r-- | po/gd.po | 28 | ||||
| -rw-r--r-- | po/gl.po | 4 | ||||
| -rw-r--r-- | po/he.po | 28 | ||||
| -rw-r--r-- | po/hr.po | 4 | ||||
| -rw-r--r-- | po/hu.po | 4 | ||||
| -rw-r--r-- | po/hy.po | 4 | ||||
| -rw-r--r-- | po/id.po | 4 | ||||
| -rw-r--r-- | po/it.po | 4 | ||||
| -rw-r--r-- | po/ja.po | 84 | ||||
| -rw-r--r-- | po/kk.po | 4 | ||||
| -rw-r--r-- | po/km.po | 8 | ||||
| -rw-r--r-- | po/ky.po | 4 | ||||
| -rw-r--r-- | po/lt.po | 4 | ||||
| -rw-r--r-- | po/lv.po | 6 | ||||
| -rw-r--r-- | po/mhr.po | 4 | ||||
| -rw-r--r-- | po/ms.po | 4 | ||||
| -rw-r--r-- | po/my.po | 4 | ||||
| -rw-r--r-- | po/nb.po | 4 | ||||
| -rw-r--r-- | po/nl.po | 31 | ||||
| -rw-r--r-- | po/oc.po | 4 | ||||
| -rw-r--r-- | po/pa.po | 4 | ||||
| -rw-r--r-- | po/pl.po | 4 | ||||
| -rw-r--r-- | po/pt.po | 4 | ||||
| -rw-r--r-- | po/pt_BR.po | 4 | ||||
| -rw-r--r-- | po/ro.po | 4 | ||||
| -rw-r--r-- | po/ru.po | 10 | ||||
| -rw-r--r-- | po/sd.po | 4 | ||||
| -rw-r--r-- | po/se.po | 4 | ||||
| -rw-r--r-- | po/shn.po | 4 | ||||
| -rw-r--r-- | po/sk.po | 5 | ||||
| -rw-r--r-- | po/sl.po | 4 | ||||
| -rw-r--r-- | po/sq.po | 4 | ||||
| -rw-r--r-- | po/sr.po | 4 | ||||
| -rw-r--r-- | po/sv.po | 4 | ||||
| -rw-r--r-- | po/ta.po | 4 | ||||
| -rw-r--r-- | po/te.po | 4 | ||||
| -rw-r--r-- | po/th.po | 4 | ||||
| -rw-r--r-- | po/tr.po | 7 | ||||
| -rw-r--r-- | po/ug.po | 10 | ||||
| -rw-r--r-- | po/uk.po | 4 | ||||
| -rw-r--r-- | po/ur.po | 4 | ||||
| -rw-r--r-- | po/uz.po | 4 | ||||
| -rw-r--r-- | po/vi.po | 4 | ||||
| -rw-r--r-- | po/zh_CN.po | 4 | ||||
| -rw-r--r-- | po/zh_TW.po | 4 | ||||
| -rw-r--r-- | src/page.c | 652 | ||||
| -rw-r--r-- | src/page.vala | 18 | 
70 files changed, 612 insertions, 549 deletions
| @@ -1,3 +1,8 @@ +Overview of changes in simple-scan 3.15.2 + +  * Store density information in bitmap formats (JPEG, PNG, TIFF). Requires +    gdk-pixbuf 2.32.2 +  Overview of changes in simple-scan 3.15.1    * Updated translations @@ -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.15.1. +# Generated by GNU Autoconf 2.69 for simple-scan 3.15.2.  #  #  # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -637,8 +637,8 @@ MAKEFLAGS=  # Identity of this package.  PACKAGE_NAME='simple-scan'  PACKAGE_TARNAME='simple-scan' -PACKAGE_VERSION='3.15.1' -PACKAGE_STRING='simple-scan 3.15.1' +PACKAGE_VERSION='3.15.2' +PACKAGE_STRING='simple-scan 3.15.2'  PACKAGE_BUGREPORT=''  PACKAGE_URL='' @@ -1398,7 +1398,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.15.1 to adapt to many kinds of systems. +\`configure' configures simple-scan 3.15.2 to adapt to many kinds of systems.  Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1464,7 +1464,7 @@ fi  if test -n "$ac_init_help"; then    case $ac_init_help in -     short | recursive ) echo "Configuration of simple-scan 3.15.1:";; +     short | recursive ) echo "Configuration of simple-scan 3.15.2:";;     esac    cat <<\_ACEOF @@ -1580,7 +1580,7 @@ fi  test -n "$ac_init_help" && exit $ac_status  if $ac_init_version; then    cat <<\_ACEOF -simple-scan configure 3.15.1 +simple-scan configure 3.15.2  generated by GNU Autoconf 2.69  Copyright (C) 2012 Free Software Foundation, Inc. @@ -1945,7 +1945,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.15.1, which was +It was created by simple-scan $as_me 3.15.2, which was  generated by GNU Autoconf 2.69.  Invocation command line was    $ $0 $@ @@ -2808,7 +2808,7 @@ fi  # Define the identity of the package.   PACKAGE='simple-scan' - VERSION='3.15.1' + VERSION='3.15.2'  cat >>confdefs.h <<_ACEOF @@ -6522,7 +6522,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.15.1, which was +This file was extended by simple-scan $as_me 3.15.2, which was  generated by GNU Autoconf 2.69.  Invocation command line was    CONFIG_FILES    = $CONFIG_FILES @@ -6579,7 +6579,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.15.1 +simple-scan config.status 3.15.2  configured by $0, generated by GNU Autoconf 2.69,    with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index a97b6f9..f17abf4 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.15.1) +AC_INIT(simple-scan, 3.15.2)  AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign])  AM_SILENT_RULES([yes])  AM_MAINTAINER_MODE @@ -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: 2014-09-23 06:39+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:34+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -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: 2014-09-23 06:39+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:34+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -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: 2014-09-23 06:39+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:34+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -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: 2014-09-23 06:39+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:34+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -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: 2014-09-23 06:39+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:34+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -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: 2014-09-23 06:40+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:36+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -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: 2014-09-23 06:39+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:34+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 diff --git a/po/ca@valencia.po b/po/ca@valencia.po index 096aa9f..a73494d 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: 2014-09-23 06:41+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:36+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -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: 2014-09-23 06:39+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:34+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -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: 2014-09-23 06:39+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:34+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -629,6 +629,7 @@ msgstr ""  "  Tadeáš Pařík https://launchpad.net/~pariktadeas\n"  "  Vitezslav Kotrla https://launchpad.net/~vitezslav-kotrla\n"  "  Vojtěch Trefný https://launchpad.net/~vojtech.trefny\n" +"  Zdeněk Kopš https://launchpad.net/~zdenekkops\n"  "  la_serpe https://launchpad.net/~tom-mil"  #. Text in dialog warning when a document is about to be lost @@ -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: 2014-09-23 06:39+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:35+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -89,7 +89,7 @@ msgstr "Billede"  #. Title of dialog to reorder pages  #: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694  msgid "Reorder Pages" -msgstr "" +msgstr "Sortér sider påny"  #. Label on email menu item  #: ../data/simple-scan.ui.h:30 @@ -554,22 +554,22 @@ msgstr "Kunne ikke åbne programmet til forhåndsvisning af billeder"  #. Label on button for combining sides in reordering dialog  #: ../src/ui.vala:1204  msgid "Combine sides" -msgstr "" +msgstr "Kombinér sider"  #. Label on button for combining sides in reverse order in reordering dialog  #: ../src/ui.vala:1214  msgid "Combine sides (reverse)" -msgstr "" +msgstr "Kombinér sider (omvendt)"  #. Label on button for reversing in reordering dialog  #: ../src/ui.vala:1224  msgid "Reverse" -msgstr "" +msgstr "Omvendt"  #. Label on button for cancelling page reordering dialog  #: ../src/ui.vala:1234  msgid "Keep unchanged" -msgstr "" +msgstr "Bevar uændret"  #. Error message displayed when unable to launch help browser  #: ../src/ui.vala:1449 @@ -620,7 +620,7 @@ msgid "translator-credits"  msgstr ""  "Launchpad Contributions:\n"  "  AJenbo https://launchpad.net/~ajenbo\n" -"  Aputsiaq Niels Janussen https://launchpad.net/~aj\n" +"  Aputsiaĸ Niels Janussen https://launchpad.net/~aj\n"  "  Ask Hjorth Larsen https://launchpad.net/~askhl\n"  "  David Nielsen https://launchpad.net/~davidnielsen-deactivatedaccount\n"  "  Joe Hansen https://launchpad.net/~joedalton2\n" @@ -667,31 +667,31 @@ msgstr "%d dpi"  #: ../src/ui.vala:1688  msgid "New Document" -msgstr "" +msgstr "Nyt dokument"  #: ../src/ui.vala:1693  msgid "Document" -msgstr "" +msgstr "Dokument"  #: ../src/ui.vala:1697  msgid "Email..." -msgstr "" +msgstr "E-post..."  #: ../src/ui.vala:1698  msgid "Print..." -msgstr "" +msgstr "Udskriv..."  #: ../src/ui.vala:1706  msgid "Help" -msgstr "" +msgstr "Hjælp"  #: ../src/ui.vala:1707  msgid "About" -msgstr "" +msgstr "Om"  #: ../src/ui.vala:1708  msgid "Quit" -msgstr "" +msgstr "Afslut"  #. Button in error infobar to open preferences dialog and change scanner  #: ../src/ui.vala:1748 @@ -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: 2014-09-23 06:39+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:35+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -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: 2014-09-23 06:39+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:35+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 diff --git a/po/en_GB.po b/po/en_GB.po index f360292..732650c 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: 2014-09-23 06:40+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:36+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -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: 2014-09-23 06:39+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:35+0000\n" +"X-Generator: Launchpad (build 17211)\n"  "Language: eo\n"  #. Button to submit authorization dialog @@ -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: 2014-09-23 06:40+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:36+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -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: 2014-09-23 06:39+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:35+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -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: 2014-09-23 06:39+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:34+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -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: 2014-09-23 06:39+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:35+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -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: 2014-09-23 06:39+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:35+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -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: 2014-09-23 06:39+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:35+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -89,7 +89,7 @@ msgstr "Dealbh"  #. Title of dialog to reorder pages  #: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694  msgid "Reorder Pages" -msgstr "" +msgstr "Atharraich òrdugh nan duilleagan"  #. Label on email menu item  #: ../data/simple-scan.ui.h:30 @@ -568,22 +568,22 @@ msgstr "Chan urrainn dhuinn an aplacaid fhosgladh a ro-sheallas an ìomhaigh"  #. Label on button for combining sides in reordering dialog  #: ../src/ui.vala:1204  msgid "Combine sides" -msgstr "" +msgstr "Cuir còmhla na duilleagan"  #. Label on button for combining sides in reverse order in reordering dialog  #: ../src/ui.vala:1214  msgid "Combine sides (reverse)" -msgstr "" +msgstr "Cuir còmhla na duilleagan (ann an òrdugh contrarra)"  #. Label on button for reversing in reordering dialog  #: ../src/ui.vala:1224  msgid "Reverse" -msgstr "" +msgstr "Contrarra"  #. Label on button for cancelling page reordering dialog  #: ../src/ui.vala:1234  msgid "Keep unchanged" -msgstr "" +msgstr "Cum gun atharrachadh"  #. Error message displayed when unable to launch help browser  #: ../src/ui.vala:1449 @@ -672,31 +672,31 @@ msgstr "%d dpi"  #: ../src/ui.vala:1688  msgid "New Document" -msgstr "" +msgstr "Sgrìobhainn ùr"  #: ../src/ui.vala:1693  msgid "Document" -msgstr "" +msgstr "Sgrìobhainn"  #: ../src/ui.vala:1697  msgid "Email..." -msgstr "" +msgstr "Post-d..."  #: ../src/ui.vala:1698  msgid "Print..." -msgstr "" +msgstr "Clò-bhuail..."  #: ../src/ui.vala:1706  msgid "Help" -msgstr "" +msgstr "Cobhair"  #: ../src/ui.vala:1707  msgid "About" -msgstr "" +msgstr "Mu dhèidhinn"  #: ../src/ui.vala:1708  msgid "Quit" -msgstr "" +msgstr "Fàg an-seo"  #. Button in error infobar to open preferences dialog and change scanner  #: ../src/ui.vala:1748 @@ -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: 2014-09-23 06:39+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:35+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -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: 2014-09-23 06:39+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:35+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -89,7 +89,7 @@ msgstr "צילום"  #. Title of dialog to reorder pages  #: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694  msgid "Reorder Pages" -msgstr "" +msgstr "סידור הדפים מחדש"  #. Label on email menu item  #: ../data/simple-scan.ui.h:30 @@ -553,22 +553,22 @@ msgstr "לא ניתן לפתוח את היישום להצגה מקדימה של  #. Label on button for combining sides in reordering dialog  #: ../src/ui.vala:1204  msgid "Combine sides" -msgstr "" +msgstr "שילוב צדדים"  #. Label on button for combining sides in reverse order in reordering dialog  #: ../src/ui.vala:1214  msgid "Combine sides (reverse)" -msgstr "" +msgstr "שילוב צדדים (הפוך)"  #. Label on button for reversing in reordering dialog  #: ../src/ui.vala:1224  msgid "Reverse" -msgstr "" +msgstr "היפוך"  #. Label on button for cancelling page reordering dialog  #: ../src/ui.vala:1234  msgid "Keep unchanged" -msgstr "" +msgstr "להשאיר ללא שינוי"  #. Error message displayed when unable to launch help browser  #: ../src/ui.vala:1449 @@ -660,31 +660,31 @@ msgstr "%d dpi"  #: ../src/ui.vala:1688  msgid "New Document" -msgstr "" +msgstr "מסמך חדש"  #: ../src/ui.vala:1693  msgid "Document" -msgstr "" +msgstr "מסמך"  #: ../src/ui.vala:1697  msgid "Email..." -msgstr "" +msgstr "דוא״ל…"  #: ../src/ui.vala:1698  msgid "Print..." -msgstr "" +msgstr "הדפסה…"  #: ../src/ui.vala:1706  msgid "Help" -msgstr "" +msgstr "עזרה"  #: ../src/ui.vala:1707  msgid "About" -msgstr "" +msgstr "על אודות"  #: ../src/ui.vala:1708  msgid "Quit" -msgstr "" +msgstr "יציאה"  #. Button in error infobar to open preferences dialog and change scanner  #: ../src/ui.vala:1748 @@ -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: 2014-09-23 06:40+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:35+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -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: 2014-09-23 06:39+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:35+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -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: 2014-09-23 06:39+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:34+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -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: 2014-09-23 06:39+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:35+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -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: 2014-09-23 06:39+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:35+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -8,14 +8,14 @@ msgstr ""  "Project-Id-Version: simple-scan\n"  "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"  "POT-Creation-Date: 2014-08-18 17:31+1200\n" -"PO-Revision-Date: 2012-07-23 09:03+0000\n" -"Last-Translator: Shushi Kurose <md81bird@hitaki.net>\n" +"PO-Revision-Date: 2014-11-20 05:14+0000\n" +"Last-Translator: Kentaro Kazuhama <Unknown>\n"  "Language-Team: Japanese <ja@li.org>\n"  "MIME-Version: 1.0\n"  "Content-Type: text/plain; charset=UTF-8\n"  "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-09-23 06:39+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-21 06:28+0000\n" +"X-Generator: Launchpad (build 17252)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -89,7 +89,7 @@ msgstr "写真"  #. Title of dialog to reorder pages  #: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694  msgid "Reorder Pages" -msgstr "" +msgstr "ページを再整列"  #. Label on email menu item  #: ../data/simple-scan.ui.h:30 @@ -164,12 +164,12 @@ msgstr "切り抜きを回転(_R)"  #. Menu item to move the selected page to the left  #: ../data/simple-scan.ui.h:58  msgid "Move Left" -msgstr "" +msgstr "左へ移動"  #. Menu item to move the selected page to the right  #: ../data/simple-scan.ui.h:60  msgid "Move Right" -msgstr "" +msgstr "右へ移動"  #. Label on help menu  #: ../data/simple-scan.ui.h:62 @@ -321,7 +321,7 @@ msgstr "10mm単位での紙の幅"  msgid ""  "The width of the paper in tenths of a mm (or 0 for automatic paper "  "detection)." -msgstr "" +msgstr "10mm単位の用紙の幅 (または自動用紙検知の場合は 0)"  #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7  msgid "Height of paper in tenths of a mm" @@ -432,7 +432,7 @@ msgstr "スキャンに失敗しました"  #. Default filename to use when saving document (and extension will be added, e.g. .jpg)  #: ../src/simple-scan.vala:316  msgid "Scanned Document" -msgstr "" +msgstr "スキャン済みドキュメント"  #. Arguments and description for --help text  #: ../src/simple-scan.vala:543 @@ -485,32 +485,32 @@ msgstr "保存(_S)"  #. Save dialog: Filter name to show only image files  #: ../src/ui.vala:521  msgid "Image Files" -msgstr "" +msgstr "画像ファイル"  #. Save dialog: Filter name to show all files  #: ../src/ui.vala:527  msgid "All Files" -msgstr "" +msgstr "すべてのファイル"  #.   #: ../src/ui.vala:532  msgid "Select File _Type" -msgstr "" +msgstr "ファイルタイプの選択(_T)"  #. Save dialog: Label for saving in PDF format  #: ../src/ui.vala:546  msgid "PDF (multi-page document)" -msgstr "" +msgstr "PDF (複数ページ)"  #. Save dialog: Label for saving in JPEG format  #: ../src/ui.vala:552  msgid "JPEG (compressed)" -msgstr "" +msgstr "JPEG (圧縮済み)"  #. Save dialog: Label for saving in PNG format  #: ../src/ui.vala:558  msgid "PNG (lossless)" -msgstr "" +msgstr "PNG (ロスレス)"  #. Title of error dialog when save failed  #: ../src/ui.vala:647 @@ -520,17 +520,17 @@ msgstr "ファイルの保存に失敗しました"  #. Text in dialog warning when a document is about to be lost  #: ../src/ui.vala:670  msgid "If you don't save, changes will be permanently lost." -msgstr "" +msgstr "保存しない場合、変更点は失われます。"  #. Text in dialog warning when a document is about to be lost  #: ../src/ui.vala:706  msgid "Save current document?" -msgstr "" +msgstr "現在のドキュメントを保存しますか?"  #. Button in dialog to create new document and discard unsaved document  #: ../src/ui.vala:708  msgid "Discard Changes" -msgstr "" +msgstr "変更を破棄"  #. Error message display when unable to save image for preview  #: ../src/ui.vala:990 @@ -540,17 +540,17 @@ msgstr "プレビュー用の画像を保存できません"  #. Error message display when unable to preview image  #: ../src/ui.vala:1002  msgid "Unable to open image preview application" -msgstr "" +msgstr "画像プレビューアプリケーションを開けませんでした"  #. Label on button for combining sides in reordering dialog  #: ../src/ui.vala:1204  msgid "Combine sides" -msgstr "" +msgstr "面を結合"  #. Label on button for combining sides in reverse order in reordering dialog  #: ../src/ui.vala:1214  msgid "Combine sides (reverse)" -msgstr "" +msgstr "面を結合(逆順)"  #. Label on button for reversing in reordering dialog  #: ../src/ui.vala:1224 @@ -560,12 +560,12 @@ msgstr ""  #. Label on button for cancelling page reordering dialog  #: ../src/ui.vala:1234  msgid "Keep unchanged" -msgstr "" +msgstr "無変更を維持"  #. Error message displayed when unable to launch help browser  #: ../src/ui.vala:1449  msgid "Unable to open help file" -msgstr "" +msgstr "ヘルプファイルを開くことができません"  #. The license this software is under (GPL3+)  #: ../src/ui.vala:1470 @@ -583,6 +583,18 @@ msgid ""  "You should have received a copy of the GNU General Public License\n"  "along with this program.  If not, see <http://www.gnu.org/licenses/>."  msgstr "" +"This program is free software: you can redistribute it and/or modify\n" +"it under the terms of the GNU General Public License as published by\n" +"the Free Software Foundation, either version 3 of the License, or\n" +"(at your option) any later version.\n" +"\n" +"This program is distributed in the hope that it will be useful,\n" +"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n" +"GNU General Public License for more details.\n" +"\n" +"You should have received a copy of the GNU General Public License\n" +"along with this program.  If not, see <http://www.gnu.org/licenses/>."  #. Title of about dialog  #: ../src/ui.vala:1473 @@ -612,52 +624,52 @@ msgstr ""  #. Text in dialog warning when a document is about to be lost  #: ../src/ui.vala:1507  msgid "Save document before quitting?" -msgstr "" +msgstr "終了する前にドキュメントを保存しますか?"  #. Button in dialog to quit and discard unsaved document  #: ../src/ui.vala:1509  msgid "Quit without Saving" -msgstr "" +msgstr "保存せずに終了"  #. Preferences dialog: Label for default resolution in resolution list  #: ../src/ui.vala:1633  #, c-format  msgid "%d dpi (default)" -msgstr "" +msgstr "%d dpi (標準)"  #. Preferences dialog: Label for minimum resolution in resolution list  #: ../src/ui.vala:1636  #, c-format  msgid "%d dpi (draft)" -msgstr "" +msgstr "%d dpi (ドラフト)"  #. Preferences dialog: Label for maximum resolution in resolution list  #: ../src/ui.vala:1639  #, c-format  msgid "%d dpi (high resolution)" -msgstr "" +msgstr "%d dpi (高解像度)"  #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)  #: ../src/ui.vala:1642  #, c-format  msgid "%d dpi" -msgstr "" +msgstr "%d dpi"  #: ../src/ui.vala:1688  msgid "New Document" -msgstr "" +msgstr "新しいドキュメント"  #: ../src/ui.vala:1693  msgid "Document" -msgstr "" +msgstr "ドキュメント"  #: ../src/ui.vala:1697  msgid "Email..." -msgstr "" +msgstr "メール..."  #: ../src/ui.vala:1698  msgid "Print..." -msgstr "" +msgstr "印刷..."  #: ../src/ui.vala:1706  msgid "Help" @@ -665,11 +677,11 @@ msgstr "ヘルプ"  #: ../src/ui.vala:1707  msgid "About" -msgstr "" +msgstr "このプログラムについて"  #: ../src/ui.vala:1708  msgid "Quit" -msgstr "" +msgstr "終了"  #. Button in error infobar to open preferences dialog and change scanner  #: ../src/ui.vala:1748 @@ -679,7 +691,7 @@ msgstr "スキャナを変更(_S)"  #. Combo box value for automatic paper size  #: ../src/ui.vala:1754  msgid "Automatic" -msgstr "" +msgstr "自動"  #: ../src/ui.vala:1804  msgid "Darker" @@ -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: 2014-09-23 06:40+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:35+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -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: 2014-09-23 06:40+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:35+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -575,7 +575,7 @@ msgstr "បញ្ច្រាស"  #. Label on button for cancelling page reordering dialog  #: ../src/ui.vala:1234  msgid "Keep unchanged" -msgstr "" +msgstr "រក្សាឱ្យមិនមានការផ្លាស់ប្តូរ"  #. Error message displayed when unable to launch help browser  #: ../src/ui.vala:1449 @@ -675,7 +675,7 @@ msgstr "ឯកសារ"  #: ../src/ui.vala:1697  msgid "Email..." -msgstr "" +msgstr "អ៊ីមេល..."  #: ../src/ui.vala:1698  msgid "Print..." @@ -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: 2014-09-23 06:40+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:35+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -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: 2014-09-23 06:40+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:35+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -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: 2014-09-23 06:40+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:35+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -616,7 +616,7 @@ msgstr "Vienkāršs dokumentu skenēšanas rīks"  msgid "translator-credits"  msgstr ""  "Launchpad Contributions:\n" -"  Jānis-Marks Gailis https://launchpad.net/~jeanmarc-gailis\n" +"  Jānis Marks Gailis https://launchpad.net/~jeanmarc-gailis\n"  "  Pēteris Krišjānis https://launchpad.net/~pecisk-gmail\n"  "  Rihards Pfeifle https://launchpad.net/~spr1nt3r\n"  "  Rūdolfs Mazurs https://launchpad.net/~rudolfs-mazurs" @@ -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: 2014-09-23 06:41+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:36+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -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: 2014-09-23 06:40+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:35+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -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: 2014-09-23 06:39+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:34+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -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: 2014-09-23 06:40+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:35+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -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: 2014-09-23 06:39+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:35+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -89,7 +89,7 @@ msgstr "Foto"  #. Title of dialog to reorder pages  #: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694  msgid "Reorder Pages" -msgstr "" +msgstr "Bladzijden herschikken"  #. Label on email menu item  #: ../data/simple-scan.ui.h:30 @@ -563,22 +563,22 @@ msgstr "Kan toepassing voor voorvertoning van afbeelding niet openen"  #. Label on button for combining sides in reordering dialog  #: ../src/ui.vala:1204  msgid "Combine sides" -msgstr "" +msgstr "Zijden samenvoegen"  #. Label on button for combining sides in reverse order in reordering dialog  #: ../src/ui.vala:1214  msgid "Combine sides (reverse)" -msgstr "" +msgstr "Zijden samenvoegen (omgekeerd)"  #. Label on button for reversing in reordering dialog  #: ../src/ui.vala:1224  msgid "Reverse" -msgstr "" +msgstr "Omgekeerd"  #. Label on button for cancelling page reordering dialog  #: ../src/ui.vala:1234  msgid "Keep unchanged" -msgstr "" +msgstr "Onveranderd laten"  #. Error message displayed when unable to launch help browser  #: ../src/ui.vala:1449 @@ -636,6 +636,7 @@ msgstr ""  "  Joren Laschet https://launchpad.net/~laschet\n"  "  Martijn Bastiaan https://launchpad.net/~hmb1\n"  "  Michaël Van Dorpe https://launchpad.net/~michael-vandorpe\n" +"  Pjotr12345 https://launchpad.net/~computertip\n"  "  Rachid https://launchpad.net/~rachidbm\n"  "  René Devers https://launchpad.net/~rene-devers\n"  "  Robert Ancell https://launchpad.net/~robert-ancell\n" @@ -645,7 +646,7 @@ msgstr ""  "  Tino Meinen https://launchpad.net/~a-t-meinen\n"  "  Wouter Bolsterlee https://launchpad.net/~uws\n"  "  cumulus007 https://launchpad.net/~cumulus-007\n" -"  kay https://launchpad.net/~kay20\n" +"  kay van der Zander https://launchpad.net/~kay20\n"  "  rob https://launchpad.net/~rvdb"  #. Text in dialog warning when a document is about to be lost @@ -684,31 +685,31 @@ msgstr "%d dpi"  #: ../src/ui.vala:1688  msgid "New Document" -msgstr "" +msgstr "Nieuw document"  #: ../src/ui.vala:1693  msgid "Document" -msgstr "" +msgstr "Document"  #: ../src/ui.vala:1697  msgid "Email..." -msgstr "" +msgstr "E-mail..."  #: ../src/ui.vala:1698  msgid "Print..." -msgstr "" +msgstr "Afdrukken..."  #: ../src/ui.vala:1706  msgid "Help" -msgstr "" +msgstr "Hulp"  #: ../src/ui.vala:1707  msgid "About" -msgstr "" +msgstr "Over"  #: ../src/ui.vala:1708  msgid "Quit" -msgstr "" +msgstr "Afsluiten"  #. Button in error infobar to open preferences dialog and change scanner  #: ../src/ui.vala:1748 @@ -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: 2014-09-23 06:40+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:35+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -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: 2014-09-23 06:40+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:35+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -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: 2014-09-23 06:40+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:35+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -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: 2014-09-23 06:40+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:35+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 diff --git a/po/pt_BR.po b/po/pt_BR.po index 8adc6cd..8c75c0a 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: 2014-09-23 06:40+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:36+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -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: 2014-09-23 06:40+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:35+0000\n" +"X-Generator: Launchpad (build 17211)\n"  "Language: ro\n"  #. Button to submit authorization dialog @@ -9,13 +9,13 @@ msgstr ""  "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"  "POT-Creation-Date: 2014-08-18 17:31+1200\n"  "PO-Revision-Date: 2014-07-10 05:43+0000\n" -"Last-Translator: Jay ZDLin <Unknown>\n" +"Last-Translator: ☠Jay ZDLin☠ <Unknown>\n"  "Language-Team: Russian <ru@li.org>\n"  "MIME-Version: 1.0\n"  "Content-Type: text/plain; charset=UTF-8\n"  "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-09-23 06:40+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:35+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -631,7 +631,6 @@ msgstr ""  "  Igor Zubarev https://launchpad.net/~igor.zubarev\n"  "  Int https://launchpad.net/~howrudoin\n"  "  Ivan Bulychev https://launchpad.net/~vanyok\n" -"  Jay ZDLin https://launchpad.net/~black-buddha666\n"  "  KEIII https://launchpad.net/~cashagent\n"  "  Net4Hack https://launchpad.net/~networkforhackers\n"  "  Novichkov Alexander https://launchpad.net/~berkut\n" @@ -646,7 +645,8 @@ msgstr ""  "  Vitaly Zawullon Katraev https://launchpad.net/~zawullon\n"  "  evilzipik https://launchpad.net/~evilzipik\n"  "  vasilisc https://launchpad.net/~vasilisc\n" -"  Илья Калитко https://launchpad.net/~kalitko-ilya007" +"  Илья Калитко https://launchpad.net/~kalitko-ilya007\n" +"  ☠Jay ZDLin☠ https://launchpad.net/~black-buddha666"  #. Text in dialog warning when a document is about to be lost  #: ../src/ui.vala:1507 @@ -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: 2014-09-23 06:40+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:36+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -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: 2014-09-23 06:40+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:36+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -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: 2014-09-23 06:40+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:35+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -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: 2014-09-23 06:40+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:35+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -621,6 +621,7 @@ msgstr ""  "  Alessio Treglia https://launchpad.net/~quadrispro\n"  "  Laco Gubík https://launchpad.net/~laco\n"  "  Pavol Klačanský https://launchpad.net/~pavolzetor\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 @@ -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: 2014-09-23 06:40+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:35+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -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: 2014-09-23 06:39+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:34+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -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: 2014-09-23 06:40+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:35+0000\n" +"X-Generator: Launchpad (build 17211)\n"  "Language: sr\n"  #. Button to submit authorization dialog @@ -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: 2014-09-23 06:40+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:36+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -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: 2014-09-23 06:40+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:36+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -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: 2014-09-23 06:40+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:36+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -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: 2014-09-23 06:40+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:36+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -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: 2014-09-23 06:40+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:36+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -94,7 +94,7 @@ msgstr ""  #. Label on email menu item  #: ../data/simple-scan.ui.h:30  msgid "_Email" -msgstr "_Eposta" +msgstr "_E-posta"  #. Page menu (contains action for each page, e.g. delete, crop)  #: ../data/simple-scan.ui.h:32 @@ -634,6 +634,7 @@ msgstr ""  "  Murat Bişkin https://launchpad.net/~muratbiskin\n"  "  Mustafa Yılmaz https://launchpad.net/~apshalasha\n"  "  Robert Ancell https://launchpad.net/~robert-ancell\n" +"  Volkan Gezer https://launchpad.net/~volkangezer\n"  "  Yalçın Can https://launchpad.net/~yalcin.can\n"  "  aries https://launchpad.net/~sonagirbas\n"  "  kulkke https://launchpad.net/~kulkke\n" @@ -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: 2014-09-23 06:40+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:36+0000\n" +"X-Generator: Launchpad (build 17211)\n"  "X-Poedit-Language: Uighur\n"  "X-Poedit-SourceCharset: utf-8\n" @@ -92,7 +92,7 @@ msgstr "سۈرەت"  #. Title of dialog to reorder pages  #: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694  msgid "Reorder Pages" -msgstr "" +msgstr "بەتلەرنى قايتا تىزىش"  #. Label on email menu item  #: ../data/simple-scan.ui.h:30 @@ -558,12 +558,12 @@ msgstr "رەسىمنى ئالدىن كۆرۈش پروگراممىسىنى قوز  #. Label on button for combining sides in reordering dialog  #: ../src/ui.vala:1204  msgid "Combine sides" -msgstr "" +msgstr "تەرەپلەرنى بىرىكتۈرۈش"  #. Label on button for combining sides in reverse order in reordering dialog  #: ../src/ui.vala:1214  msgid "Combine sides (reverse)" -msgstr "" +msgstr "تەرەپلەرنى بىرىكتۈرۈش(ئەسكىچە)"  #. Label on button for reversing in reordering dialog  #: ../src/ui.vala:1224 @@ -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: 2014-09-23 06:40+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:36+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -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: 2014-09-23 06:40+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:36+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -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: 2014-09-23 06:40+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:36+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -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: 2014-09-23 06:40+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:36+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 diff --git a/po/zh_CN.po b/po/zh_CN.po index 75b2fdf..d8fc112 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: 2014-09-23 06:41+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:36+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 diff --git a/po/zh_TW.po b/po/zh_TW.po index 3bf2804..8586ff7 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: 2014-09-23 06:41+0000\n" -"X-Generator: Launchpad (build 17196)\n" +"X-Launchpad-Export-Date: 2014-11-04 06:36+0000\n" +"X-Generator: Launchpad (build 17211)\n"  #. Button to submit authorization dialog  #: ../data/simple-scan.ui.h:2 @@ -2982,132 +2982,122 @@ void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError  		gchar* _tmp12_ = NULL;  		gchar* _tmp13_ = NULL;  		gchar* _tmp14_ = NULL; -		gchar* _tmp15_ = NULL; -		gchar** _tmp16_ = NULL; +		gchar** _tmp15_ = NULL;  		gint keys_length1 = 0;  		gint _keys_size_ = 0;  		gchar** values = NULL; -		gint _tmp17_ = 0; -		gchar* _tmp18_ = NULL; +		gint _tmp16_ = 0; +		gchar* _tmp17_ = NULL; +		gint _tmp18_ = 0;  		gchar* _tmp19_ = NULL;  		gint _tmp20_ = 0;  		gchar* _tmp21_ = NULL; -		gint _tmp22_ = 0; +		const gchar* _tmp22_ = NULL;  		gchar* _tmp23_ = NULL; -		const gchar* _tmp24_ = NULL; -		gchar* _tmp25_ = NULL; -		gchar** _tmp26_ = NULL; +		gchar** _tmp24_ = NULL;  		gint values_length1 = 0;  		gint _values_size_ = 0; -		const gchar* _tmp27_ = NULL; -		PixbufWriter* _tmp30_ = NULL; -		GdkPixbuf* _tmp31_ = NULL; -		gchar** _tmp32_ = NULL; -		gint _tmp32__length1 = 0; -		gchar** _tmp33_ = NULL; -		gint _tmp33__length1 = 0; -#line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -		_tmp11_ = g_strdup ("quality"); -#line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -		_tmp12_ = g_strdup ("density-unit"); +		const gchar* _tmp25_ = NULL; +		PixbufWriter* _tmp28_ = NULL; +		GdkPixbuf* _tmp29_ = NULL; +		gchar** _tmp30_ = NULL; +		gint _tmp30__length1 = 0; +		gchar** _tmp31_ = NULL; +		gint _tmp31__length1 = 0;  #line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -		_tmp13_ = g_strdup ("x-density"); +		_tmp11_ = g_strdup ("x-dpi");  #line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -		_tmp14_ = g_strdup ("y-density"); +		_tmp12_ = g_strdup ("y-dpi");  #line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -		_tmp15_ = g_strdup ("icc-profile"); +		_tmp13_ = g_strdup ("quality");  #line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -		_tmp16_ = g_new0 (gchar*, 6 + 1); +		_tmp14_ = g_strdup ("icc-profile");  #line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -		_tmp16_[0] = _tmp11_; +		_tmp15_ = g_new0 (gchar*, 5 + 1);  #line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -		_tmp16_[1] = _tmp12_; +		_tmp15_[0] = _tmp11_;  #line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -		_tmp16_[2] = _tmp13_; +		_tmp15_[1] = _tmp12_;  #line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -		_tmp16_[3] = _tmp14_; +		_tmp15_[2] = _tmp13_;  #line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -		_tmp16_[4] = _tmp15_; +		_tmp15_[3] = _tmp14_;  #line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -		_tmp16_[5] = NULL; +		_tmp15_[4] = NULL;  #line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -		keys = _tmp16_; +		keys = _tmp15_;  #line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -		keys_length1 = 6; +		keys_length1 = 5;  #line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		_keys_size_ = keys_length1;  #line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -		_tmp17_ = quality; -#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -		_tmp18_ = g_strdup_printf ("%d", _tmp17_); +		_tmp16_ = self->priv->_dpi;  #line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -		_tmp19_ = g_strdup ("dots-per-inch"); +		_tmp17_ = g_strdup_printf ("%d", _tmp16_);  #line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -		_tmp20_ = self->priv->_dpi; -#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -		_tmp21_ = g_strdup_printf ("%d", _tmp20_); +		_tmp18_ = self->priv->_dpi;  #line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -		_tmp22_ = self->priv->_dpi; +		_tmp19_ = g_strdup_printf ("%d", _tmp18_);  #line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -		_tmp23_ = g_strdup_printf ("%d", _tmp22_); +		_tmp20_ = quality;  #line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -		_tmp24_ = icc_profile_data; +		_tmp21_ = g_strdup_printf ("%d", _tmp20_);  #line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -		_tmp25_ = g_strdup (_tmp24_); +		_tmp22_ = icc_profile_data;  #line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -		_tmp26_ = g_new0 (gchar*, 6 + 1); +		_tmp23_ = g_strdup (_tmp22_);  #line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -		_tmp26_[0] = _tmp18_; +		_tmp24_ = g_new0 (gchar*, 5 + 1);  #line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -		_tmp26_[1] = _tmp19_; +		_tmp24_[0] = _tmp17_;  #line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -		_tmp26_[2] = _tmp21_; +		_tmp24_[1] = _tmp19_;  #line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -		_tmp26_[3] = _tmp23_; +		_tmp24_[2] = _tmp21_;  #line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -		_tmp26_[4] = _tmp25_; +		_tmp24_[3] = _tmp23_;  #line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -		_tmp26_[5] = NULL; +		_tmp24_[4] = NULL;  #line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -		values = _tmp26_; +		values = _tmp24_;  #line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -		values_length1 = 6; +		values_length1 = 5;  #line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		_values_size_ = values_length1;  #line 667 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -		_tmp27_ = icc_profile_data; +		_tmp25_ = icc_profile_data;  #line 667 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -		if (_tmp27_ == NULL) { -#line 3082 "page.c" -			gchar** _tmp28_ = NULL; -			gint _tmp28__length1 = 0; -			gchar* _tmp29_ = NULL; +		if (_tmp25_ == NULL) { +#line 3072 "page.c" +			gchar** _tmp26_ = NULL; +			gint _tmp26__length1 = 0; +			gchar* _tmp27_ = NULL;  #line 668 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -			_tmp28_ = keys; +			_tmp26_ = keys;  #line 668 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -			_tmp28__length1 = keys_length1; +			_tmp26__length1 = keys_length1;  #line 668 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -			_g_free0 (_tmp28_[4]); +			_g_free0 (_tmp26_[3]);  #line 668 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -			_tmp28_[4] = NULL; +			_tmp26_[3] = NULL;  #line 668 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -			_tmp29_ = _tmp28_[4]; -#line 3096 "page.c" +			_tmp27_ = _tmp26_[3]; +#line 3086 "page.c"  		}  #line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -		_tmp30_ = writer; +		_tmp28_ = writer;  #line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -		_tmp31_ = image; +		_tmp29_ = image;  #line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -		_tmp32_ = keys; +		_tmp30_ = keys;  #line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -		_tmp32__length1 = keys_length1; +		_tmp30__length1 = keys_length1;  #line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -		_tmp33_ = values; +		_tmp31_ = values;  #line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -		_tmp33__length1 = values_length1; +		_tmp31__length1 = values_length1;  #line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -		pixbuf_writer_save (_tmp30_, _tmp31_, "jpeg", _tmp32_, _tmp32__length1, _tmp33_, _tmp33__length1, &_inner_error_); +		pixbuf_writer_save (_tmp28_, _tmp29_, "jpeg", _tmp30_, _tmp30__length1, _tmp31_, _tmp31__length1, &_inner_error_);  #line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		if (_inner_error_ != NULL) {  #line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala" @@ -3126,108 +3116,134 @@ void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError  			_g_object_unref0 (stream);  #line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  			return; -#line 3130 "page.c" +#line 3120 "page.c"  		}  #line 663 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);  #line 663 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL); -#line 3136 "page.c" +#line 3126 "page.c"  	} else { -		GCompareFunc _tmp34_ = NULL; -		const gchar* _tmp35_ = NULL; -		gint _tmp36_ = 0; +		GCompareFunc _tmp32_ = NULL; +		const gchar* _tmp33_ = NULL; +		gint _tmp34_ = 0;  #line 671 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -		_tmp34_ = g_strcmp0; +		_tmp32_ = g_strcmp0;  #line 671 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -		_tmp35_ = type; +		_tmp33_ = type;  #line 671 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -		_tmp36_ = _tmp34_ (_tmp35_, "png"); +		_tmp34_ = _tmp32_ (_tmp33_, "png");  #line 671 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -		if (_tmp36_ == 0) { -#line 3149 "page.c" +		if (_tmp34_ == 0) { +#line 3139 "page.c"  			gchar** keys = NULL; +			gchar* _tmp35_ = NULL; +			gchar* _tmp36_ = NULL;  			gchar* _tmp37_ = NULL;  			gchar** _tmp38_ = NULL;  			gint keys_length1 = 0;  			gint _keys_size_ = 0;  			gchar** values = NULL; -			const gchar* _tmp39_ = NULL; +			gint _tmp39_ = 0;  			gchar* _tmp40_ = NULL; -			gchar** _tmp41_ = NULL; +			gint _tmp41_ = 0; +			gchar* _tmp42_ = NULL; +			const gchar* _tmp43_ = NULL; +			gchar* _tmp44_ = NULL; +			gchar** _tmp45_ = NULL;  			gint values_length1 = 0;  			gint _values_size_ = 0; -			const gchar* _tmp42_ = NULL; -			PixbufWriter* _tmp45_ = NULL; -			GdkPixbuf* _tmp46_ = NULL; -			gchar** _tmp47_ = NULL; -			gint _tmp47__length1 = 0; -			gchar** _tmp48_ = NULL; -			gint _tmp48__length1 = 0; +			const gchar* _tmp46_ = NULL; +			PixbufWriter* _tmp49_ = NULL; +			GdkPixbuf* _tmp50_ = NULL; +			gchar** _tmp51_ = NULL; +			gint _tmp51__length1 = 0; +			gchar** _tmp52_ = NULL; +			gint _tmp52__length1 = 0; +#line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala" +			_tmp35_ = g_strdup ("x-dpi"); +#line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala" +			_tmp36_ = g_strdup ("y-dpi");  #line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  			_tmp37_ = g_strdup ("icc-profile");  #line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -			_tmp38_ = g_new0 (gchar*, 2 + 1); +			_tmp38_ = g_new0 (gchar*, 4 + 1);  #line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -			_tmp38_[0] = _tmp37_; +			_tmp38_[0] = _tmp35_;  #line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -			_tmp38_[1] = NULL; +			_tmp38_[1] = _tmp36_; +#line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala" +			_tmp38_[2] = _tmp37_; +#line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala" +			_tmp38_[3] = NULL;  #line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  			keys = _tmp38_;  #line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -			keys_length1 = 2; +			keys_length1 = 4;  #line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  			_keys_size_ = keys_length1;  #line 674 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -			_tmp39_ = icc_profile_data; +			_tmp39_ = self->priv->_dpi; +#line 674 "/home/bob/bzr/simple-scan/trunk/src/page.vala" +			_tmp40_ = g_strdup_printf ("%d", _tmp39_); +#line 674 "/home/bob/bzr/simple-scan/trunk/src/page.vala" +			_tmp41_ = self->priv->_dpi; +#line 674 "/home/bob/bzr/simple-scan/trunk/src/page.vala" +			_tmp42_ = g_strdup_printf ("%d", _tmp41_);  #line 674 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -			_tmp40_ = g_strdup (_tmp39_); +			_tmp43_ = icc_profile_data;  #line 674 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -			_tmp41_ = g_new0 (gchar*, 2 + 1); +			_tmp44_ = g_strdup (_tmp43_);  #line 674 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -			_tmp41_[0] = _tmp40_; +			_tmp45_ = g_new0 (gchar*, 4 + 1);  #line 674 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -			_tmp41_[1] = NULL; +			_tmp45_[0] = _tmp40_;  #line 674 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -			values = _tmp41_; +			_tmp45_[1] = _tmp42_;  #line 674 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -			values_length1 = 2; +			_tmp45_[2] = _tmp44_; +#line 674 "/home/bob/bzr/simple-scan/trunk/src/page.vala" +			_tmp45_[3] = NULL; +#line 674 "/home/bob/bzr/simple-scan/trunk/src/page.vala" +			values = _tmp45_; +#line 674 "/home/bob/bzr/simple-scan/trunk/src/page.vala" +			values_length1 = 4;  #line 674 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  			_values_size_ = values_length1;  #line 675 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -			_tmp42_ = icc_profile_data; +			_tmp46_ = icc_profile_data;  #line 675 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -			if (_tmp42_ == NULL) { -#line 3202 "page.c" -				gchar** _tmp43_ = NULL; -				gint _tmp43__length1 = 0; -				gchar* _tmp44_ = NULL; +			if (_tmp46_ == NULL) { +#line 3218 "page.c" +				gchar** _tmp47_ = NULL; +				gint _tmp47__length1 = 0; +				gchar* _tmp48_ = NULL;  #line 676 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -				_tmp43_ = keys; +				_tmp47_ = keys;  #line 676 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -				_tmp43__length1 = keys_length1; +				_tmp47__length1 = keys_length1;  #line 676 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -				_g_free0 (_tmp43_[0]); +				_g_free0 (_tmp47_[2]);  #line 676 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -				_tmp43_[0] = NULL; +				_tmp47_[2] = NULL;  #line 676 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -				_tmp44_ = _tmp43_[0]; -#line 3216 "page.c" +				_tmp48_ = _tmp47_[2]; +#line 3232 "page.c"  			}  #line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -			_tmp45_ = writer; +			_tmp49_ = writer;  #line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -			_tmp46_ = image; +			_tmp50_ = image;  #line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -			_tmp47_ = keys; +			_tmp51_ = keys;  #line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -			_tmp47__length1 = keys_length1; +			_tmp51__length1 = keys_length1;  #line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -			_tmp48_ = values; +			_tmp52_ = values;  #line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -			_tmp48__length1 = values_length1; +			_tmp52__length1 = values_length1;  #line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -			pixbuf_writer_save (_tmp45_, _tmp46_, "png", _tmp47_, _tmp47__length1, _tmp48_, _tmp48__length1, &_inner_error_); +			pixbuf_writer_save (_tmp49_, _tmp50_, "png", _tmp51_, _tmp51__length1, _tmp52_, _tmp52__length1, &_inner_error_);  #line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  			if (_inner_error_ != NULL) {  #line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala" @@ -3246,118 +3262,144 @@ void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError  				_g_object_unref0 (stream);  #line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  				return; -#line 3250 "page.c" +#line 3266 "page.c"  			}  #line 671 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  			values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);  #line 671 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  			keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL); -#line 3256 "page.c" +#line 3272 "page.c"  		} else { -			GCompareFunc _tmp49_ = NULL; -			const gchar* _tmp50_ = NULL; -			gint _tmp51_ = 0; +			GCompareFunc _tmp53_ = NULL; +			const gchar* _tmp54_ = NULL; +			gint _tmp55_ = 0;  #line 679 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -			_tmp49_ = g_strcmp0; +			_tmp53_ = g_strcmp0;  #line 679 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -			_tmp50_ = type; +			_tmp54_ = type;  #line 679 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -			_tmp51_ = _tmp49_ (_tmp50_, "tiff"); +			_tmp55_ = _tmp53_ (_tmp54_, "tiff");  #line 679 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -			if (_tmp51_ == 0) { -#line 3269 "page.c" +			if (_tmp55_ == 0) { +#line 3285 "page.c"  				gchar** keys = NULL; -				gchar* _tmp52_ = NULL; -				gchar* _tmp53_ = NULL; -				gchar** _tmp54_ = NULL; +				gchar* _tmp56_ = NULL; +				gchar* _tmp57_ = NULL; +				gchar* _tmp58_ = NULL; +				gchar* _tmp59_ = NULL; +				gchar** _tmp60_ = NULL;  				gint keys_length1 = 0;  				gint _keys_size_ = 0;  				gchar** values = NULL; -				gchar* _tmp55_ = NULL; -				const gchar* _tmp56_ = NULL; -				gchar* _tmp57_ = NULL; -				gchar** _tmp58_ = NULL; +				gint _tmp61_ = 0; +				gchar* _tmp62_ = NULL; +				gint _tmp63_ = 0; +				gchar* _tmp64_ = NULL; +				gchar* _tmp65_ = NULL; +				const gchar* _tmp66_ = NULL; +				gchar* _tmp67_ = NULL; +				gchar** _tmp68_ = NULL;  				gint values_length1 = 0;  				gint _values_size_ = 0; -				const gchar* _tmp59_ = NULL; -				PixbufWriter* _tmp62_ = NULL; -				GdkPixbuf* _tmp63_ = NULL; -				gchar** _tmp64_ = NULL; -				gint _tmp64__length1 = 0; -				gchar** _tmp65_ = NULL; -				gint _tmp65__length1 = 0; +				const gchar* _tmp69_ = NULL; +				PixbufWriter* _tmp72_ = NULL; +				GdkPixbuf* _tmp73_ = NULL; +				gchar** _tmp74_ = NULL; +				gint _tmp74__length1 = 0; +				gchar** _tmp75_ = NULL; +				gint _tmp75__length1 = 0; +#line 681 "/home/bob/bzr/simple-scan/trunk/src/page.vala" +				_tmp56_ = g_strdup ("x-dpi"); +#line 681 "/home/bob/bzr/simple-scan/trunk/src/page.vala" +				_tmp57_ = g_strdup ("y-dpi"); +#line 681 "/home/bob/bzr/simple-scan/trunk/src/page.vala" +				_tmp58_ = g_strdup ("compression"); +#line 681 "/home/bob/bzr/simple-scan/trunk/src/page.vala" +				_tmp59_ = g_strdup ("icc-profile");  #line 681 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -				_tmp52_ = g_strdup ("compression"); +				_tmp60_ = g_new0 (gchar*, 5 + 1);  #line 681 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -				_tmp53_ = g_strdup ("icc-profile"); +				_tmp60_[0] = _tmp56_;  #line 681 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -				_tmp54_ = g_new0 (gchar*, 3 + 1); +				_tmp60_[1] = _tmp57_;  #line 681 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -				_tmp54_[0] = _tmp52_; +				_tmp60_[2] = _tmp58_;  #line 681 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -				_tmp54_[1] = _tmp53_; +				_tmp60_[3] = _tmp59_;  #line 681 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -				_tmp54_[2] = NULL; +				_tmp60_[4] = NULL;  #line 681 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -				keys = _tmp54_; +				keys = _tmp60_;  #line 681 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -				keys_length1 = 3; +				keys_length1 = 5;  #line 681 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  				_keys_size_ = keys_length1;  #line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -				_tmp55_ = g_strdup ("8"); +				_tmp61_ = self->priv->_dpi;  #line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -				_tmp56_ = icc_profile_data; +				_tmp62_ = g_strdup_printf ("%d", _tmp61_);  #line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -				_tmp57_ = g_strdup (_tmp56_); +				_tmp63_ = self->priv->_dpi;  #line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -				_tmp58_ = g_new0 (gchar*, 3 + 1); +				_tmp64_ = g_strdup_printf ("%d", _tmp63_);  #line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -				_tmp58_[0] = _tmp55_; +				_tmp65_ = g_strdup ("8");  #line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -				_tmp58_[1] = _tmp57_; +				_tmp66_ = icc_profile_data;  #line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -				_tmp58_[2] = NULL; +				_tmp67_ = g_strdup (_tmp66_);  #line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -				values = _tmp58_; +				_tmp68_ = g_new0 (gchar*, 5 + 1);  #line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -				values_length1 = 3; +				_tmp68_[0] = _tmp62_; +#line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala" +				_tmp68_[1] = _tmp64_; +#line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala" +				_tmp68_[2] = _tmp65_; +#line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala" +				_tmp68_[3] = _tmp67_; +#line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala" +				_tmp68_[4] = NULL; +#line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala" +				values = _tmp68_; +#line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala" +				values_length1 = 5;  #line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  				_values_size_ = values_length1;  #line 683 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -				_tmp59_ = icc_profile_data; +				_tmp69_ = icc_profile_data;  #line 683 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -				if (_tmp59_ == NULL) { -#line 3332 "page.c" -					gchar** _tmp60_ = NULL; -					gint _tmp60__length1 = 0; -					gchar* _tmp61_ = NULL; +				if (_tmp69_ == NULL) { +#line 3374 "page.c" +					gchar** _tmp70_ = NULL; +					gint _tmp70__length1 = 0; +					gchar* _tmp71_ = NULL;  #line 684 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -					_tmp60_ = keys; +					_tmp70_ = keys;  #line 684 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -					_tmp60__length1 = keys_length1; +					_tmp70__length1 = keys_length1;  #line 684 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -					_g_free0 (_tmp60_[1]); +					_g_free0 (_tmp70_[3]);  #line 684 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -					_tmp60_[1] = NULL; +					_tmp70_[3] = NULL;  #line 684 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -					_tmp61_ = _tmp60_[1]; -#line 3346 "page.c" +					_tmp71_ = _tmp70_[3]; +#line 3388 "page.c"  				}  #line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -				_tmp62_ = writer; +				_tmp72_ = writer;  #line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -				_tmp63_ = image; +				_tmp73_ = image;  #line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -				_tmp64_ = keys; +				_tmp74_ = keys;  #line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -				_tmp64__length1 = keys_length1; +				_tmp74__length1 = keys_length1;  #line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -				_tmp65_ = values; +				_tmp75_ = values;  #line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -				_tmp65__length1 = values_length1; +				_tmp75__length1 = values_length1;  #line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala" -				pixbuf_writer_save (_tmp62_, _tmp63_, "tiff", _tmp64_, _tmp64__length1, _tmp65_, _tmp65__length1, &_inner_error_); +				pixbuf_writer_save (_tmp72_, _tmp73_, "tiff", _tmp74_, _tmp74__length1, _tmp75_, _tmp75__length1, &_inner_error_);  #line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  				if (_inner_error_ != NULL) {  #line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala" @@ -3376,13 +3418,13 @@ void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError  					_g_object_unref0 (stream);  #line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  					return; -#line 3380 "page.c" +#line 3422 "page.c"  				}  #line 679 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  				values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);  #line 679 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  				keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL); -#line 3386 "page.c" +#line 3428 "page.c"  			} else {  			}  		} @@ -3395,7 +3437,7 @@ void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError  	_pixbuf_writer_unref0 (writer);  #line 653 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	_g_object_unref0 (stream); -#line 3399 "page.c" +#line 3441 "page.c"  } @@ -3414,7 +3456,7 @@ gint page_get_width (Page* self) {  	if (_tmp2_ == SCAN_DIRECTION_TOP_TO_BOTTOM) {  #line 27 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		_tmp0_ = TRUE; -#line 3418 "page.c" +#line 3460 "page.c"  	} else {  		ScanDirection _tmp3_ = 0;  		ScanDirection _tmp4_ = 0; @@ -3424,11 +3466,11 @@ gint page_get_width (Page* self) {  		_tmp4_ = _tmp3_;  #line 27 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		_tmp0_ = _tmp4_ == SCAN_DIRECTION_BOTTOM_TO_TOP; -#line 3428 "page.c" +#line 3470 "page.c"  	}  #line 27 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	if (_tmp0_) { -#line 3432 "page.c" +#line 3474 "page.c"  		gint _tmp5_ = 0;  #line 28 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		_tmp5_ = self->priv->_scan_width; @@ -3436,7 +3478,7 @@ gint page_get_width (Page* self) {  		result = _tmp5_;  #line 28 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		return result; -#line 3440 "page.c" +#line 3482 "page.c"  	} else {  		gint _tmp6_ = 0;  #line 30 "/home/bob/bzr/simple-scan/trunk/src/page.vala" @@ -3445,7 +3487,7 @@ gint page_get_width (Page* self) {  		result = _tmp6_;  #line 30 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		return result; -#line 3449 "page.c" +#line 3491 "page.c"  	}  } @@ -3465,7 +3507,7 @@ gint page_get_height (Page* self) {  	if (_tmp2_ == SCAN_DIRECTION_TOP_TO_BOTTOM) {  #line 39 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		_tmp0_ = TRUE; -#line 3469 "page.c" +#line 3511 "page.c"  	} else {  		ScanDirection _tmp3_ = 0;  		ScanDirection _tmp4_ = 0; @@ -3475,11 +3517,11 @@ gint page_get_height (Page* self) {  		_tmp4_ = _tmp3_;  #line 39 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		_tmp0_ = _tmp4_ == SCAN_DIRECTION_BOTTOM_TO_TOP; -#line 3479 "page.c" +#line 3521 "page.c"  	}  #line 39 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	if (_tmp0_) { -#line 3483 "page.c" +#line 3525 "page.c"  		gint _tmp5_ = 0;  #line 40 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		_tmp5_ = self->priv->_scan_height; @@ -3487,7 +3529,7 @@ gint page_get_height (Page* self) {  		result = _tmp5_;  #line 40 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		return result; -#line 3491 "page.c" +#line 3533 "page.c"  	} else {  		gint _tmp6_ = 0;  #line 42 "/home/bob/bzr/simple-scan/trunk/src/page.vala" @@ -3496,7 +3538,7 @@ gint page_get_height (Page* self) {  		result = _tmp6_;  #line 42 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		return result; -#line 3500 "page.c" +#line 3542 "page.c"  	}  } @@ -3521,7 +3563,7 @@ gboolean page_get_is_landscape (Page* self) {  	result = _tmp1_ > _tmp3_;  #line 47 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	return result; -#line 3525 "page.c" +#line 3567 "page.c"  } @@ -3536,7 +3578,7 @@ gint page_get_dpi (Page* self) {  	result = _tmp0_;  #line 50 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	return result; -#line 3540 "page.c" +#line 3582 "page.c"  } @@ -3548,7 +3590,7 @@ static void page_set_dpi (Page* self, gint value) {  	_tmp0_ = value;  #line 50 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	self->priv->_dpi = _tmp0_; -#line 3552 "page.c" +#line 3594 "page.c"  } @@ -3563,7 +3605,7 @@ gint page_get_depth (Page* self) {  	result = _tmp0_;  #line 56 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	return result; -#line 3567 "page.c" +#line 3609 "page.c"  } @@ -3575,7 +3617,7 @@ static void page_set_depth (Page* self, gint value) {  	_tmp0_ = value;  #line 56 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	self->priv->_depth = _tmp0_; -#line 3579 "page.c" +#line 3621 "page.c"  } @@ -3590,7 +3632,7 @@ const gchar* page_get_color_profile (Page* self) {  	result = _tmp0_;  #line 59 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	return result; -#line 3594 "page.c" +#line 3636 "page.c"  } @@ -3607,7 +3649,7 @@ void page_set_color_profile (Page* self, const gchar* value) {  	_g_free0 (self->priv->_color_profile);  #line 59 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	self->priv->_color_profile = _tmp1_; -#line 3611 "page.c" +#line 3653 "page.c"  } @@ -3622,7 +3664,7 @@ gint page_get_scan_width (Page* self) {  	result = _tmp0_;  #line 62 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	return result; -#line 3626 "page.c" +#line 3668 "page.c"  } @@ -3634,7 +3676,7 @@ static void page_set_scan_width (Page* self, gint value) {  	_tmp0_ = value;  #line 62 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	self->priv->_scan_width = _tmp0_; -#line 3638 "page.c" +#line 3680 "page.c"  } @@ -3649,7 +3691,7 @@ gint page_get_scan_height (Page* self) {  	result = _tmp0_;  #line 65 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	return result; -#line 3653 "page.c" +#line 3695 "page.c"  } @@ -3661,7 +3703,7 @@ static void page_set_scan_height (Page* self, gint value) {  	_tmp0_ = value;  #line 65 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	self->priv->_scan_height = _tmp0_; -#line 3665 "page.c" +#line 3707 "page.c"  } @@ -3676,7 +3718,7 @@ gint page_get_rowstride (Page* self) {  	result = _tmp0_;  #line 68 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	return result; -#line 3680 "page.c" +#line 3722 "page.c"  } @@ -3688,7 +3730,7 @@ static void page_set_rowstride (Page* self, gint value) {  	_tmp0_ = value;  #line 68 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	self->priv->_rowstride = _tmp0_; -#line 3692 "page.c" +#line 3734 "page.c"  } @@ -3703,7 +3745,7 @@ gint page_get_n_channels (Page* self) {  	result = _tmp0_;  #line 71 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	return result; -#line 3707 "page.c" +#line 3749 "page.c"  } @@ -3715,7 +3757,7 @@ static void page_set_n_channels (Page* self, gint value) {  	_tmp0_ = value;  #line 71 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	self->priv->_n_channels = _tmp0_; -#line 3719 "page.c" +#line 3761 "page.c"  } @@ -3730,7 +3772,7 @@ gboolean page_get_is_scanning (Page* self) {  	result = _tmp0_;  #line 77 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	return result; -#line 3734 "page.c" +#line 3776 "page.c"  } @@ -3742,7 +3784,7 @@ static void page_set_is_scanning (Page* self, gboolean value) {  	_tmp0_ = value;  #line 77 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	self->priv->_is_scanning = _tmp0_; -#line 3746 "page.c" +#line 3788 "page.c"  } @@ -3757,7 +3799,7 @@ gboolean page_get_has_data (Page* self) {  	result = _tmp0_;  #line 80 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	return result; -#line 3761 "page.c" +#line 3803 "page.c"  } @@ -3769,7 +3811,7 @@ static void page_set_has_data (Page* self, gboolean value) {  	_tmp0_ = value;  #line 80 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	self->priv->_has_data = _tmp0_; -#line 3773 "page.c" +#line 3815 "page.c"  } @@ -3784,7 +3826,7 @@ gint page_get_scan_line (Page* self) {  	result = _tmp0_;  #line 83 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	return result; -#line 3788 "page.c" +#line 3830 "page.c"  } @@ -3796,7 +3838,7 @@ static void page_set_scan_line (Page* self, gint value) {  	_tmp0_ = value;  #line 83 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	self->priv->_scan_line = _tmp0_; -#line 3800 "page.c" +#line 3842 "page.c"  } @@ -3811,7 +3853,7 @@ gboolean page_get_is_color (Page* self) {  	result = _tmp0_ > 1;  #line 86 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	return result; -#line 3815 "page.c" +#line 3857 "page.c"  } @@ -3826,7 +3868,7 @@ ScanDirection page_get_scan_direction (Page* self) {  	result = _tmp0_;  #line 92 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	return result; -#line 3830 "page.c" +#line 3872 "page.c"  } @@ -3853,7 +3895,7 @@ void page_set_scan_direction (Page* self, ScanDirection value) {  	if (_tmp0_ == _tmp1_) {  #line 97 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		return; -#line 3857 "page.c" +#line 3899 "page.c"  	}  #line 100 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	size_has_changed = FALSE; @@ -3867,13 +3909,13 @@ void page_set_scan_direction (Page* self, ScanDirection value) {  	_tmp4_ = left_steps;  #line 102 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	if (_tmp4_ < 0) { -#line 3871 "page.c" +#line 3913 "page.c"  		gint _tmp5_ = 0;  #line 103 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		_tmp5_ = left_steps;  #line 103 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		left_steps = _tmp5_ + 4; -#line 3877 "page.c" +#line 3919 "page.c"  	}  #line 104 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	_tmp6_ = left_steps; @@ -3881,13 +3923,13 @@ void page_set_scan_direction (Page* self, ScanDirection value) {  	if (_tmp6_ != 2) {  #line 105 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		size_has_changed = TRUE; -#line 3885 "page.c" +#line 3927 "page.c"  	}  #line 108 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	_tmp7_ = self->priv->_has_crop;  #line 108 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	if (_tmp7_) { -#line 3891 "page.c" +#line 3933 "page.c"  		gint _tmp8_ = 0;  #line 110 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		_tmp8_ = left_steps; @@ -3895,7 +3937,7 @@ void page_set_scan_direction (Page* self, ScanDirection value) {  		switch (_tmp8_) {  #line 110 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  			case 1: -#line 3899 "page.c" +#line 3941 "page.c"  			{  				gint t = 0;  				gint _tmp9_ = 0; @@ -3939,11 +3981,11 @@ void page_set_scan_direction (Page* self, ScanDirection value) {  				page_set_crop_height (self, _tmp17_);  #line 120 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  				break; -#line 3943 "page.c" +#line 3985 "page.c"  			}  #line 110 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  			case 2: -#line 3947 "page.c" +#line 3989 "page.c"  			{  				gint _tmp18_ = 0;  				gint _tmp19_ = 0; @@ -3975,11 +4017,11 @@ void page_set_scan_direction (Page* self, ScanDirection value) {  				page_set_crop_y (self, _tmp23_ - (_tmp24_ + _tmp25_));  #line 125 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  				break; -#line 3979 "page.c" +#line 4021 "page.c"  			}  #line 110 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  			case 3: -#line 3983 "page.c" +#line 4025 "page.c"  			{  				gint t = 0;  				gint _tmp26_ = 0; @@ -4023,12 +4065,12 @@ void page_set_scan_direction (Page* self, ScanDirection value) {  				page_set_crop_height (self, _tmp34_);  #line 134 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  				break; -#line 4027 "page.c" +#line 4069 "page.c"  			}  			default:  #line 110 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  			break; -#line 4032 "page.c" +#line 4074 "page.c"  		}  	}  #line 138 "/home/bob/bzr/simple-scan/trunk/src/page.vala" @@ -4041,7 +4083,7 @@ void page_set_scan_direction (Page* self, ScanDirection value) {  	if (_tmp36_) {  #line 140 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		g_signal_emit_by_name (self, "size-changed"); -#line 4045 "page.c" +#line 4087 "page.c"  	}  #line 141 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	g_signal_emit_by_name (self, "scan-direction-changed"); @@ -4051,7 +4093,7 @@ void page_set_scan_direction (Page* self, ScanDirection value) {  	if (_tmp37_) {  #line 143 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		g_signal_emit_by_name (self, "crop-changed"); -#line 4055 "page.c" +#line 4097 "page.c"  	}  } @@ -4067,7 +4109,7 @@ gboolean page_get_has_crop (Page* self) {  	result = _tmp0_;  #line 150 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	return result; -#line 4071 "page.c" +#line 4113 "page.c"  } @@ -4079,7 +4121,7 @@ static void page_set_has_crop (Page* self, gboolean value) {  	_tmp0_ = value;  #line 150 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	self->priv->_has_crop = _tmp0_; -#line 4083 "page.c" +#line 4125 "page.c"  } @@ -4094,7 +4136,7 @@ const gchar* page_get_crop_name (Page* self) {  	result = _tmp0_;  #line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	return result; -#line 4098 "page.c" +#line 4140 "page.c"  } @@ -4111,7 +4153,7 @@ static void page_set_crop_name (Page* self, const gchar* value) {  	_g_free0 (self->priv->_crop_name);  #line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	self->priv->_crop_name = _tmp1_; -#line 4115 "page.c" +#line 4157 "page.c"  } @@ -4126,7 +4168,7 @@ gint page_get_crop_x (Page* self) {  	result = _tmp0_;  #line 156 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	return result; -#line 4130 "page.c" +#line 4172 "page.c"  } @@ -4138,7 +4180,7 @@ static void page_set_crop_x (Page* self, gint value) {  	_tmp0_ = value;  #line 156 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	self->priv->_crop_x = _tmp0_; -#line 4142 "page.c" +#line 4184 "page.c"  } @@ -4153,7 +4195,7 @@ gint page_get_crop_y (Page* self) {  	result = _tmp0_;  #line 159 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	return result; -#line 4157 "page.c" +#line 4199 "page.c"  } @@ -4165,7 +4207,7 @@ static void page_set_crop_y (Page* self, gint value) {  	_tmp0_ = value;  #line 159 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	self->priv->_crop_y = _tmp0_; -#line 4169 "page.c" +#line 4211 "page.c"  } @@ -4180,7 +4222,7 @@ gint page_get_crop_width (Page* self) {  	result = _tmp0_;  #line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	return result; -#line 4184 "page.c" +#line 4226 "page.c"  } @@ -4192,7 +4234,7 @@ static void page_set_crop_width (Page* self, gint value) {  	_tmp0_ = value;  #line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	self->priv->_crop_width = _tmp0_; -#line 4196 "page.c" +#line 4238 "page.c"  } @@ -4207,7 +4249,7 @@ gint page_get_crop_height (Page* self) {  	result = _tmp0_;  #line 165 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	return result; -#line 4211 "page.c" +#line 4253 "page.c"  } @@ -4219,14 +4261,14 @@ static void page_set_crop_height (Page* self, gint value) {  	_tmp0_ = value;  #line 165 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	self->priv->_crop_height = _tmp0_; -#line 4223 "page.c" +#line 4265 "page.c"  }  static void value_page_init (GValue* value) {  #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	value->data[0].v_pointer = NULL; -#line 4230 "page.c" +#line 4272 "page.c"  } @@ -4235,7 +4277,7 @@ static void value_page_free_value (GValue* value) {  	if (value->data[0].v_pointer) {  #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		page_unref (value->data[0].v_pointer); -#line 4239 "page.c" +#line 4281 "page.c"  	}  } @@ -4245,11 +4287,11 @@ static void value_page_copy_value (const GValue* src_value, GValue* dest_value)  	if (src_value->data[0].v_pointer) {  #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		dest_value->data[0].v_pointer = page_ref (src_value->data[0].v_pointer); -#line 4249 "page.c" +#line 4291 "page.c"  	} else {  #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		dest_value->data[0].v_pointer = NULL; -#line 4253 "page.c" +#line 4295 "page.c"  	}  } @@ -4257,37 +4299,37 @@ static void value_page_copy_value (const GValue* src_value, GValue* dest_value)  static gpointer value_page_peek_pointer (const GValue* value) {  #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	return value->data[0].v_pointer; -#line 4261 "page.c" +#line 4303 "page.c"  }  static gchar* value_page_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {  #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	if (collect_values[0].v_pointer) { -#line 4268 "page.c" +#line 4310 "page.c"  		Page* object;  		object = collect_values[0].v_pointer;  #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		if (object->parent_instance.g_class == NULL) {  #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 4275 "page.c" +#line 4317 "page.c"  		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {  #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 4279 "page.c" +#line 4321 "page.c"  		}  #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		value->data[0].v_pointer = page_ref (object); -#line 4283 "page.c" +#line 4325 "page.c"  	} else {  #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		value->data[0].v_pointer = NULL; -#line 4287 "page.c" +#line 4329 "page.c"  	}  #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	return NULL; -#line 4291 "page.c" +#line 4333 "page.c"  } @@ -4298,25 +4340,25 @@ static gchar* value_page_lcopy_value (const GValue* value, guint n_collect_value  	if (!object_p) {  #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 4302 "page.c" +#line 4344 "page.c"  	}  #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	if (!value->data[0].v_pointer) {  #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		*object_p = NULL; -#line 4308 "page.c" +#line 4350 "page.c"  	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {  #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		*object_p = value->data[0].v_pointer; -#line 4312 "page.c" +#line 4354 "page.c"  	} else {  #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		*object_p = page_ref (value->data[0].v_pointer); -#line 4316 "page.c" +#line 4358 "page.c"  	}  #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	return NULL; -#line 4320 "page.c" +#line 4362 "page.c"  } @@ -4330,7 +4372,7 @@ GParamSpec* param_spec_page (const gchar* name, const gchar* nick, const gchar*  	G_PARAM_SPEC (spec)->value_type = object_type;  #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	return G_PARAM_SPEC (spec); -#line 4334 "page.c" +#line 4376 "page.c"  } @@ -4339,7 +4381,7 @@ gpointer value_get_page (const GValue* value) {  	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PAGE), NULL);  #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	return value->data[0].v_pointer; -#line 4343 "page.c" +#line 4385 "page.c"  } @@ -4359,17 +4401,17 @@ void value_set_page (GValue* value, gpointer v_object) {  		value->data[0].v_pointer = v_object;  #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		page_ref (value->data[0].v_pointer); -#line 4363 "page.c" +#line 4405 "page.c"  	} else {  #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		value->data[0].v_pointer = NULL; -#line 4367 "page.c" +#line 4409 "page.c"  	}  #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	if (old) {  #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		page_unref (old); -#line 4373 "page.c" +#line 4415 "page.c"  	}  } @@ -4388,17 +4430,17 @@ void value_take_page (GValue* value, gpointer v_object) {  		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));  #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		value->data[0].v_pointer = v_object; -#line 4392 "page.c" +#line 4434 "page.c"  	} else {  #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		value->data[0].v_pointer = NULL; -#line 4396 "page.c" +#line 4438 "page.c"  	}  #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	if (old) {  #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		page_unref (old); -#line 4402 "page.c" +#line 4444 "page.c"  	}  } @@ -4422,7 +4464,7 @@ static void page_class_init (PageClass * klass) {  	g_signal_new ("crop_changed", TYPE_PAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);  #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	g_signal_new ("scan_finished", TYPE_PAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 4426 "page.c" +#line 4468 "page.c"  } @@ -4431,7 +4473,7 @@ static void page_instance_init (Page * self) {  	self->priv = PAGE_GET_PRIVATE (self);  #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	self->ref_count = 1; -#line 4435 "page.c" +#line 4477 "page.c"  } @@ -4445,7 +4487,7 @@ static void page_finalize (Page* obj) {  	self->priv->pixels = (g_free (self->priv->pixels), NULL);  #line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	_g_free0 (self->priv->_crop_name); -#line 4449 "page.c" +#line 4491 "page.c"  } @@ -4470,7 +4512,7 @@ gpointer page_ref (gpointer instance) {  	g_atomic_int_inc (&self->ref_count);  #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	return instance; -#line 4474 "page.c" +#line 4516 "page.c"  } @@ -4483,7 +4525,7 @@ void page_unref (gpointer instance) {  		PAGE_GET_CLASS (self)->finalize (self);  #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		g_type_free_instance ((GTypeInstance *) self); -#line 4487 "page.c" +#line 4529 "page.c"  	}  } @@ -4506,14 +4548,14 @@ PixbufWriter* pixbuf_writer_construct (GType object_type, GFileOutputStream* str  	self->stream = _tmp1_;  #line 696 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	return self; -#line 4510 "page.c" +#line 4552 "page.c"  }  PixbufWriter* pixbuf_writer_new (GFileOutputStream* stream) {  #line 696 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	return pixbuf_writer_construct (TYPE_PIXBUF_WRITER, stream); -#line 4517 "page.c" +#line 4559 "page.c"  } @@ -4522,7 +4564,7 @@ static gboolean _pixbuf_writer_write_pixbuf_data_gdk_pixbuf_save_func (guint8* b  	result = pixbuf_writer_write_pixbuf_data ((PixbufWriter*) self, buf, buf_length1, error);  #line 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	return result; -#line 4526 "page.c" +#line 4568 "page.c"  } @@ -4560,7 +4602,7 @@ void pixbuf_writer_save (PixbufWriter* self, GdkPixbuf* image, const gchar* type  		g_propagate_error (error, _inner_error_);  #line 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		return; -#line 4564 "page.c" +#line 4606 "page.c"  	}  } @@ -4587,20 +4629,20 @@ static gboolean pixbuf_writer_write_pixbuf_data (PixbufWriter* self, guint8* buf  		g_propagate_error (error, _inner_error_);  #line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		return FALSE; -#line 4591 "page.c" +#line 4633 "page.c"  	}  #line 709 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	result = TRUE;  #line 709 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	return result; -#line 4597 "page.c" +#line 4639 "page.c"  }  static void value_pixbuf_writer_init (GValue* value) {  #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	value->data[0].v_pointer = NULL; -#line 4604 "page.c" +#line 4646 "page.c"  } @@ -4609,7 +4651,7 @@ static void value_pixbuf_writer_free_value (GValue* value) {  	if (value->data[0].v_pointer) {  #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		pixbuf_writer_unref (value->data[0].v_pointer); -#line 4613 "page.c" +#line 4655 "page.c"  	}  } @@ -4619,11 +4661,11 @@ static void value_pixbuf_writer_copy_value (const GValue* src_value, GValue* des  	if (src_value->data[0].v_pointer) {  #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		dest_value->data[0].v_pointer = pixbuf_writer_ref (src_value->data[0].v_pointer); -#line 4623 "page.c" +#line 4665 "page.c"  	} else {  #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		dest_value->data[0].v_pointer = NULL; -#line 4627 "page.c" +#line 4669 "page.c"  	}  } @@ -4631,37 +4673,37 @@ static void value_pixbuf_writer_copy_value (const GValue* src_value, GValue* des  static gpointer value_pixbuf_writer_peek_pointer (const GValue* value) {  #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	return value->data[0].v_pointer; -#line 4635 "page.c" +#line 4677 "page.c"  }  static gchar* value_pixbuf_writer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {  #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	if (collect_values[0].v_pointer) { -#line 4642 "page.c" +#line 4684 "page.c"  		PixbufWriter* object;  		object = collect_values[0].v_pointer;  #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		if (object->parent_instance.g_class == NULL) {  #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 4649 "page.c" +#line 4691 "page.c"  		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {  #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 4653 "page.c" +#line 4695 "page.c"  		}  #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		value->data[0].v_pointer = pixbuf_writer_ref (object); -#line 4657 "page.c" +#line 4699 "page.c"  	} else {  #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		value->data[0].v_pointer = NULL; -#line 4661 "page.c" +#line 4703 "page.c"  	}  #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	return NULL; -#line 4665 "page.c" +#line 4707 "page.c"  } @@ -4672,25 +4714,25 @@ static gchar* value_pixbuf_writer_lcopy_value (const GValue* value, guint n_coll  	if (!object_p) {  #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 4676 "page.c" +#line 4718 "page.c"  	}  #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	if (!value->data[0].v_pointer) {  #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		*object_p = NULL; -#line 4682 "page.c" +#line 4724 "page.c"  	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {  #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		*object_p = value->data[0].v_pointer; -#line 4686 "page.c" +#line 4728 "page.c"  	} else {  #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		*object_p = pixbuf_writer_ref (value->data[0].v_pointer); -#line 4690 "page.c" +#line 4732 "page.c"  	}  #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	return NULL; -#line 4694 "page.c" +#line 4736 "page.c"  } @@ -4704,7 +4746,7 @@ GParamSpec* param_spec_pixbuf_writer (const gchar* name, const gchar* nick, cons  	G_PARAM_SPEC (spec)->value_type = object_type;  #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	return G_PARAM_SPEC (spec); -#line 4708 "page.c" +#line 4750 "page.c"  } @@ -4713,7 +4755,7 @@ gpointer value_get_pixbuf_writer (const GValue* value) {  	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PIXBUF_WRITER), NULL);  #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	return value->data[0].v_pointer; -#line 4717 "page.c" +#line 4759 "page.c"  } @@ -4733,17 +4775,17 @@ void value_set_pixbuf_writer (GValue* value, gpointer v_object) {  		value->data[0].v_pointer = v_object;  #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		pixbuf_writer_ref (value->data[0].v_pointer); -#line 4737 "page.c" +#line 4779 "page.c"  	} else {  #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		value->data[0].v_pointer = NULL; -#line 4741 "page.c" +#line 4783 "page.c"  	}  #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	if (old) {  #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		pixbuf_writer_unref (old); -#line 4747 "page.c" +#line 4789 "page.c"  	}  } @@ -4762,17 +4804,17 @@ void value_take_pixbuf_writer (GValue* value, gpointer v_object) {  		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));  #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		value->data[0].v_pointer = v_object; -#line 4766 "page.c" +#line 4808 "page.c"  	} else {  #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		value->data[0].v_pointer = NULL; -#line 4770 "page.c" +#line 4812 "page.c"  	}  #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	if (old) {  #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		pixbuf_writer_unref (old); -#line 4776 "page.c" +#line 4818 "page.c"  	}  } @@ -4782,14 +4824,14 @@ static void pixbuf_writer_class_init (PixbufWriterClass * klass) {  	pixbuf_writer_parent_class = g_type_class_peek_parent (klass);  #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	PIXBUF_WRITER_CLASS (klass)->finalize = pixbuf_writer_finalize; -#line 4786 "page.c" +#line 4828 "page.c"  }  static void pixbuf_writer_instance_init (PixbufWriter * self) {  #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	self->ref_count = 1; -#line 4793 "page.c" +#line 4835 "page.c"  } @@ -4799,7 +4841,7 @@ static void pixbuf_writer_finalize (PixbufWriter* obj) {  	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PIXBUF_WRITER, PixbufWriter);  #line 694 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	_g_object_unref0 (self->stream); -#line 4803 "page.c" +#line 4845 "page.c"  } @@ -4824,7 +4866,7 @@ gpointer pixbuf_writer_ref (gpointer instance) {  	g_atomic_int_inc (&self->ref_count);  #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  	return instance; -#line 4828 "page.c" +#line 4870 "page.c"  } @@ -4837,7 +4879,7 @@ void pixbuf_writer_unref (gpointer instance) {  		PIXBUF_WRITER_GET_CLASS (self)->finalize (self);  #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"  		g_type_free_instance ((GTypeInstance *) self); -#line 4841 "page.c" +#line 4883 "page.c"  	}  } diff --git a/src/page.vala b/src/page.vala index b375723..7a086cd 100644 --- a/src/page.vala +++ b/src/page.vala @@ -662,26 +662,26 @@ public class Page          if (strcmp (type, "jpeg") == 0)          { -            string[] keys = { "quality", "density-unit", "x-density", "y-density", "icc-profile", null }; -            string[] values = { "%d".printf (quality), "dots-per-inch", "%d".printf (dpi), "%d".printf (dpi), icc_profile_data, null }; +            string[] keys = { "x-dpi", "y-dpi", "quality", "icc-profile", null }; +            string[] values = { "%d".printf (dpi), "%d".printf (dpi), "%d".printf (quality), icc_profile_data, null };              if (icc_profile_data == null) -                keys[4] = null; +                keys[3] = null;              writer.save (image, "jpeg", keys, values);          }          else if (strcmp (type, "png") == 0)          { -            string[] keys = { "icc-profile", null }; -            string[] values = { icc_profile_data, null }; +            string[] keys = { "x-dpi", "y-dpi", "icc-profile", null }; +            string[] values = { "%d".printf (dpi), "%d".printf (dpi), icc_profile_data, null };              if (icc_profile_data == null) -                keys[0] = null; +                keys[2] = null;              writer.save (image, "png", keys, values);          }          else if (strcmp (type, "tiff") == 0)          { -            string[] keys = { "compression", "icc-profile", null }; -            string[] values = { "8" /* Deflate compression */, icc_profile_data, null }; +            string[] keys = { "x-dpi", "y-dpi", "compression", "icc-profile", null }; +            string[] values = { "%d".printf (dpi), "%d".printf (dpi), "8" /* Deflate compression */, icc_profile_data, null };              if (icc_profile_data == null) -                keys[1] = null; +                keys[3] = null;              writer.save (image, "tiff", keys, values);          }          else | 
