From b343e7dd32af083bdb0e7e2bb0989ca267a8f5ff Mon Sep 17 00:00:00 2001
From: Wu Xiaotian <yetist@gmail.com>
Date: Wed, 8 May 2019 18:20:53 +0800
Subject: Migrate from intltool to gettext

---
 desktop/Makefile.am            |  4 +++-
 desktop/mate-desktop.xml.in.in | 20 ++++++++++----------
 2 files changed, 13 insertions(+), 11 deletions(-)

(limited to 'desktop')

diff --git a/desktop/Makefile.am b/desktop/Makefile.am
index 104f7f2..1f9da2f 100644
--- a/desktop/Makefile.am
+++ b/desktop/Makefile.am
@@ -14,7 +14,9 @@ background_DATA = \
 metadata_in_files = mate-desktop.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 $@
 
 noinst_DATA = mate-desktop.xml.in
 CLEANFILES = mate-desktop.xml mate-desktop.xml.in
diff --git a/desktop/mate-desktop.xml.in.in b/desktop/mate-desktop.xml.in.in
index c305f17..54a8afb 100644
--- a/desktop/mate-desktop.xml.in.in
+++ b/desktop/mate-desktop.xml.in.in
@@ -2,7 +2,7 @@
 <!DOCTYPE wallpapers SYSTEM "mate-wp-list.dtd">
 <wallpapers>
 	<wallpaper deleted="false">
-		<_name>No Desktop Background</_name>
+		<name>No Desktop Background</name>
 		<filename>(none)</filename>
 		<options>zoom</options>
 		<shade_type>vertical-gradient</shade_type>
@@ -10,19 +10,19 @@
 		<scolor>#627F5A</scolor>
 	</wallpaper>
 	<wallpaper deleted="false">
-		<_name>Float into MATE</_name>
+		<name>Float into MATE</name>
 		<filename>@datadir@/backgrounds/mate/desktop/Float-into-MATE.png</filename>
 		<options>zoom</options>
 		<artist>Rowen Stipe</artist>
 	</wallpaper>
 	<wallpaper deleted="false">
-		<_name>Green Traditional</_name>
+		<name>Green Traditional</name>
 		<filename>@datadir@/backgrounds/mate/desktop/GreenTraditional.jpg</filename>
 		<options>zoom</options>
 		<artist>l0r4n0n</artist>
 	</wallpaper>
 	<wallpaper deleted="false">
-		<_name>Stripes</_name>
+		<name>Stripes</name>
 		<filename>@datadir@/backgrounds/mate/desktop/Stripes.png</filename>
 		<options>zoom</options>
 		<shade_type>vertical-gradient</shade_type>
@@ -31,7 +31,7 @@
 		<artist>Jakub Steiner</artist>
 	</wallpaper>
 	<wallpaper deleted="false">
-		<_name>MATE Stripes Dark</_name>
+		<name>MATE Stripes Dark</name>
 		<filename>@datadir@/backgrounds/mate/desktop/MATE-Stripes-Dark.png</filename>
 		<options>zoom</options>
 		<shade_type>vertical-gradient</shade_type>
@@ -40,7 +40,7 @@
 		<artist>Adam Erdman</artist>
 	</wallpaper>
 	<wallpaper deleted="false">
-		<_name>MATE Stripes Light</_name>
+		<name>MATE Stripes Light</name>
 		<filename>@datadir@/backgrounds/mate/desktop/MATE-Stripes-Light.png</filename>
 		<options>zoom</options>
 		<shade_type>vertical-gradient</shade_type>
@@ -49,25 +49,25 @@
 		<artist>Adam Erdman</artist>
 	</wallpaper>
 	<wallpaper deleted="false">
-		<_name>Ubuntu MATE Cold</_name>
+		<name>Ubuntu MATE Cold</name>
 		<filename>@datadir@/backgrounds/mate/desktop/Ubuntu-Mate-Cold-no-logo.png</filename>
 		<options>zoom</options>
 		<artist>Goce Mitevski</artist>
 	</wallpaper>
 	<wallpaper deleted="false">
-		<_name>Ubuntu MATE Dark</_name>
+		<name>Ubuntu MATE Dark</name>
 		<filename>@datadir@/backgrounds/mate/desktop/Ubuntu-Mate-Dark-no-logo.png</filename>
 		<options>zoom</options>
 		<artist>Goce Mitevski</artist>
 	</wallpaper>
 	<wallpaper deleted="false">
-		<_name>Ubuntu MATE Radioactive</_name>
+		<name>Ubuntu MATE Radioactive</name>
 		<filename>@datadir@/backgrounds/mate/desktop/Ubuntu-Mate-Radioactive-no-logo.png</filename>
 		<options>zoom</options>
 		<artist>Goce Mitevski</artist>
 	</wallpaper>
 	<wallpaper deleted="false">
-		<_name>Ubuntu MATE Warm</_name>
+		<name>Ubuntu MATE Warm</name>
 		<filename>@datadir@/backgrounds/mate/desktop/Ubuntu-Mate-Warm-no-logo.png</filename>
 		<options>zoom</options>
 		<artist>Goce Mitevski</artist>
-- 
cgit v1.2.1