From b91dbe12e8f334e7fbaf9a36814d36d63c94dfd4 Mon Sep 17 00:00:00 2001
From: Wu Xiaotian <yetist@gmail.com>
Date: Wed, 25 Dec 2019 17:58:28 +0800
Subject: migrate from intltools to gettext

---
 accessx-status/Makefile.am                              | 11 ++++++-----
 ....AccessxStatusApplet.mate-panel-applet.desktop.in.in | 17 +++++++++++++++++
 ....applets.AccessxStatusApplet.mate-panel-applet.in.in | 16 ----------------
 3 files changed, 23 insertions(+), 21 deletions(-)
 create mode 100644 accessx-status/org.mate.applets.AccessxStatusApplet.mate-panel-applet.desktop.in.in
 delete mode 100644 accessx-status/org.mate.applets.AccessxStatusApplet.mate-panel-applet.in.in

(limited to 'accessx-status')

diff --git a/accessx-status/Makefile.am b/accessx-status/Makefile.am
index 90fa8f4b..688c94d5 100644
--- a/accessx-status/Makefile.am
+++ b/accessx-status/Makefile.am
@@ -20,8 +20,8 @@ accessx_status_applet_LDADD = \
 	$(X_LIBS)
 
 appletdir       = $(datadir)/mate-panel/applets
-applet_in_files = org.mate.applets.AccessxStatusApplet.mate-panel-applet.in
-applet_DATA     = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet)
+applet_in_files = org.mate.applets.AccessxStatusApplet.mate-panel-applet.desktop.in
+applet_DATA     = $(applet_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet)
 
 $(applet_in_files): $(applet_in_files).in Makefile
 	$(AM_V_GEN)sed \
@@ -29,7 +29,8 @@ $(applet_in_files): $(applet_in_files).in Makefile
 		-e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
 		$< > $@
 
-%.mate-panel-applet: %.mate-panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+$(applet_DATA): $(applet_in_files) Makefile
+	$(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
 
 servicedir       = $(datadir)/dbus-1/services
 service_in_files = org.mate.panel.applet.AccessxStatusAppletFactory.service.in
@@ -43,10 +44,10 @@ org.mate.panel.applet.AccessxStatusAppletFactory.service: $(service_in_files)
 uidir   = $(datadir)/mate/ui
 ui_DATA = accessx-status-applet-menu.xml
 
-CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(ACCESSX_STATUS_APPLET_CLEANFILES)
+CLEANFILES = $(applet_DATA) $(applet_in_files) $(service_DATA) $(ACCESSX_STATUS_APPLET_CLEANFILES)
 
 EXTRA_DIST = \
-	org.mate.applets.AccessxStatusApplet.mate-panel-applet.in.in \
+	$(applet_in_files).in \
 	$(service_in_files) \
 	$(ui_DATA)
 
diff --git a/accessx-status/org.mate.applets.AccessxStatusApplet.mate-panel-applet.desktop.in.in b/accessx-status/org.mate.applets.AccessxStatusApplet.mate-panel-applet.desktop.in.in
new file mode 100644
index 00000000..9d9200a7
--- /dev/null
+++ b/accessx-status/org.mate.applets.AccessxStatusApplet.mate-panel-applet.desktop.in.in
@@ -0,0 +1,17 @@
+[Applet Factory]
+Id=AccessxStatusAppletFactory
+Location=@LIBEXECDIR@/accessx-status-applet
+Name=AccessX Status Applet Factory
+Description=Keyboard Accessibility Status Applet Factory
+
+[AccessxStatusApplet]
+Name=Keyboard Accessibility Status
+Description=Shows the status of keyboard accessibility features
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+Icon=preferences-desktop-accessibility
+MateComponentId=OAFIID:MATE_AccessxStatusApplet
+X-MATE-Bugzilla-Bugzilla=MATE
+X-MATE-Bugzilla-Product=mate-applets
+X-MATE-Bugzilla-Component=keyboard-accessibility (accessx-status)
+X-MATE-Bugzilla-Version=@VERSION@
+X-MATE-Bugzilla-OtherBinaries=accessx-status-applet
diff --git a/accessx-status/org.mate.applets.AccessxStatusApplet.mate-panel-applet.in.in b/accessx-status/org.mate.applets.AccessxStatusApplet.mate-panel-applet.in.in
deleted file mode 100644
index 76ea1c44..00000000
--- a/accessx-status/org.mate.applets.AccessxStatusApplet.mate-panel-applet.in.in
+++ /dev/null
@@ -1,16 +0,0 @@
-[Applet Factory]
-Id=AccessxStatusAppletFactory
-Location=@LIBEXECDIR@/accessx-status-applet
-_Name=AccessX Status Applet Factory
-_Description=Keyboard Accessibility Status Applet Factory
-
-[AccessxStatusApplet]
-_Name=Keyboard Accessibility Status
-_Description=Shows the status of keyboard accessibility features
-Icon=preferences-desktop-accessibility
-MateComponentId=OAFIID:MATE_AccessxStatusApplet
-X-MATE-Bugzilla-Bugzilla=MATE
-X-MATE-Bugzilla-Product=mate-applets
-X-MATE-Bugzilla-Component=keyboard-accessibility (accessx-status)
-X-MATE-Bugzilla-Version=@VERSION@
-X-MATE-Bugzilla-OtherBinaries=accessx-status-applet
-- 
cgit v1.2.1