[five-or-more] Rely on intltool >0.50 for gsettings translation



commit 386688dc8f85dca1a9106d82ecde67154745e78d
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Sat Oct 5 09:28:44 2013 -0500

    Rely on intltool >0.50 for gsettings translation

 configure.ac                               |    2 +-
 data/Makefile.am                           |    9 ++---
 data/org.gnome.five-or-more.gschema.xml    |   55 ++++++++++++++++++++++++++++
 data/org.gnome.five-or-more.gschema.xml.in |   55 ----------------------------
 po/POTFILES.in                             |    2 +-
 5 files changed, 60 insertions(+), 63 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 04622fb..8bda5be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -70,7 +70,7 @@ dnl ###########################################################################
 dnl Internationalization
 dnl ###########################################################################
 
-IT_PROG_INTLTOOL([0.35.0])
+IT_PROG_INTLTOOL([0.50])
 AC_SUBST(GETTEXT_PACKAGE, five-or-more)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [The gettext package name])
 
diff --git a/data/Makefile.am b/data/Makefile.am
index 6092f56..208eb36 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -15,9 +15,7 @@ theme_DATA = \
        pulse.png       \
        shapes.svg
 
-gsettings_in_file = org.gnome.five-or-more.gschema.xml.in
-gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
- INTLTOOL_XML_NOMERGE_RULE@
+gsettings_SCHEMAS = org.gnome.five-or-more.gschema.xml
 @GSETTINGS_RULES@
 
 man_MANS = five-or-more.6
@@ -34,11 +32,10 @@ EXTRA_DIST =                        \
        $(theme_DATA)           \
         $(appdata_DATA)                \
        $(desktop_in_files)     \
-       $(gsettings_in_file)    \
+       $(gsettings_SCHEMAS)    \
        $(man_MANS)     \
        $(ui_DATA)
 
-CLEANFILES = $(desktop_DATA) $(gsettings_SCHEMAS)
-DISTCLEANFILES = $(gsettings_SCHEMAS)
+CLEANFILES = $(desktop_DATA)
 
 -include $(top_srcdir)/git.mk
diff --git a/data/org.gnome.five-or-more.gschema.xml b/data/org.gnome.five-or-more.gschema.xml
new file mode 100644
index 0000000..401f4f6
--- /dev/null
+++ b/data/org.gnome.five-or-more.gschema.xml
@@ -0,0 +1,55 @@
+<schemalist>
+  <schema id="org.gnome.five-or-more" path="/org/gnome/five-or-more/" gettext-domain="gnome-games">
+    <key name="size" type="i">
+      <default>2</default>
+      <summary>Playing field size</summary>
+      <description>Playing field size. 1=Small, 2=Medium, 3=Large. Any other value is invalid.</description>
+    </key>
+    <key name="ball-theme" type="s">
+      <default>'balls.svg'</default>
+      <summary>Ball style</summary>
+      <description>Ball style.  The filename of the images to use for the balls.</description>
+    </key>
+    <key name="background-color" type="s">
+      <default>'#7590AE'</default>
+      <summary>Background color</summary>
+      <description>Background color.  The hex specification of the background color.</description>
+    </key>
+    <key name="move-timeout" type="i">
+      <default>100</default>
+      <summary>Time between moves</summary>
+      <description>Time between moves in milliseconds.</description>
+    </key>
+    <key name="score" type="i">
+      <default>0</default>
+      <summary>Game score</summary>
+      <description>Game score from last saved session.</description>
+    </key>
+    <key name="field" type="s">
+      <default>''</default>
+      <summary>Game field</summary>
+      <description>Game field from last saved session.</description>
+    </key>
+    <key name="preview" type="s">
+      <default>''</default>
+      <summary>Game preview</summary>
+      <description>Game preview from last saved session.</description>
+    </key>
+    <key name="window-width" type="i">
+      <default>600</default>
+      <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>
+    </key>
+    <key name="window-is-maximized" type="b">
+      <default>false</default>
+      <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>
+    </key>
+  </schema>
+</schemalist>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index e926c37..ca4305b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -5,7 +5,7 @@ data/glines.desktop.in
 [type: gettext/glade]data/five-or-more-preferences.ui
 [type: gettext/glade]data/five-or-more.ui
 [type: gettext/glade]data/menu.ui
-data/org.gnome.five-or-more.gschema.xml.in
+data/org.gnome.five-or-more.gschema.xml
 src/games-scores-dialog.c
 src/games-stock.c
 src/glines.c


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