From 828be64b69942451e95b56a02dde1576af1bb856 Mon Sep 17 00:00:00 2001
From: Wu Xiaotian <yetist@gmail.com>
Date: Thu, 29 Aug 2019 16:19:54 +0800
Subject: switch to use gettext

---
 data/50-accessibility.xml.in            |  8 ++++----
 data/Makefile.am                        | 11 ++++++-----
 data/mate-settings-daemon.desktop.in.in |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'data')

diff --git a/data/50-accessibility.xml.in b/data/50-accessibility.xml.in
index 89a9e6b..65efaa8 100644
--- a/data/50-accessibility.xml.in
+++ b/data/50-accessibility.xml.in
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<KeyListEntries group="system" _name="Accessibility" schema="org.mate.SettingsDaemon.plugins.media-keys">
+<KeyListEntries group="system" name="Accessibility" schema="org.mate.SettingsDaemon.plugins.media-keys">
 
-	<KeyListEntry name="magnifier" _description="Toggle magnifier"/>
-	<KeyListEntry name="screenreader" _description="Toggle screen reader"/>
-	<KeyListEntry name="on-screen-keyboard" _description="Toggle on-screen keyboard"/>
+	<KeyListEntry name="magnifier" description="Toggle magnifier"/>
+	<KeyListEntry name="screenreader" description="Toggle screen reader"/>
+	<KeyListEntry name="on-screen-keyboard" description="Toggle on-screen keyboard"/>
 
 </KeyListEntries>
diff --git a/data/Makefile.am b/data/Makefile.am
index 3fad838..7c6f03f 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -28,17 +28,17 @@ msd_gschemas_in = \
 	org.mate.SettingsDaemon.plugins.gschema.xml.in \
 	$(NULL)
 
-@INTLTOOL_XML_NOMERGE_RULE@
-
 gsettings_SCHEMAS = $(msd_gschemas_in:.xml.in=.xml)
 
 @GSETTINGS_RULES@
 
-@INTLTOOL_DESKTOP_RULE@
 desktopdir = $(sysconfdir)/xdg/autostart
 desktop_in_files = mate-settings-daemon.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
+$(desktop_DATA): $(desktop_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+
 servicedir = $(datadir)/dbus-1/services
 service_in_files = org.mate.SettingsDaemon.service.in
 service_DATA = $(service_in_files:.service.in=.service)
@@ -54,13 +54,14 @@ man_MANS = \
 	msd-datetime-mechanism.1 \
 	msd-locate-pointer.1
 
-@INTLTOOL_XML_NOMERGE_RULE@
-
 #disabled until we support it
 xmldir = @MATE_KEYBINDINGS_KEYSDIR@
 xml_in_files = 50-accessibility.xml.in
 xml_DATA = $(xml_in_files:.xml.in=.xml)
 
+$(xml_DATA): $(xml_in_files)
+	$(AM_V_GEN) GETTEXTDATADIR=$(top_srcdir) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
+
 EXTRA_DIST = 				\
 	$(msd_gschemas_in)		\
 	$(service_in_files)		\
diff --git a/data/mate-settings-daemon.desktop.in.in b/data/mate-settings-daemon.desktop.in.in
index 9a2aca7..4284b3e 100644
--- a/data/mate-settings-daemon.desktop.in.in
+++ b/data/mate-settings-daemon.desktop.in.in
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-_Name=MATE Settings Daemon
+Name=MATE Settings Daemon
 Exec=@LIBEXECDIR@/mate-settings-daemon
 OnlyShowIn=MATE;
 X-MATE-Autostart-Phase=Initialization
-- 
cgit v1.2.1