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



commit 04f274f2d936db8bb0b881f32e46722d0c17cc9c
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Sat Oct 5 14:46:49 2013 -0500

    Rely on intltool >=0.50 for gsettings translation

 configure.ac                                       |    2 +-
 data/Makefile.am                                   |    9 +++------
 ...hema.xml.in => org.gnome.lightsoff.gschema.xml} |    4 ++--
 po/POTFILES.in                                     |    2 +-
 4 files changed, 7 insertions(+), 10 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 783d28c..3815eec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,7 @@ dnl ###########################################################################
 dnl Internationalization
 dnl ###########################################################################
 
-IT_PROG_INTLTOOL([0.35.0])
+IT_PROG_INTLTOOL([0.50])
 AC_SUBST(GETTEXT_PACKAGE, lightsoff)
 
 dnl ###########################################################################
diff --git a/data/Makefile.am b/data/Makefile.am
index ba7be71..4d08c34 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -9,9 +9,7 @@ lightsoff_DATA = \
        on.svg \
        highlight.svg
 
-gsettings_in_file = org.gnome.lightsoff.gschema.xml.in
-gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
- INTLTOOL_XML_NOMERGE_RULE@
+gsettings_SCHEMAS = org.gnome.lightsoff.gschema.xml
 @GSETTINGS_RULES@
 
 desktop_in_files = lightsoff.desktop.in
@@ -22,13 +20,12 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 appdatadir = $(datadir)/appdata
 appdata_DATA = lightsoff.appdata.xml
 
-CLEANFILES = $(desktop_DATA) $(gsettings_SCHEMAS)
-DISTCLEANFILES = $(gsettings_SCHEMAS)
+CLEANFILES = $(desktop_DATA)
 
 EXTRA_DIST = \
        $(appdata_DATA) \
        $(lightsoff_DATA) \
-       $(gsettings_in_file) \
+       $(gsettings_SCHEMAS) \
        $(desktop_in_files)
 
 check-local: $(appdata_DATA) $(desktop_DATA)
diff --git a/data/org.gnome.lightsoff.gschema.xml.in b/data/org.gnome.lightsoff.gschema.xml
similarity index 61%
rename from data/org.gnome.lightsoff.gschema.xml.in
rename to data/org.gnome.lightsoff.gschema.xml
index b29fe1a..9666f49 100644
--- a/data/org.gnome.lightsoff.gschema.xml.in
+++ b/data/org.gnome.lightsoff.gschema.xml
@@ -2,8 +2,8 @@
   <schema id="org.gnome.lightsoff" path="/org/gnome/lightsoff/">
     <key name="level" type="i">
       <default>1</default>
-      <_summary>The current level</_summary>
-      <_description>The users's most recent level.</_description>
+      <summary>The current level</summary>
+      <description>The users's most recent level.</description>
     </key>
   </schema>
 </schemalist>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 74c622a..2b45998 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,7 +2,7 @@
 # Please keep this file in alphabetical order.
 [encoding: UTF-8]
 data/lightsoff.desktop.in
-data/org.gnome.lightsoff.gschema.xml.in
+data/org.gnome.lightsoff.gschema.xml
 src/board-view.vala
 src/game-view.vala
 src/led-array.vala


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