3 files changed, 11 insertions, 9 deletions
diff --git a/gsearchtool/data/Makefile.am b/gsearchtool/data/Makefile.am
index 63f2c1a8..feffd01c 100644
--- a/gsearchtool/data/Makefile.am
+++ b/gsearchtool/data/Makefile.am
@@ -4,21 +4,21 @@ icon_DATA = thumbnail_frame.png
 gsettingsschema_in_files = org.mate.search-tool.gschema.xml.in
 gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
 .PRECIOUS: $(gsettings_SCHEMAS)
-
-@INTLTOOL_DESKTOP_RULE@
-
 @GSETTINGS_RULES@
 
-@INTLTOOL_XML_RULE@
 appdatadir = $(datadir)/metainfo
 appdata_in_files = mate-search-tool.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 $@
 
 man_MANS = mate-search-tool.1
 
 Utilitiesdir = $(datadir)/applications
 Utilities_in_files = mate-search-tool.desktop.in
 Utilities_DATA = $(Utilities_in_files:.desktop.in=.desktop)
+$(Utilities_DATA): $(Utilities_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
 EXTRA_DIST = \
 	$(icon_DATA) \
diff --git a/gsearchtool/data/mate-search-tool.appdata.xml.in b/gsearchtool/data/mate-search-tool.appdata.xml.in
index cd4a1df2..7863d6f4 100644
--- a/gsearchtool/data/mate-search-tool.appdata.xml.in
+++ b/gsearchtool/data/mate-search-tool.appdata.xml.in
@@ -5,8 +5,8 @@
  <metadata_license>CC0-1.0</metadata_license>
  <project_license>GPL-2.0+</project_license>
  <name>MATE Search Tool</name>
- <_summary>A file searching tool for MATE Desktop</_summary>
- <_description>
+ <summary>A file searching tool for MATE Desktop</summary>
+ <description>
   <p>
    MATE Search Tool is a simple but powerful utility that allows you to
    search for files and folders on any mounted file system. Its interface
@@ -14,7 +14,7 @@
    such as text contained within a file, ownership, date of modification,
    file size, folder exclusion, etc..
   </p>
- </_description>
+ </description>
  <screenshots>
   <screenshot type="default">
    <image width="960" height="540">
diff --git a/gsearchtool/data/mate-search-tool.desktop.in b/gsearchtool/data/mate-search-tool.desktop.in
index 56645ceb..95e7c0fa 100644
--- a/gsearchtool/data/mate-search-tool.desktop.in
+++ b/gsearchtool/data/mate-search-tool.desktop.in
@@ -1,12 +1,14 @@
 [Desktop Entry]
-_Name=MATE Search Tool
-_Comment=Locate documents and folders on this computer by name or content
+Name=MATE Search Tool
+Comment=Locate documents and folders on this computer by name or content
 Exec=mate-search-tool
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=system-search
 Terminal=false
 Type=Application
 StartupNotify=true
 Categories=GTK;Utility;Core;
+# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 Keywords=MATE;search;files;locate;documents;folders;computer;name;content;find;tool;
 OnlyShowIn=MATE;
 X-MATE-DocPath=mate-search-tool/mate-search-tool.xml