[gnome-power-manager] Rely on intltool >= 0.50 for GSettings translation



commit 41044404856b31f188a1436037579ed51f02e1c4
Author: Richard Hughes <richard hughsie com>
Date:   Mon Oct 7 09:45:14 2013 +0100

    Rely on intltool >= 0.50 for GSettings translation

 configure.ac                                |    2 +-
 data/Makefile.am                            |    5 +--
 data/org.gnome.power-manager.gschema.xml    |   49 +++++++++++++++++++++++++++
 data/org.gnome.power-manager.gschema.xml.in |   49 ---------------------------
 po/POTFILES.in                              |    2 +-
 5 files changed, 52 insertions(+), 55 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index eda16f9..ecc0f8f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@ AM_PROG_CC_C_O
 
 AC_PROG_INSTALL
 LT_INIT
-IT_PROG_INTLTOOL([0.35.0])
+IT_PROG_INTLTOOL([0.50.0])
 
 GNOME_COMPILE_WARNINGS
 
diff --git a/data/Makefile.am b/data/Makefile.am
index 0c45322..288846f 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -11,9 +11,7 @@ dist_appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 appdata_in_files = gnome-power-statistics.appdata.xml.in
 
 @GSETTINGS_RULES@
- INTLTOOL_XML_NOMERGE_RULE@
-gsettings_schemas_in_files = org.gnome.power-manager.gschema.xml.in
-gsettings_SCHEMAS = $(gsettings_schemas_in_files:.gschema.xml.in=.gschema.xml)
+gsettings_SCHEMAS = org.gnome.power-manager.gschema.xml
 
 UI_FILES =                                             \
        gpm-statistics.ui
@@ -22,7 +20,6 @@ EXTRA_DIST =                                          \
        $(gsettings_SCHEMAS)                            \
        $(appdata_in_files)                             \
        $(desktop_in_files)                             \
-       $(gsettings_schemas_in_files)                   \
        $(UI_FILES)
 
 clean-local :
diff --git a/data/org.gnome.power-manager.gschema.xml b/data/org.gnome.power-manager.gschema.xml
new file mode 100644
index 0000000..85b7022
--- /dev/null
+++ b/data/org.gnome.power-manager.gschema.xml
@@ -0,0 +1,49 @@
+<schemalist>
+  <schema id="org.gnome.power-manager" path="/org/gnome/power-manager/" gettext-domain="gnome-power-manager">
+    <key name="info-history-graph-points" type="b">
+      <default>true</default>
+      <summary>Whether we should show the history data points</summary>
+      <description>Whether we should show the history data points in the statistics window.</description>
+    </key>
+    <key name="info-history-graph-smooth" type="b">
+      <default>true</default>
+      <summary>Whether we should smooth the history data</summary>
+      <description>Whether we should smooth the history data in the graph.</description>
+    </key>
+    <key name="info-history-type" type="s">
+      <default>'power'</default>
+      <summary>The default graph type to show for history</summary>
+      <description>The default graph type to show in the history window.</description>
+    </key>
+    <key name="info-history-time" type="i">
+      <default>21600</default>
+      <summary>The maximum time displayed for history</summary>
+      <description>The maximum duration of time displayed on the x-axis of the history graph.</description>
+    </key>
+    <key name="info-stats-graph-points" type="b">
+      <default>true</default>
+      <summary>Whether we should show the stats data points</summary>
+      <description>Whether we should show the stats data points in the statistics window.</description>
+    </key>
+    <key name="info-stats-graph-smooth" type="b">
+      <default>true</default>
+      <summary>Whether we should smooth the stats data</summary>
+      <description>Whether we should smooth the stats data in the graph.</description>
+    </key>
+    <key name="info-stats-type" type="s">
+      <default>'power'</default>
+      <summary>The default graph type to show for stats</summary>
+      <description>The default graph type to show in the stats window.</description>
+    </key>
+    <key name="info-page-number" type="i">
+      <default>0</default>
+      <summary>The index of the page number to show by default</summary>
+      <description>The index of the page number to show by default which is used to return focus to the 
correct page.</description>
+    </key>
+    <key name="info-last-device" type="s">
+      <default>''</default>
+      <summary>The ID of the last device selected</summary>
+      <description>The identifier of the last device which is used to return focus to the correct 
device.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d059279..178e40f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,7 +1,7 @@
 [encoding: UTF-8]
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-data/org.gnome.power-manager.gschema.xml.in
+data/org.gnome.power-manager.gschema.xml
 data/gnome-power-statistics.appdata.xml.in
 data/gnome-power-statistics.desktop.in.in
 [type: gettext/glade]data/gpm-statistics.ui


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