Merge pull request #100 from NiceandGently/master

fixes for gschema translation

2 files changed, 15 insertions, 18 deletions

diff --git a/logview/data/Makefile.am b/logview/data/Makefile.am
index a77c9913..93a713d6 100644
--- a/logview/data/Makefile.am
+++ b/logview/data/Makefile.am
@@ -10,11 +10,9 @@ $(desktop_in_files): $(desktop_in_files:.desktop.in=.desktop.in.in)
 
 man_MANS = mate-system-log.1
 
-gsettingsschema_in_files = org.mate.system-log.gschema.xml.in
-gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
-.PRECIOUS: $(gsettings_SCHEMAS)
+gsettings_SCHEMAS = org.mate.system-log.gschema.xml
 
-@INTLTOOL_XML_NOMERGE_RULE@
+@INTLTOOL_XML_RULE@
 
 @GSETTINGS_RULES@
 
@@ -25,8 +23,7 @@ EXTRA_DIST = 			\
 	mate-system-log.desktop.in.in	\
 	$(xml_DATA)		\
 	$(man_MANS)		\
-	$(convert_DATA)	\
-	$(gsettingsschema_in_files)
+	$(convert_DATA)
 
 DISTCLEANFILES =		\
 	$(desktop_DATA)		\
diff --git a/logview/data/org.mate.system-log.gschema.xml.in b/logview/data/org.mate.system-log.gschema.xml.in
index 0f00134e..c4c36f55 100644
--- a/logview/data/org.mate.system-log.gschema.xml.in
+++ b/logview/data/org.mate.system-log.gschema.xml.in
@@ -2,33 +2,33 @@
   <schema id="org.mate.system-log" path="/org/mate/system-log/">
     <key name="logfile" type="s">
       <default>'/var/log/messages'</default>
-      <_summary>Log file to open up on startup</_summary>
-      <_description>Specifies the log file displayed at startup. The default is either /var/adm/messages or  /var/log/messages, depending on your  operating system.</_description>
+      <summary>Log file to open up on startup</summary>
+      <description>Specifies the log file displayed at startup. The default is either /var/adm/messages or  /var/log/messages, depending on your  operating system.</description>
     </key>
     <key name="fontsize" type="i">
       <default>10</default>
-      <_summary>Size of the font used to display the log</_summary>
-      <_description>Specifies the size of the fixed-width font used to display the log in the main tree view. The default is taken from the default terminal font size.</_description>
+      <summary>Size of the font used to display the log</summary>
+      <description>Specifies the size of the fixed-width font used to display the log in the main tree view. The default is taken from the default terminal font size.</description>
     </key>
     <key name="height" type="i">
       <default>400</default>
-      <_summary>Height of the main window in pixels</_summary>
-      <_description>Specifies the height of the log viewer main window in pixels.</_description>
+      <summary>Height of the main window in pixels</summary>
+      <description>Specifies the height of the log viewer main window in pixels.</description>
     </key>
     <key name="width" type="i">
       <default>600</default>
-      <_summary>Width of the main window in pixels</_summary>
-      <_description>Specifies the width of the log viewer main window in pixels.</_description>
+      <summary>Width of the main window in pixels</summary>
+      <description>Specifies the width of the log viewer main window in pixels.</description>
     </key>
     <key name="logfiles" type="as">
       <default>[]</default>
-      <_summary>Log files to open up on startup</_summary>
-      <_description>Specifies a list of log files to open up at startup. A default list is created by reading /etc/syslog.conf.</_description>
+      <summary>Log files to open up on startup</summary>
+      <description>Specifies a list of log files to open up at startup. A default list is created by reading /etc/syslog.conf.</description>
     </key>
     <key name="filters" type="as">
       <default>[]</default>
-      <_summary>List of saved filters</_summary>
-      <_description>List of saved regexp filters</_description>
+      <summary>List of saved filters</summary>
+      <description>List of saved regexp filters</description>
     </key>
   </schema>
 </schemalist>