3 files changed, 11 insertions, 8 deletions
diff --git a/baobab/data/Makefile.am b/baobab/data/Makefile.am
index 4fd73c37..ea1b3914 100644
--- a/baobab/data/Makefile.am
+++ b/baobab/data/Makefile.am
@@ -5,13 +5,14 @@ baobabapp_DATA = $(baobabapp_in_files:.desktop.in=.desktop)
 $(baobabapp_in_files): $(baobabapp_in_files:.desktop.in=.desktop.in.in)
 	sed -e "s|\@VERSION\@|@VERSION@|" $< > $@
 
-@INTLTOOL_DESKTOP_RULE@
+$(baobabapp_DATA): $(baobabapp_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
-
-@INTLTOOL_XML_RULE@
 appdatadir = $(datadir)/metainfo
 appdata_in_files = mate-disk-usage-analyzer.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.disk-usage-analyzer.gschema.xml
 @GSETTINGS_RULES@
diff --git a/baobab/data/mate-disk-usage-analyzer.appdata.xml.in b/baobab/data/mate-disk-usage-analyzer.appdata.xml.in
index 89c94312..728ca89c 100644
--- a/baobab/data/mate-disk-usage-analyzer.appdata.xml.in
+++ b/baobab/data/mate-disk-usage-analyzer.appdata.xml.in
@@ -5,8 +5,8 @@
  <metadata_license>CC0-1.0</metadata_license>
  <project_license>GPL-2.0+</project_license>
  <name>MATE Disk Usage Analyzer</name>
- <_summary>A disk usage analyzing tool for MATE Desktop</_summary>
- <_description>
+ <summary>A disk usage analyzing tool for MATE Desktop</summary>
+ <description>
   <p>
    As its name implies, Disk Usage Analyzer is a graphical utility that you
    can use to view and monitor your disk usage and folder structure. It displays
@@ -17,7 +17,7 @@
    or remote. There is also an option to constantly monitor any external changes
    to the home directory and warn the user if a file is added/removed.
   </p>
- </_description>
+ </description>
  <screenshots>
   <screenshot type="default">
    <image width="960" height="540">
diff --git a/baobab/data/mate-disk-usage-analyzer.desktop.in.in b/baobab/data/mate-disk-usage-analyzer.desktop.in.in
index cf5b3e9a..a59993f9 100644
--- a/baobab/data/mate-disk-usage-analyzer.desktop.in.in
+++ b/baobab/data/mate-disk-usage-analyzer.desktop.in.in
@@ -1,13 +1,15 @@
 [Desktop Entry]
-_Name=MATE Disk Usage Analyzer
-_Comment=Check folder sizes and available disk space
+Name=MATE Disk Usage Analyzer
+Comment=Check folder sizes and available disk space
 TryExec=mate-disk-usage-analyzer
 Exec=mate-disk-usage-analyzer
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=mate-disk-usage-analyzer
 Terminal=false
 Type=Application
 StartupNotify=true
 Categories=GTK;System;Filesystem;
+# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 Keywords=MATE;check;disk;usage;analyze;size;space;
 OnlyShowIn=MATE;
 X-MATE-Bugzilla-Bugzilla=MATE