4 files changed, 14 insertions, 6 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index fdcfcfc..1e81381 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -5,18 +5,21 @@ SUBDIRS =	\
 	sounds	\
 	$(NULL)
 
-@INTLTOOL_DESKTOP_RULE@
 if ENABLE_STATUSICON
 autostartdir = $(sysconfdir)/xdg/autostart
 endif
 autostart_in_files = mate-volume-control-status-icon.desktop.in
 if ENABLE_STATUSICON
 autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
+$(autostart_DATA): $(autostart_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 endif
 
 appsdir = $(datadir)/applications
 apps_in_files = mate-volume-control.desktop.in
 apps_DATA = $(apps_in_files:.desktop.in=.desktop)
+$(apps_DATA): $(apps_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
 EXTRA_DIST =					\
 	$(autostart_in_files)			\
diff --git a/data/mate-volume-control-status-icon.desktop.in b/data/mate-volume-control-status-icon.desktop.in
index 86f0756..7da1496 100644
--- a/data/mate-volume-control-status-icon.desktop.in
+++ b/data/mate-volume-control-status-icon.desktop.in
@@ -1,11 +1,13 @@
 [Desktop Entry]
-_Name=Volume Control
-_Comment=Show desktop volume control
+Name=Volume Control
+Comment=Show desktop volume control
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=multimedia-volume-control
 Exec=mate-volume-control-status-icon
 Terminal=false
 Type=Application
 Categories=AudioVideo;Mixer;Settings;HardwareSettings;
+# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 Keywords=MATE;volume;control;mixer;settings;sound;
 NoDisplay=true
 OnlyShowIn=MATE;
diff --git a/data/mate-volume-control.desktop.in.in b/data/mate-volume-control.desktop.in.in
index 60708a4..3223e96 100644
--- a/data/mate-volume-control.desktop.in.in
+++ b/data/mate-volume-control.desktop.in.in
@@ -1,12 +1,14 @@
 [Desktop Entry]
-_Name=Sound
-_Comment=Change sound volume and sound events
+Name=Sound
+Comment=Change sound volume and sound events
 Exec=mate-volume-control
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=multimedia-volume-control
 Terminal=false
 Type=Application
 StartupNotify=true
 Categories=AudioVideo;Mixer;Settings;HardwareSettings;
+# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 Keywords=MATE;volume;control;mixer;settings;sound;events;
 OnlyShowIn=MATE;
 X-MATE-Bugzilla-Bugzilla=MATE
diff --git a/data/sounds/Makefile.am b/data/sounds/Makefile.am
index 0c31fe7..faf6311 100644
--- a/data/sounds/Makefile.am
+++ b/data/sounds/Makefile.am
@@ -12,7 +12,8 @@ sound_DATA =			\
 metadata_in_files = mate-sounds-default.xml.in
 metadatadir = $(pkgdatadir)/sounds
 metadata_DATA = $(metadata_in_files:.xml.in=.xml)
-@INTLTOOL_XML_RULE@
+$(metadata_DATA): $(metadata_in_files)
+	$(AM_V_GEN) GETTEXTDATADIR=$(top_srcdir) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
 
 noinst_DATA = mate-sounds-default.xml.in
 CLEANFILES = mate-sounds-default.xml mate-sounds-default.xml.in