GNOME.org
 

[gnome-nibbles] Rely on intltool >=0.50 for gsettings translations

commit 7a22cd513952b02994a7320b5c166c897dfdf3c1
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Sun Oct 6 09:30:05 2013 -0500

    Rely on intltool >=0.50 for gsettings translations

 configure.ac                          |    2 +-
 data/Makefile.am                      |    9 +-
 data/org.gnome.nibbles.gschema.xml    |  236 +++++++++++++++++++++++++++++++++
 data/org.gnome.nibbles.gschema.xml.in |  236 ---------------------------------
 po/POTFILES.in                        |    2 +-
 5 files changed, 241 insertions(+), 244 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d9433df..7118d76 100644
--- a/configure.ac
+++ b/configure.ac
@@ -78,7 +78,7 @@ dnl ###########################################################################
 dnl Internationalization
 dnl ###########################################################################
 
-IT_PROG_INTLTOOL([0.35.0])
+IT_PROG_INTLTOOL([0.50])
 AC_SUBST(GETTEXT_PACKAGE, gnome-nibbles)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [The gettext package name])
 
diff --git a/data/Makefile.am b/data/Makefile.am
index e074364..f74c146 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,8 +1,6 @@
 SUBDIRS = icons levels pix
 
-gsettings_in_file = org.gnome.nibbles.gschema.xml.in
-gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
- INTLTOOL_XML_NOMERGE_RULE@
+gsettings_SCHEMAS = org.gnome.nibbles.gschema.xml
 @GSETTINGS_RULES@
 
 soundsdir = $(datadir)/gnome-nibbles/sounds
@@ -30,11 +28,10 @@ EXTRA_DIST = \
        $(appdata_DATA) \
        $(desktop_in_files) \
        $(sounds_DATA) \
-       $(gsettings_in_file) \
+       $(gsettings_SCHEMAS) \
        $(man_MANS)
 
-CLEANFILES = $(desktop_DATA) $(gsettings_SCHEMAS)
-DISTCLEANFILES = $(gsettings_SCHEMAS)
+CLEANFILES = $(desktop_DATA)
 
 install-exec-hook:
        -if test "$(setgid)" = "true"; then \
diff --git a/data/org.gnome.nibbles.gschema.xml b/data/org.gnome.nibbles.gschema.xml
new file mode 100644
index 0000000..9edc319
--- /dev/null
+++ b/data/org.gnome.nibbles.gschema.xml
@@ -0,0 +1,236 @@
+<schemalist>
+  <schema id="org.gnome.nibbles" path="/org/gnome/nibbles/">
+    <key name="players" type="i">
+      <default>1</default>
+      <summary>Number of human players</summary>
+      <description>Number of human players.</description>
+    </key>
+    <key name="ai" type="i">
+      <default>3</default>
+      <summary>Number of AI players</summary>
+      <description>Number of AI players.</description>
+    </key>
+    <key name="speed" type="i">
+      <default>3</default>
+      <summary>Game speed</summary>
+      <description>Game speed (1=fast, 4=slow).</description>
+    </key>
+    <key name="fakes" type="b">
+      <default>false</default>
+      <summary>Enable fake bonuses</summary>
+      <description>Enable fake bonuses.</description>
+    </key>
+    <key name="random" type="b">
+      <default>false</default>
+      <summary>Play levels in random order</summary>
+      <description>Play levels in random order.</description>
+    </key>
+    <key name="start-level" type="i">
+      <default>1</default>
+      <summary>Game level to start on</summary>
+      <description>Game level to start on.</description>
+    </key>
+    <key name="sound" type="b">
+      <default>true</default>
+      <summary>Enable sounds</summary>
+      <description>Enable sounds.</description>
+    </key>
+    <key name="tile-size" type="i">
+      <default>7</default>
+      <summary>Size of game tiles</summary>
+      <description>Size of game tiles.</description>
+    </key>
+  </schema>
+  <schema id="org.gnome.nibbles.worm0" path="/org/gnome/nibbles/worm0/">
+    <key name="color" type="s">
+      <default>'red'</default>
+      <summary>Color to use for worm</summary>
+      <description>Color to use for worm.</description>
+    </key>
+    <key name="move-relative" type="b">
+      <default>false</default>
+      <summary>Use relative movement</summary>
+      <description>Use relative movement (ie. left or right only).</description>
+    </key>
+    <key name="key-up" type="i">
+      <default>65362</default>
+      <summary>Move up</summary>
+      <description>Key to use for motion up.</description>
+    </key>
+    <key name="key-down" type="i">
+      <default>65364</default>
+      <summary>Move down</summary>
+      <description>Key to use for motion down.</description>
+    </key>
+    <key name="key-left" type="i">
+      <default>65361</default>
+      <summary>Move left</summary>
+      <description>Key to use for motion left.</description>
+    </key>
+    <key name="key-right" type="i">
+      <default>65363</default>
+      <summary>Move right</summary>
+      <description>Key to use for motion right.</description>
+    </key>
+  </schema>
+  <schema id="org.gnome.nibbles.worm1" path="/org/gnome/nibbles/worm1/">
+    <key name="color" type="s">
+      <default>'green'</default>
+      <summary>Color to use for worm</summary>
+      <description>Color to use for worm.</description>
+    </key>
+    <key name="move-relative" type="b">
+      <default>false</default>
+      <summary>Use relative movement</summary>
+      <description>Use relative movement (ie. left or right only).</description>
+    </key>
+    <key name="key-up" type="i">
+      <default>65362</default>
+      <summary>Move up</summary>
+      <description>Key to use for motion up.</description>
+    </key>
+    <key name="key-down" type="i">
+      <default>65364</default>
+      <summary>Move down</summary>
+      <description>Key to use for motion down.</description>
+    </key>
+    <key name="key-left" type="i">
+      <default>65361</default>
+      <summary>Move left</summary>
+      <description>Key to use for motion left.</description>
+    </key>
+    <key name="key-right" type="i">
+      <default>65363</default>
+      <summary>Move right</summary>
+      <description>Key to use for motion right.</description>
+    </key>
+  </schema>
+  <schema id="org.gnome.nibbles.worm2" path="/org/gnome/nibbles/worm2/">
+    <key name="color" type="s">
+      <default>'blue'</default>
+      <summary>Color to use for worm</summary>
+      <description>Color to use for worm.</description>
+    </key>
+    <key name="move-relative" type="b">
+      <default>false</default>
+      <summary>Use relative movement</summary>
+      <description>Use relative movement (ie. left or right only).</description>
+    </key>
+    <key name="key-up" type="i">
+      <default>65362</default>
+      <summary>Move up</summary>
+      <description>Key to use for motion up.</description>
+    </key>
+    <key name="key-down" type="i">
+      <default>65364</default>
+      <summary>Move down</summary>
+      <description>Key to use for motion down.</description>
+    </key>
+    <key name="key-left" type="i">
+      <default>65361</default>
+      <summary>Move left</summary>
+      <description>Key to use for motion left.</description>
+    </key>
+    <key name="key-right" type="i">
+      <default>65363</default>
+      <summary>Move right</summary>
+      <description>Key to use for motion right.</description>
+    </key>
+  </schema>
+  <schema id="org.gnome.nibbles.worm3" path="/org/gnome/nibbles/worm3/">
+    <key name="color" type="s">
+      <default>'yellow'</default>
+      <summary>Color to use for worm</summary>
+      <description>Color to use for worm.</description>
+    </key>
+    <key name="move-relative" type="b">
+      <default>false</default>
+      <summary>Use relative movement</summary>
+      <description>Use relative movement (ie. left or right only).</description>
+    </key>
+    <key name="key-up" type="i">
+      <default>65362</default>
+      <summary>Move up</summary>
+      <description>Key to use for motion up.</description>
+    </key>
+    <key name="key-down" type="i">
+      <default>65364</default>
+      <summary>Move down</summary>
+      <description>Key to use for motion down.</description>
+    </key>
+    <key name="key-left" type="i">
+      <default>65361</default>
+      <summary>Move left</summary>
+      <description>Key to use for motion left.</description>
+    </key>
+    <key name="key-right" type="i">
+      <default>65363</default>
+      <summary>Move right</summary>
+      <description>Key to use for motion right.</description>
+    </key>
+  </schema>
+  <schema id="org.gnome.nibbles.worm4" path="/org/gnome/nibbles/worm4/">
+    <key name="color" type="s">
+      <default>'cyan'</default>
+      <summary>Color to use for worm</summary>
+      <description>Color to use for worm.</description>
+    </key>
+    <key name="move-relative" type="b">
+      <default>false</default>
+      <summary>Use relative movement</summary>
+      <description>Use relative movement (ie. left or right only).</description>
+    </key>
+    <key name="key-up" type="i">
+      <default>65362</default>
+      <summary>Move up</summary>
+      <description>Key to use for motion up.</description>
+    </key>
+    <key name="key-down" type="i">
+      <default>65364</default>
+      <summary>Move down</summary>
+      <description>Key to use for motion down.</description>
+    </key>
+    <key name="key-left" type="i">
+      <default>65361</default>
+      <summary>Move left</summary>
+      <description>Key to use for motion left.</description>
+    </key>
+    <key name="key-right" type="i">
+      <default>65363</default>
+      <summary>Move right</summary>
+      <description>Key to use for motion right.</description>
+    </key>
+  </schema>
+  <schema id="org.gnome.nibbles.worm5" path="/org/gnome/nibbles/worm5/">
+    <key name="color" type="s">
+      <default>'purple'</default>
+      <summary>Color to use for worm</summary>
+      <description>Color to use for worm.</description>
+    </key>
+    <key name="move-relative" type="b">
+      <default>false</default>
+      <summary>Use relative movement</summary>
+      <description>Use relative movement (ie. left or right only).</description>
+    </key>
+    <key name="key-up" type="i">
+      <default>65362</default>
+      <summary>Move up</summary>
+      <description>Key to use for motion up.</description>
+    </key>
+    <key name="key-down" type="i">
+      <default>65364</default>
+      <summary>Move down</summary>
+      <description>Key to use for motion down.</description>
+    </key>
+    <key name="key-left" type="i">
+      <default>65361</default>
+      <summary>Move left</summary>
+      <description>Key to use for motion left.</description>
+    </key>
+    <key name="key-right" type="i">
+      <default>65363</default>
+      <summary>Move right</summary>
+      <description>Key to use for motion right.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9cfd36b..26ff15b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,7 +2,7 @@
 # Please keep this file in alphabetical order.
 [encoding: UTF-8]
 data/gnibbles.desktop.in
-data/org.gnome.nibbles.gschema.xml.in
+data/org.gnome.nibbles.gschema.xml
 src/board.c
 src/games-controls.c
 src/gnibbles.c
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]