4 files changed, 11 insertions, 9 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index 1a8150b..3b68c3a 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,7 +1,8 @@
-@INTLTOOL_XML_RULE@
 appdatadir = $(datadir)/metainfo
 appdata_in_files = mate-calc.appdata.xml.in
 appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+$(appdata_DATA): $(appdata_in_files)
+ $(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
 
 gsettings_SCHEMAS = org.mate.calc.gschema.xml
 @GSETTINGS_RULES@
@@ -9,12 +10,13 @@ gsettings_SCHEMAS = org.mate.calc.gschema.xml
 Utilitiesdir = $(datadir)/applications
 Utilities_in_files = mate-calc.desktop.in
 Utilities_DATA = $(Utilities_in_files:.desktop.in=.desktop)
-@INTLTOOL_DESKTOP_RULE@
+$(Utilities_DATA): $(Utilities_in_files)
+ $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
 man1_MANS = mate-calc.1 mate-calc-cmd.1
 
 EXTRA_DIST = \
- org.mate.calc.gschema.xml.in \
+ org.mate.calc.gschema.xml \
 mate-calc.desktop.in \
 $(appdata_in_files) \
 $(man1_MANS)
diff --git a/data/mate-calc.appdata.xml.in b/data/mate-calc.appdata.xml.in
index 80cbad1..13c634f 100644
--- a/data/mate-calc.appdata.xml.in
+++ b/data/mate-calc.appdata.xml.in
@@ -5,8 +5,8 @@
 <metadata_license>CC0-1.0</metadata_license>
 <project_license>GPL-2.0+</project_license>
 <name>MATE Calc</name>
- <_summary>MATE Desktop calculator</_summary>
- <_description>
+ <summary>MATE Desktop calculator</summary>
+ <description>
 <p>
 MATE Calc is a powerful graphical calculator with financial,
 logical and scientific modes. It uses a multiple precision package
@@ -17,7 +17,7 @@
 If you would like to know more about MATE and MATE Calc, please visit the
 project's home page.
 </p>
- </_description>
+ </description>
 <screenshots>
 <screenshot type="default">
 <image width="314" height="247">
diff --git a/data/mate-calc.desktop.in b/data/mate-calc.desktop.in
index 2e61e3c..d51b4a2 100644
--- a/data/mate-calc.desktop.in
+++ b/data/mate-calc.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
-_Name=MATE Calculator
-_GenericName=Calculator
-_Comment=Perform arithmetic, scientific or financial calculations
+Name=MATE Calculator
+GenericName=Calculator
+Comment=Perform arithmetic, scientific or financial calculations
 Exec=mate-calc
 Icon=accessories-calculator
 Terminal=false
diff --git a/data/org.mate.calc.gschema.xml.in b/data/org.mate.calc.gschema.xml
index 37295c1..37295c1 100644
--- a/data/org.mate.calc.gschema.xml.in
+++ b/data/org.mate.calc.gschema.xml