[tali] Rely on intltool >=0.50 for gsettings translations

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 107026dbf3e950b1c0028b906f17c39b88e7d81c
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Sun Oct 6 10:32:20 2013 -0500

    Rely on intltool >=0.50 for gsettings translations

 configure.ac                                       |    2 +-
 data/Makefile.am                                   |    9 +++------
 ...i.gschema.xml.in => org.gnome.tali.gschema.xml} |    8 ++++----
 po/POTFILES.in                                     |    2 +-
 4 files changed, 9 insertions(+), 12 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ad9cdb9..9d2959e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,7 +73,7 @@ dnl ###########################################################################
 dnl Internationalization
 dnl ###########################################################################
 
-IT_PROG_INTLTOOL([0.35.0])
+IT_PROG_INTLTOOL([0.50])
 AC_SUBST(GETTEXT_PACKAGE, tali)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [The gettext package name])
 
diff --git a/data/Makefile.am b/data/Makefile.am
index 485082d..bfed12e 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -17,9 +17,7 @@ pixmap_DATA = \
        kismet6.svg \
        kismet-none.svg
 
-gsettings_in_file = org.gnome.tali.gschema.xml.in
-gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
- INTLTOOL_XML_NOMERGE_RULE@
+gsettings_SCHEMAS = org.gnome.tali.gschema.xml
 @GSETTINGS_RULES@
 
 man_MANS = tali.6
@@ -35,12 +33,11 @@ appdata_DATA = tali.appdata.xml
 EXTRA_DIST = \
        $(appdata_DATA) \
        $(desktop_in_files) \
-       $(gsettings_in_file) \
+       $(gsettings_SCHEMAS) \
        $(man_MANS) \
        $(pixmap_DATA)
 
-CLEANFILES = $(desktop_DATA) $(gsettings_SCHEMAS)
-DISTCLEANFILES = $(gsettings_SCHEMAS)
+CLEANFILES = $(desktop_DATA)
 
 check-local: $(appdata_DATA) $(desktop_DATA)
        $(APPDATA_VALIDATE) $(appdata_DATA)
diff --git a/data/org.gnome.tali.gschema.xml.in b/data/org.gnome.tali.gschema.xml
similarity index 70%
rename from data/org.gnome.tali.gschema.xml.in
rename to data/org.gnome.tali.gschema.xml
index 2cd0375..be5dcd1 100644
--- a/data/org.gnome.tali.gschema.xml.in
+++ b/data/org.gnome.tali.gschema.xml
@@ -8,13 +8,13 @@
     </key>
     <key name="delay-between-rolls" type="b">
       <default>false</default>
-      <_summary>Delay between rolls</_summary>
-      <_description>Choose whether or not to insert a delay between the computer's dice rolls so the player 
can follow what it is doing.</_description>
+      <summary>Delay between rolls</summary>
+      <description>Choose whether or not to insert a delay between the computer's dice rolls so the player 
can follow what it is doing.</description>
     </key>
     <key name="display-computer-thoughts" type="b">
       <default>false</default>
-      <_summary>Display the computer's thoughts</_summary>
-      <_description>If set to true, a dump of the AI's working will be done to standard 
output.</_description>
+      <summary>Display the computer's thoughts</summary>
+      <description>If set to true, a dump of the AI's working will be done to standard output.</description>
     </key>
     <key name="player-names" type="as">
       <default l10n="messages" context="PlayerNames">[ 'Human', 'Wilber', 'Bill', 'Monica', 'Kenneth', 
'Janet' ]</default>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9ae820a..8b10d63 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,7 +2,7 @@
 # Please keep this file in alphabetical order.
 [encoding: UTF-8]
 data/gtali.desktop.in
-data/org.gnome.tali.gschema.xml.in
+data/org.gnome.tali.gschema.xml
 src/clist.c
 src/games-scores-dialog.c
 src/games-stock.c