Merge commit 'upstream/3.1.5'

1 files changed, 0 insertions, 199 deletions

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>