[four-in-a-row] Rely on intltool >= 0.50 for gsettings translation
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [four-in-a-row] Rely on intltool >= 0.50 for gsettings translation
- Date: Sat, 5 Oct 2013 15:04:17 +0000 (UTC)
commit 4d95f52ed6fdb272b5d379863b6e4d7da19fb35a
Author: Michael Catanzaro <mcatanzaro gnome org>
Date: Sat Oct 5 09:57:08 2013 -0500
Rely on intltool >= 0.50 for gsettings translation
configure.ac | 2 +-
data/Makefile.am | 9 ++----
data/org.gnome.four-in-a-row.gschema.xml | 44 +++++++++++++++++++++++++++
data/org.gnome.four-in-a-row.gschema.xml.in | 44 ---------------------------
po/POTFILES.in | 2 +-
5 files changed, 49 insertions(+), 52 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 6e752be..acde175 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, four-in-a-row)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [The gettext package name])
diff --git a/data/Makefile.am b/data/Makefile.am
index 2feebb0..c90b4a8 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,8 +1,6 @@
SUBDIRS = icons
-gsettings_in_file = org.gnome.four-in-a-row.gschema.xml.in
-gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
- INTLTOOL_XML_NOMERGE_RULE@
+gsettings_SCHEMAS = org.gnome.four-in-a-row.gschema.xml
@GSETTINGS_RULES@
pixmapdir = $(datadir)/four-in-a-row
@@ -42,11 +40,10 @@ EXTRA_DIST = $(pixmap_DATA) \
$(velena_DATA) \
$(appdata_DATA) \
$(desktop_in_files) \
- $(gsettings_in_file) \
+ $(gsettings_SCHEMAS) \
$(man_MANS)
-CLEANFILES = $(gsettings_SCHEMAS) $(desktop_DATA)
-DISTCLEANFILES = $(gsettings_SCHEMAS)
+CLEANFILES = $(desktop_DATA)
check-local: $(appdata_DATA) $(desktop_DATA)
$(APPDATA_VALIDATE) $(appdata_DATA)
diff --git a/data/org.gnome.four-in-a-row.gschema.xml b/data/org.gnome.four-in-a-row.gschema.xml
new file mode 100644
index 0000000..7435595
--- /dev/null
+++ b/data/org.gnome.four-in-a-row.gschema.xml
@@ -0,0 +1,44 @@
+<schemalist>
+ <schema id="org.gnome.four-in-a-row" path="/org/gnome/four-in-a-row/">
+ <key name="player1" type="i">
+ <default>0</default>
+ <summary>Level of Player One</summary>
+ <description>Zero is human; one through three correspond to the level of the computer
player.</description>
+ </key>
+ <key name="player2" type="i">
+ <default>1</default>
+ <summary>Level of Player Two</summary>
+ <description>Zero is human; one through three correspond to the level of the computer
player.</description>
+ </key>
+ <key name="theme-id" type="i">
+ <default>3</default>
+ <summary>Theme ID</summary>
+ <description>A number specifying the preferred theme.</description>
+ </key>
+ <key name="animate" type="b">
+ <default>true</default>
+ <summary>Animate</summary>
+ <description>Whether or not to use animation.</description>
+ </key>
+ <key name="sound" type="b">
+ <default>true</default>
+ <summary>Sound</summary>
+ <description>Whether or not to play event sounds.</description>
+ </key>
+ <key name="key-left" type="i">
+ <default>65361</default>
+ <summary>Move left</summary>
+ <description>Key press to move left.</description>
+ </key>
+ <key name="key-right" type="i">
+ <default>65363</default>
+ <summary>Move right</summary>
+ <description>Key press to move right.</description>
+ </key>
+ <key name="key-drop" type="i">
+ <default>65364</default>
+ <summary>Drop marble</summary>
+ <description>Key press to drop a marble.</description>
+ </key>
+ </schema>
+</schemalist>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 64df853..6d2b0f0 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,7 +2,7 @@
# Please keep this file in alphabetical order.
[encoding: UTF-8]
data/gnect.desktop.in
-data/org.gnome.four-in-a-row.gschema.xml.in
+data/org.gnome.four-in-a-row.gschema.xml
src/games-controls.c
src/games-stock.c
src/gfx.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]