[cheese] Depend on intltool 0.50 for GSettings translations

[David King <davidk src gnome org>]

commit 55622b2b3e398d5a93f153536ed567db1687c43a
Author: David King <amigadave amigadave com>
Date:   Mon Jun 4 21:31:49 2012 +0100

    Depend on intltool 0.50 for GSettings translations

 .gitignore                           |    2 +-
 Makefile.am                          |    7 +-
 configure.ac                         |    3 +-
 data/org.gnome.Cheese.gschema.xml    |  129 +++++++++++++++++++++++++
 data/org.gnome.Cheese.gschema.xml.in |  172 ----------------------------------
 po/POTFILES.in                       |    2 +-
 6 files changed, 134 insertions(+), 181 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d734900..786a6b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,7 +22,6 @@ Makefile.in*
 /data/cheese-gtk.pc
 /data/cheese.pc
 /data/org.gnome.Cheese.service
-/data/org.gnome.Cheese.gschema.xml
 /data/org.gnome.Cheese.gschema.valid
 /docs/reference/html/
 /docs/reference/xml/
@@ -42,6 +41,7 @@ Makefile.in*
 /docs/reference/version.xml
 /help/*/*.mo
 /help/*/*.page
+/help/*/*.stamp
 !/help/C
 /libcheese/cheese-enums.*
 /m4/
diff --git a/Makefile.am b/Makefile.am
index 0bfb6b9..c14ac3e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -288,9 +288,7 @@ desktopdir = $(datadir)/applications
 desktop_in_files = data/cheese.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
- INTLTOOL_XML_NOMERGE_RULE@
-gsettings_in_file = data/org.gnome.Cheese.gschema.xml.in
-gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
+gsettings_SCHEMAS = data/org.gnome.Cheese.gschema.xml
 @GSETTINGS_RULES@
 
 dist_pkgdata_DATA = \
@@ -502,7 +500,7 @@ dist-hook: git-changelog-hook
 dist_noinst_DATA = \
 	ChangeLog.pre-git \
 	$(desktop_in_files) \
-	$(gsettings_in_file) \
+	$(gsettings_SCHEMAS) \
 	$(service_in_files) \
 	$(gtkdoc_srcdir)/cheese-docs.xml \
 	$(gtkdoc_srcdir)/cheese-sections.txt \
@@ -527,7 +525,6 @@ dist_noinst_SCRIPTS = \
 
 CLEANFILES = \
 	$(desktop_DATA) \
-	$(gsettings_SCHEMAS) \
 	$(pkgconfig_DATA) \
 	$(enum_data) \
 	$(gir_DATA) \
diff --git a/configure.ac b/configure.ac
index 39b3c74..ec7e6c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,8 +49,7 @@ AC_SUBST([LIBCHEESE_GTK_LT_VERSION], [22:4:1])
 #*******************************************************************************
 AC_SUBST([GETTEXT_PACKAGE], [$PACKAGE_TARNAME])
 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [GETTEXT package name])
-
-IT_PROG_INTLTOOL([0.40.0])
+IT_PROG_INTLTOOL([0.50.0])
 
 #*******************************************************************************
 # Check required libraries
diff --git a/data/org.gnome.Cheese.gschema.xml b/data/org.gnome.Cheese.gschema.xml
new file mode 100644
index 0000000..7dbb7ad
--- /dev/null
+++ b/data/org.gnome.Cheese.gschema.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist>
+  <schema path='/apps/cheese/' id='org.gnome.Cheese'>
+    <key type='b' name='countdown'>
+      <summary>Use a countdown</summary>
+      <description>Set to true to show a countdown before taking a photo</description>
+      <default>true</default>
+    </key>
+
+    <key type='i' name='countdown-duration'>
+      <summary>Countdown length</summary>
+      <description>The duration of the countdown before taking a photo, in seconds</description>
+      <default>3</default>
+      <range min='1' max='10'/>
+    </key>
+
+    <key type='b' name='flash'>
+      <summary>Fire flash before taking a picture</summary>
+      <description>Set to true to fire a flash when taking a picture</description>
+      <default>true</default>
+    </key>
+
+    <key type='s' name='camera'>
+      <summary>Camera device string indicator</summary>
+      <description>The path to the device node which points to the camera, for example /dev/video0</description>
+      <default>''</default>
+    </key>
+
+    <key type='s' name='selected-effect'>
+      <summary>Last selected effect</summary>
+      <description>Name of the installed effect that was selected last</description>
+      <default>'identity'</default>
+    </key>
+
+    <key type='i' name='photo-x-resolution'>
+      <summary>Photo width</summary>
+      <description>The width of the image captured from the camera, in pixels</description>
+      <default>0</default>
+      <range min='0' max='65535'/>
+    </key>
+
+    <key type='i' name='photo-y-resolution'>
+      <summary>Photo height</summary>
+      <description>The height of the image captured from the camera, in pixels</description>
+      <default>0</default>
+      <range min='0' max='65535'/>
+    </key>
+
+    <key type='i' name='video-x-resolution'>
+      <summary>Video width</summary>
+      <description>The width of the video captured from the camera, in pixels</description>
+      <default>0</default>
+      <range min='0' max='65535'/>
+    </key>
+
+    <key type='i' name='video-y-resolution'>
+      <summary>Video height</summary>
+      <description>The height of the video captured from the camera, in pixels</description>
+      <default>0</default>
+      <range min='0' max='65535'/>
+    </key>
+
+    <key type='d' name='brightness'>
+      <summary>Picture brightness</summary>
+      <description>Adjusts the brightness of the picture coming from the camera</description>
+      <default>0</default>
+      <range min='-1' max='1'/>
+    </key>
+
+    <key type='d' name='contrast'>
+      <summary>Picture contrast</summary>
+      <description>Adjusts the contrast of the picture coming from the camera</description>
+      <default>1.0</default>
+      <range min='0' max='2'/>
+    </key>
+
+    <key type='d' name='saturation'>
+      <summary>Picture saturation</summary>
+      <description>Adjusts the saturation of the picture coming from the camera</description>
+      <default>1</default>
+      <range min='0' max='2'/>
+    </key>
+
+    <key type='d' name='hue'>
+      <summary>Picture hue</summary>
+      <description>Adjusts the hue (color tint) of the picture coming from the camera</description>
+      <default>0</default>
+      <range min='-1' max='1'/>
+    </key>
+
+    <key type='s' name='video-path'>
+      <summary>Video Path</summary>
+      <description>Defines the path where the videos are stored. If empty, "XDG_VIDEO/Webcam" will be used.</description>
+      <default>''</default>
+    </key>
+
+    <key type='s' name='photo-path'>
+      <summary>Photo Path</summary>
+      <description>Defines the path where the photos are stored. If empty, "XDG_PHOTO/Webcam" will be used.</description>
+      <default>''</default>
+    </key>
+
+    <key type='b' name='wide-mode'>
+      <summary>Whether to start in wide mode</summary>
+      <description>If set to true, Cheese will start up in wide mode, with the image collection placed on the right-hand side. Useful with small screens.</description>
+      <default>false</default>
+    </key>
+
+    <key type='b' name='fullscreen'>
+      <summary>Whether to start in fullscreen</summary>
+      <description>If set to true, Cheese will start up in fullscreen mode.</description>
+      <default>false</default>
+    </key>
+
+    <key type='i' name='burst-delay'>
+      <summary>Time between photos in burst mode</summary>
+      <description>The length of time, in milliseconds, to delay between taking each photo in a burst sequence of photos. If the burst delay is less than the countdown duration, the countdown duration will be used instead.</description>
+      <default>1000</default>
+      <range min='500' max='10000'/>
+    </key>
+
+     <key type='i' name='burst-repeat'>
+      <summary>Number of photos in burst mode</summary>
+      <description>The number of photos to take in a single burst.</description>
+      <default>4</default>
+      <range min='1' max='100000'/>
+    </key>
+  </schema>
+</schemalist>
\ No newline at end of file
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b2a5804..87b6567 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -7,7 +7,7 @@
 [type: gettext/glade]data/cheese-prefs.ui
 [type: gettext/glade]data/cheese-prefs.ui
 data/cheese.desktop.in.in
-data/org.gnome.Cheese.gschema.xml.in
+data/org.gnome.Cheese.gschema.xml
 libcheese/cheese-avatar-chooser.c
 libcheese/cheese-camera-device.c
 libcheese/cheese-camera.c