[iagno] Rely on intltool >= 0.50 for gsettings translation



commit 365a0be08bc0f6257d01752c7567b8fbb48ea017
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Sat Oct 5 10:12:54 2013 -0500

    Rely on intltool >= 0.50 for gsettings translation

 configure.ac                                       |    2 +-
 data/Makefile.am                                   |    9 +++------
 ....gschema.xml.in => org.gnome.iagno.gschema.xml} |   12 ++++++------
 po/POTFILES.in                                     |    2 +-
 4 files changed, 11 insertions(+), 14 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 2af354e..c9b1a00 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@ dnl ###########################################################################
 dnl Internationalization
 dnl ###########################################################################
 
-IT_PROG_INTLTOOL([0.35.0])
+IT_PROG_INTLTOOL([0.50])
 AC_SUBST(GETTEXT_PACKAGE, iagno)
 
 dnl ###########################################################################
diff --git a/data/Makefile.am b/data/Makefile.am
index 4f70edd..1303335 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -27,9 +27,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 appdatadir = $(datadir)/appdata
 appdata_files = iagno.appdata.xml
 
-gsettings_in_file = org.gnome.iagno.gschema.xml.in
-gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
- INTLTOOL_XML_NOMERGE_RULE@
+gsettings_SCHEMAS = org.gnome.iagno.gschema.xml
 @GSETTINGS_RULES@
 
 man_MANS = iagno.6
@@ -40,11 +38,10 @@ EXTRA_DIST = \
        $(sounds_DATA) \
        $(appdata_files) \
        $(desktop_in_files) \
-       $(gsettings_in_file) \
+       $(gsettings_SCHEMAS) \
        $(man_MANS)
 
-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.iagno.gschema.xml.in b/data/org.gnome.iagno.gschema.xml
similarity index 74%
rename from data/org.gnome.iagno.gschema.xml.in
rename to data/org.gnome.iagno.gschema.xml
index 24d9ad2..c45d462 100644
--- a/data/org.gnome.iagno.gschema.xml.in
+++ b/data/org.gnome.iagno.gschema.xml
@@ -19,24 +19,24 @@
     </key>
     <key name="sound" type="b">
       <default>true</default>
-      <_summary>Sound</_summary>
-      <_description>Whether or not to play event sounds.</_description>
+      <summary>Sound</summary>
+      <description>Whether or not to play event sounds.</description>
     </key>
     <key name="window-width" type="i">
       <default>600</default>
-      <_summary>Width of the window in pixels</_summary>
+      <summary>Width of the window in pixels</summary>
     </key>
     <key name="window-height" type="i">
       <default>400</default>
-      <_summary>Height of the window in pixels</_summary>
+      <summary>Height of the window in pixels</summary>
     </key>
     <key name="window-is-maximized" type="b">
       <default>false</default>
-      <_summary>true if the window is maximized</_summary>
+      <summary>true if the window is maximized</summary>
     </key>
     <key name="window-is-fullscreen" type="b">
       <default>false</default>
-      <_summary>true if the window is fullscren</_summary>
+      <summary>true if the window is fullscren</summary>
     </key>
   </schema>
 </schemalist>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5cc1e83..ec6698c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,7 +3,7 @@
 [encoding: UTF-8]
 data/iagno.desktop.in
 [type: gettext/glade]data/iagno.ui
-data/org.gnome.iagno.gschema.xml.in
+data/org.gnome.iagno.gschema.xml
 src/computer-player.vala
 src/game.vala
 src/game-view.vala


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]