6 files changed, 27 insertions, 22 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index 46dff6a..942fd55 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -9,19 +9,21 @@ man_MANS = 				\
 	mate-screensaver-preferences.1	\
 	$(NULL)
 
-@INTLTOOL_DESKTOP_RULE@
-
 desktopdir = $(datadir)/applications
 desktop_in_files = mate-screensaver-preferences.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
-@INTLTOOL_DIRECTORY_RULE@
+$(desktop_DATA): $(desktop_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
 directorydir = $(datadir)/desktop-directories
 directory_in_files =                            \
-	mate-screensaver.directory.in		\
+	mate-screensaver.directory.desktop.in		\
 	$(NULL)
-directory_DATA = $(directory_in_files:.directory.in=.directory)
+directory_DATA = $(directory_in_files:.directory.desktop.in=.directory)
+
+$(directory_DATA): $(directory_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
 menudir = $(sysconfdir)/xdg/menus
 menu_DATA =					\
@@ -40,7 +42,6 @@ dbussessionservicedir = $(DBUS_SESSION_SERVICE_DIR)
 dbussessionservice_DATA = org.mate.ScreenSaver.service
 
 @GSETTINGS_RULES@
-@INTLTOOL_XML_NOMERGE_RULE@
 
 gsettingsschema_in_files = org.mate.screensaver.gschema.xml.in
 gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
diff --git a/data/images/cosmos/Makefile.am b/data/images/cosmos/Makefile.am
index 6cc80d8..b48162b 100644
--- a/data/images/cosmos/Makefile.am
+++ b/data/images/cosmos/Makefile.am
@@ -19,15 +19,17 @@ images_DATA =			\
 	$(NULL)
 
 cosmos.xml.in: cosmos.xml.in.in Makefile
-	$(edit) $< >$@
+	@$(edit) $< >$@
 
 background-1.xml: background-1.xml.in Makefile
-	$(edit) $< >$@
+	$(AM_V_GEN) $(edit) $< >$@
 
 metadata_in_files = cosmos.xml.in
 metadatadir = $(datadir)/mate-background-properties
 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 $@
 
 edit = sed \
 	-e 's|@IMAGESDIR[@]|$(imagesdir)|g'
diff --git a/data/images/cosmos/cosmos.xml.in.in b/data/images/cosmos/cosmos.xml.in.in
index b9cf666..ffc75cb 100644
--- a/data/images/cosmos/cosmos.xml.in.in
+++ b/data/images/cosmos/cosmos.xml.in.in
@@ -4,7 +4,7 @@
   <wallpaper deleted="false">
     <!-- Translators: This is the name of a desktop background image that shows outer space images.
          You might want to translate it into the equivalent words of your language  -->
-    <_name>Cosmos</_name>
+    <name>Cosmos</name>
     <filename>@IMAGESDIR@/background-1.xml</filename>
     <options>zoom</options>
   </wallpaper>
diff --git a/data/mate-screensaver-preferences.desktop.in b/data/mate-screensaver-preferences.desktop.in
index d3104d6..38589a9 100644
--- a/data/mate-screensaver-preferences.desktop.in
+++ b/data/mate-screensaver-preferences.desktop.in
@@ -1,13 +1,14 @@
 [Desktop Entry]
-_Name=Screensaver
-_Comment=Set your screensaver preferences
+Name=Screensaver
+Comment=Set your screensaver preferences
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=preferences-desktop-screensaver
 Exec=mate-screensaver-preferences
 Terminal=false
 Type=Application
 Categories=GTK;Settings;DesktopSettings;
-#Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
-_Keywords=MATE;screensaver;preferences;
+# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+Keywords=MATE;screensaver;preferences;
 OnlyShowIn=MATE;
 StartupNotify=true
 X-MATE-Bugzilla-Bugzilla=MATE
diff --git a/data/mate-screensaver.directory.desktop.in b/data/mate-screensaver.directory.desktop.in
new file mode 100644
index 0000000..009feab
--- /dev/null
+++ b/data/mate-screensaver.directory.desktop.in
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Screensavers
+Comment=Screensaver themes
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+Icon=screensaver
+Type=Directory
+OnlyShowIn=MATE;
+NoDisplay=false
diff --git a/data/mate-screensaver.directory.in b/data/mate-screensaver.directory.in
deleted file mode 100644
index 3733bbd..0000000
--- a/data/mate-screensaver.directory.in
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-_Name=Screensavers
-_Comment=Screensaver themes
-Icon=screensaver
-Type=Directory
-OnlyShowIn=MATE;
-NoDisplay=false