Merge pull request #100 from NiceandGently/master

fixes for gschema translation

2 files changed, 14 insertions, 17 deletions

diff --git a/baobab/data/Makefile.am b/baobab/data/Makefile.am
index f9919811..771b98e0 100644
--- a/baobab/data/Makefile.am
+++ b/baobab/data/Makefile.am
@@ -11,15 +11,13 @@ $(baobabapp_in_files): $(baobabapp_in_files:.desktop.in=.desktop.in.in)
 
 @INTLTOOL_DESKTOP_RULE@
 
-gsettingsschema_in_files = org.mate.disk-usage-analyzer.gschema.xml.in
-gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
-.PRECIOUS: $(gsettings_SCHEMAS)
 
 @INTLTOOL_XML_RULE@
 appdatadir = $(datadir)/appdata
 appdata_in_files = mate-disk-usage-analyzer.appdata.xml.in
 appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 
+gsettings_SCHEMAS = org.mate.disk-usage-analyzer.gschema.xml
 @GSETTINGS_RULES@
 
 convertdir = $(datadir)/MateConf/gsettings
@@ -30,7 +28,6 @@ man_MANS = mate-disk-usage-analyzer.1
 EXTRA_DIST = \
 	$(ui_DATA) \
 	mate-disk-usage-analyzer.desktop.in.in \
-	$(gsettingsschema_in_files) \
 	$(convert_DATA) \
 	$(appdata_in_files) \
 	$(man_MANS)
@@ -39,4 +36,4 @@ CLEANFILES = \
 	$(baobabapp_in_files) \
 	$(baobabapp_DATA) \
 	$(gsettings_SCHEMAS) \
-	mate-disk-usage-analyzer.appdata.xml
+	$(appdata_DATA)
diff --git a/baobab/data/org.mate.disk-usage-analyzer.gschema.xml.in b/baobab/data/org.mate.disk-usage-analyzer.gschema.xml.in
index 26801491..a56de249 100644
--- a/baobab/data/org.mate.disk-usage-analyzer.gschema.xml.in
+++ b/baobab/data/org.mate.disk-usage-analyzer.gschema.xml.in
@@ -6,35 +6,35 @@
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.mate.disk-usage-analyzer.preferences" path="/org/mate/disk-usage-analyzer/preferences/">
     <key name="monitor-home" type="b">
       <default>false</default>
-      <_summary>Monitor Home</_summary>
-      <_description>Whether any change to the home directory should be monitored.</_description>
+      <summary>Monitor Home</summary>
+      <description>Whether any change to the home directory should be monitored.</description>
     </key>
     <key name="excluded-uris" type="as">
       <default>[]</default>
-      <_summary>Excluded partitions URIs</_summary>
-      <_description>A list of URIs for partitions to be excluded from scanning.</_description>
+      <summary>Excluded partitions URIs</summary>
+      <description>A list of URIs for partitions to be excluded from scanning.</description>
     </key>
   </schema>
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.mate.disk-usage-analyzer.ui" path="/org/mate/disk-usage-analyzer/ui/">
     <key name="toolbar-visible" type="b">
       <default>true</default>
-      <_summary>Toolbar is Visible</_summary>
-      <_description>Whether the toolbar should be visible in main window.</_description>
+      <summary>Toolbar is Visible</summary>
+      <description>Whether the toolbar should be visible in main window.</description>
     </key>
     <key name="statusbar-visible" type="b">
       <default>false</default>
-      <_summary>Statusbar is Visible</_summary>
-      <_description>Whether the status bar at the bottom of main window	should be visible.</_description>
+      <summary>Statusbar is Visible</summary>
+      <description>Whether the status bar at the bottom of main window	should be visible.</description>
     </key>
     <key name="subfoldertips-visible" type="b">
       <default>true</default>
-      <_summary>Subfolder tips visible</_summary>
-      <_description>Whether the subfolder tooltips of the selected folder are drawn.</_description>
+      <summary>Subfolder tips visible</summary>
+      <description>Whether the subfolder tooltips of the selected folder are drawn.</description>
     </key>
     <key name="active-chart" type="s">
       <default>'rings'</default>
-      <_summary>Active Chart</_summary>
-      <_description>Which type of chart should be displayed.</_description>
+      <summary>Active Chart</summary>
+      <description>Which type of chart should be displayed.</description>
     </key>
   </schema>
 </schemalist>