Merge commit 'upstream/3.1.5'

6 files changed, 130 insertions, 250 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index d406905..c99f807 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -8,16 +8,16 @@ utilities_in_files = simple-scan.desktop.in
 utilities_DATA = $(utilities_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
-schemadir = @GCONF_SCHEMA_FILE_DIR@
-schema_in_files = simple-scan.schemas.in
-schema_DATA = $(schema_in_files:.schemas.in=.schemas)
-@INTLTOOL_SCHEMAS_RULE@
+gsettings_SCHEMAS = org.gnome.SimpleScan.gschema.xml
+@INTLTOOL_XML_NOMERGE_RULE@
+@GSETTINGS_RULES@
 
 man1_MANS = simple-scan.1
 
-EXTRA_DIST = $(ui_DATA) $(utilities_in_files) $(schema_in_files) $(man1_MANS)
+EXTRA_DIST = $(ui_DATA) $(utilities_in_files) org.gnome.SimpleScan.gschema.xml.in $(man1_MANS)
 
 DISTCLEANFILES = \
 	Makefile.in \
 	$(schema_DATA) \
-	$(utilities_DATA)
+	$(utilities_DATA) \
+	$(gsettings_SCHEMAS)
diff --git a/data/Makefile.in b/data/Makefile.in
index da951ec..7745f03 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -39,6 +39,7 @@ am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_GEN = $(am__v_GEN_$(V))
@@ -78,11 +79,11 @@ am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 man1dir = $(mandir)/man1
-am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(schemadir)" \
-	"$(DESTDIR)$(uidir)" "$(DESTDIR)$(utilitiesdir)"
+am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(uidir)" \
+	"$(DESTDIR)$(utilitiesdir)"
 NROFF = nroff
 MANS = $(man1_MANS)
-DATA = $(schema_DATA) $(ui_DATA) $(utilities_DATA)
+DATA = $(ui_DATA) $(utilities_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -128,6 +129,8 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+COLORD_CFLAGS = @COLORD_CFLAGS@
+COLORD_LIBS = @COLORD_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -142,11 +145,11 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 HELP_DIR = @HELP_DIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -186,6 +189,7 @@ SIMPLE_SCAN_CFLAGS = @SIMPLE_SCAN_CFLAGS@
 SIMPLE_SCAN_LIBS = @SIMPLE_SCAN_LIBS@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
+VALAC = @VALAC@
 VERSION = @VERSION@
 WARN_CFLAGS = @WARN_CFLAGS@
 XGETTEXT = @XGETTEXT@
@@ -207,6 +211,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
 host_alias = @host_alias@
 htmldir = @htmldir@
 includedir = @includedir@
@@ -237,15 +242,14 @@ ui_DATA = simple-scan.ui
 utilitiesdir = $(datadir)/applications
 utilities_in_files = simple-scan.desktop.in
 utilities_DATA = $(utilities_in_files:.desktop.in=.desktop)
-schemadir = @GCONF_SCHEMA_FILE_DIR@
-schema_in_files = simple-scan.schemas.in
-schema_DATA = $(schema_in_files:.schemas.in=.schemas)
+gsettings_SCHEMAS = org.gnome.SimpleScan.gschema.xml
 man1_MANS = simple-scan.1
-EXTRA_DIST = $(ui_DATA) $(utilities_in_files) $(schema_in_files) $(man1_MANS)
+EXTRA_DIST = $(ui_DATA) $(utilities_in_files) org.gnome.SimpleScan.gschema.xml.in $(man1_MANS)
 DISTCLEANFILES = \
 	Makefile.in \
 	$(schema_DATA) \
-	$(utilities_DATA)
+	$(utilities_DATA) \
+	$(gsettings_SCHEMAS)
 
 all: all-recursive
 
@@ -314,26 +318,6 @@ uninstall-man1:
 	test -z "$$files" || { \
 	  echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
 	  cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
-install-schemaDATA: $(schema_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)"
-	@list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(schemadir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(schemadir)" || exit $$?; \
-	done
-
-uninstall-schemaDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(schemadir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(schemadir)" && rm -f $$files
 install-uiDATA: $(ui_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)"
@@ -586,7 +570,7 @@ check: check-recursive
 all-am: Makefile $(MANS) $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(schemadir)" "$(DESTDIR)$(uidir)" "$(DESTDIR)$(utilitiesdir)"; do \
+	for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(uidir)" "$(DESTDIR)$(utilitiesdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
@@ -635,8 +619,7 @@ info: info-recursive
 
 info-am:
 
-install-data-am: install-man install-schemaDATA install-uiDATA \
-	install-utilitiesDATA
+install-data-am: install-man install-uiDATA install-utilitiesDATA
 
 install-dvi: install-dvi-recursive
 
@@ -680,8 +663,7 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-man uninstall-schemaDATA uninstall-uiDATA \
-	uninstall-utilitiesDATA
+uninstall-am: uninstall-man uninstall-uiDATA uninstall-utilitiesDATA
 
 uninstall-man: uninstall-man1
 
@@ -696,16 +678,16 @@ uninstall-man: uninstall-man1
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-man1 install-pdf install-pdf-am install-ps \
-	install-ps-am install-schemaDATA install-strip install-uiDATA \
+	install-ps-am install-strip install-uiDATA \
 	install-utilitiesDATA installcheck installcheck-am installdirs \
 	installdirs-am maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
 	tags-recursive uninstall uninstall-am uninstall-man \
-	uninstall-man1 uninstall-schemaDATA uninstall-uiDATA \
-	uninstall-utilitiesDATA
+	uninstall-man1 uninstall-uiDATA uninstall-utilitiesDATA
 
 @INTLTOOL_DESKTOP_RULE@
-@INTLTOOL_SCHEMAS_RULE@
+@INTLTOOL_XML_NOMERGE_RULE@
+@GSETTINGS_RULES@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/data/icons/Makefile.in b/data/icons/Makefile.in
index b60ce6c..415ccbd 100644
--- a/data/icons/Makefile.in
+++ b/data/icons/Makefile.in
@@ -38,6 +38,7 @@ am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_GEN = $(am__v_GEN_$(V))
@@ -60,6 +61,8 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+COLORD_CFLAGS = @COLORD_CFLAGS@
+COLORD_LIBS = @COLORD_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -74,11 +77,11 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 HELP_DIR = @HELP_DIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -118,6 +121,7 @@ SIMPLE_SCAN_CFLAGS = @SIMPLE_SCAN_CFLAGS@
 SIMPLE_SCAN_LIBS = @SIMPLE_SCAN_LIBS@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
+VALAC = @VALAC@
 VERSION = @VERSION@
 WARN_CFLAGS = @WARN_CFLAGS@
 XGETTEXT = @XGETTEXT@
@@ -139,6 +143,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
 host_alias = @host_alias@
 htmldir = @htmldir@
 includedir = @includedir@
diff --git a/data/org.gnome.SimpleScan.gschema.xml.in b/data/org.gnome.SimpleScan.gschema.xml.in
new file mode 100644
index 0000000..2a6047f
--- /dev/null
+++ b/data/org.gnome.SimpleScan.gschema.xml.in
@@ -0,0 +1,92 @@
+<schemalist>
+  <enum id="org.gnome.SimpleScan.ScanDirection">
+    <value value="0" nick="top-to-bottom"/>
+    <value value="1" nick="left-to-right"/>
+    <value value="2" nick="bottom-to-top"/>
+    <value value="3" nick="right-to-left"/>
+  </enum>
+  <enum id="org.gnome.SimpleScan.PageSide">
+    <value value="1" nick="front"/>
+    <value value="2" nick="back"/>
+    <value value="3" nick="both"/>
+  </enum>
+
+  <schema id="org.gnome.SimpleScan" path="/org/gnome/simple-scan/" gettext-domain="simple-scan">
+    <key name="window-width" type="i">
+      <default>600</default>
+      <_summary>Window width in pixels</_summary>
+    </key>
+    <key name="window-height" type="i">
+      <default>400</default>
+      <_summary>Window height in pixels</_summary>
+    </key>
+    <key name="window-is-maximized" type="b">
+      <default>false</default>
+      <_summary>TRUE if the application window is maximized</_summary>
+    </key>
+    <key name="selected-device" type="s">
+      <default>''</default>
+      <_summary>Device to scan from</_summary>
+      <_description>SANE device to acquire images from.</_description>
+    </key>
+    <key name="document-type" type="s">
+      <default>'photo'</default>
+      <choices>
+        <choice value="text"/>
+        <choice value="photo"/>
+      </choices>
+      <_summary>Type of document being scanned</_summary>
+      <_description>Type of document being scanned. This setting decides on the scan resolution, colors and post-processing.</_description>
+    </key>
+    <key name="scan-direction" enum="org.gnome.SimpleScan.ScanDirection">
+      <default>'top-to-bottom'</default>
+      <_summary>Direction of scan</_summary>
+      <_description>The direction of the scanner across the scanned page.</_description>
+    </key>
+    <key name="page-width" type="i">
+      <default>595</default>
+      <_summary>Width of scanned image in pixels</_summary>
+      <_description>The width of scanned image in pixels.  This value is updated to what the last scanned page was.</_description>
+    </key>
+    <key name="page-height" type="i">
+      <default>842</default>
+      <_summary>Height of scanned image in pixels</_summary>
+      <_description>The height of scanned image in pixels.  This value is updated to what the last scanned page was.</_description>
+    </key>
+    <key name="paper-width" type="i">
+      <default>0</default>
+      <_summary>Width of paper in tenths of a mm</_summary>
+      <_description>The width of the paper in tenths of a mm (or 0 for automatic paper detection).</_description>
+    </key>
+    <key name="paper-height" type="i">
+      <default>0</default>
+      <_summary>Height of paper in tenths of a mm</_summary>
+      <_description>The height of the paper in tenths of a mm (or 0 for automatic paper detection).</_description>
+    </key>
+    <key name="page-dpi" type="i">
+      <default>72</default>
+      <_summary>Resolution of last scanned image</_summary>
+      <_description>The resolution in dots-per-inch of the previously scanned image.</_description>
+    </key>
+    <key name="text-dpi" type="i">
+      <default>150</default>
+      <_summary>Resolution for text scans</_summary>
+      <_description>The resolution in dots-per-inch to use when scanning text.</_description>
+    </key>
+    <key name="photo-dpi" type="i">
+      <default>300</default>
+      <_summary>Resolution for photo scans</_summary>
+      <_description>The resolution in dots-per-inch to use when scanning photos.</_description>
+    </key>
+    <key name="page-side" enum="org.gnome.SimpleScan.PageSide">
+      <default>'both'</default>
+      <_summary>Page side to scan</_summary>
+      <_description>The page side to scan.</_description>
+    </key>
+    <key name="save-directory" type="s">
+      <default>''</default>
+      <_summary>Directory to save files to</_summary>
+      <_description>The directory to save files to.  Defaults to the documents directory if unset.</_description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/data/simple-scan.schemas.in b/data/simple-scan.schemas.in
deleted file mode 100644
index 1a5a90d..0000000
--- a/data/simple-scan.schemas.in
+++ /dev/null
@@ -1,199 +0,0 @@
-<gconfschemafile>
-  <schemalist>
-    <schema>
-      <applyto>/apps/simple-scan/window_width</applyto>
-      <key>/schemas/apps/simple-scan/window_width</key>
-      <owner>simple-scan</owner>
-      <type>int</type>
-      <default>600</default>
-      <locale name="C">
-        <short>Window width in pixels</short>
-      </locale>
-    </schema>
-    <schema>
-      <applyto>/apps/simple-scan/window_height</applyto>
-      <key>/schemas/apps/simple-scan/window_height</key>
-      <owner>simple-scan</owner>
-      <type>int</type>
-      <default>400</default>
-      <locale name="C">
-        <short>Window height in pixels</short>
-      </locale>
-    </schema>
-    <schema>
-      <applyto>/apps/simple-scan/window_is_maximized</applyto>
-      <key>/schemas/apps/simple-scan/window_is_maximized</key>
-      <owner>simple-scan</owner>
-      <type>bool</type>
-      <default>FALSE</default>
-      <locale name="C">
-        <short>TRUE if the application window is maximized</short>
-      </locale>
-    </schema>
-    <schema>
-      <applyto>/apps/simple-scan/selected_device</applyto>
-      <key>/schemas/apps/simple-scan/selected_device</key>
-      <owner>simple-scan</owner>
-      <type>string</type>
-      <default></default>
-      <locale name="C">
-        <short>Device to scan from</short>
-        <long>
-          SANE device to acquire images from.
-        </long>
-      </locale>
-    </schema>
-    <schema>
-      <applyto>/apps/simple-scan/document_type</applyto>
-      <key>/schemas/apps/simple-scan/document_type</key>
-      <owner>simple-scan</owner>
-      <type>string</type>
-      <default>photo</default>
-      <locale name="C">
-        <short>Type of document being scanned</short>
-        <long>
-          Type of document being scanned.
-	  'text' for text documents, 'photo' for photos.
-	  This setting decides on the scan resolution, colors and post-processing.
-        </long>
-      </locale>
-    </schema>
-    <schema>
-      <applyto>/apps/simple-scan/scan_direction</applyto>
-      <key>/schemas/apps/simple-scan/scan_direction</key>
-      <owner>simple-scan</owner>
-      <type>string</type>
-      <default>top-to-bottom</default>
-      <locale name="C">
-        <short>Direction of scan</short>
-        <long>
-	  The direction of the scanner across the scanned page. It can be one of the following:
-          'top-to-bottom'
-          'bottom-to-top'
-          'left-to-right'
-          'right-to-left'
-        </long>
-      </locale>
-    </schema>
-    <schema>
-      <applyto>/apps/simple-scan/page_width</applyto>
-      <key>/schemas/apps/simple-scan/page_width</key>
-      <owner>simple-scan</owner>
-      <type>int</type>
-      <default>595</default>
-      <locale name="C">
-        <short>Width of scanned image in pixels</short>
-        <long>
-      The width of scanned image in pixels.  This value is updated to what the last scanned page was.
-        </long>
-      </locale>
-    </schema>
-    <schema>
-      <applyto>/apps/simple-scan/page_height</applyto>
-      <key>/schemas/apps/simple-scan/page_height</key>
-      <owner>simple-scan</owner>
-      <type>int</type>
-      <default>842</default>
-      <locale name="C">
-        <short>Height of scanned image in pixels</short>
-        <long>
-      The height of scanned image in pixels.  This value is updated to what the last scanned page was.
-        </long>
-      </locale>
-    </schema>
-    <schema>
-      <applyto>/apps/simple-scan/paper_width</applyto>
-      <key>/schemas/apps/simple-scan/paper_width</key>
-      <owner>simple-scan</owner>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-        <short>Width of paper in tenths of a mm</short>
-        <long>
-      The width of the paper in tenths of a mm (or 0 for automatic paper detection).
-        </long>
-      </locale>
-    </schema>
-    <schema>
-      <applyto>/apps/simple-scan/paper_height</applyto>
-      <key>/schemas/apps/simple-scan/paper_height</key>
-      <owner>simple-scan</owner>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-        <short>Height of paper in tenths of a mm</short>
-        <long>
-      The height of the paper in tenths of a mm (or 0 for automatic paper detection).
-        </long>
-      </locale>
-    </schema>
-    <schema>
-      <applyto>/apps/simple-scan/page_dpi</applyto>
-      <key>/schemas/apps/simple-scan/page_dpi</key>
-      <owner>simple-scan</owner>
-      <type>int</type>
-      <default>72</default>
-      <locale name="C">
-        <short>Resolution of last scanned image</short>
-        <long>
-      The resolution in dots-per-inch of the previously scanned image.
-        </long>
-      </locale>
-    </schema>
-    <schema>
-      <applyto>/apps/simple-scan/text_dpi</applyto>
-      <key>/schemas/apps/simple-scan/text_dpi</key>
-      <owner>simple-scan</owner>
-      <type>int</type>
-      <default>150</default>
-      <locale name="C">
-        <short>Resolution for text scans</short>
-        <long>
-        The resolution in dots-per-inch to use when scanning text.
-        </long>
-      </locale>
-    </schema>
-    <schema>
-      <applyto>/apps/simple-scan/photo_dpi</applyto>
-      <key>/schemas/apps/simple-scan/photo_dpi</key>
-      <owner>simple-scan</owner>
-      <type>int</type>
-      <default>300</default>
-      <locale name="C">
-        <short>Resolution for photo scans</short>
-        <long>
-        The resolution in dots-per-inch to use when scanning photos.
-        </long>
-      </locale>
-    </schema>
-    <schema>
-      <applyto>/apps/simple-scan/page_side</applyto>
-      <key>/schemas/apps/simple-scan/page_side</key>
-      <owner>simple-scan</owner>
-      <type>string</type>
-      <default>both</default>
-      <locale name="C">
-        <short>Page side to scan</short>
-        <long>
-        The page side to scan. It can be one of the following:
-          'both'
-          'front'
-          'back'
-        </long>
-      </locale>
-    </schema>
-    <schema>
-      <applyto>/apps/simple-scan/save_directory</applyto>
-      <key>/schemas/apps/simple-scan/save_directory</key>
-      <owner>simple-scan</owner>
-      <type>string</type>
-      <default></default>
-      <locale name="C">
-        <short>Directory to save files to</short>
-        <long>
-        The directory to save files to.  Defaults to the documents directory if unset.
-        </long>
-      </locale>
-    </schema>
-  </schemalist>
-</gconfschemafile>
diff --git a/data/simple-scan.ui b/data/simple-scan.ui
index 7dcd2d7..102a7a8 100644
--- a/data/simple-scan.ui
+++ b/data/simple-scan.ui
@@ -924,21 +924,21 @@
   <object class="GtkListStore" id="page_side_store">
     <columns>
       <!-- column-name side -->
-      <column type="gchararray"/>
+      <column type="gint"/>
       <!-- column-name label -->
       <column type="gchararray"/>
     </columns>
     <data>
       <row>
-        <col id="0">both</col>
+        <col id="0">3</col>
         <col id="1" translatable="yes" comments="Combo box label for scanning both sides of a page">Front and Back</col>
       </row>
       <row>
-        <col id="0">front</col>
+        <col id="0">1</col>
         <col id="1" translatable="yes" comments="Combo box label for scanning the front side of a page">Front</col>
       </row>
       <row>
-        <col id="0">back</col>
+        <col id="0">2</col>
         <col id="1" translatable="yes" comments="Combo box label for scanning the back side of a page">Back</col>
       </row>
     </data>