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

---
 multiload/Makefile.am                                   | 12 ++++++------
 ...lets.MultiLoadApplet.mate-panel-applet.desktop.in.in | 17 +++++++++++++++++
 ...mate.applets.MultiLoadApplet.mate-panel-applet.in.in | 16 ----------------
 3 files changed, 23 insertions(+), 22 deletions(-)
 create mode 100644 multiload/org.mate.applets.MultiLoadApplet.mate-panel-applet.desktop.in.in
 delete mode 100644 multiload/org.mate.applets.MultiLoadApplet.mate-panel-applet.in.in

(limited to 'multiload')

diff --git a/multiload/Makefile.am b/multiload/Makefile.am
index 2cad698c..da30c8da 100644
--- a/multiload/Makefile.am
+++ b/multiload/Makefile.am
@@ -29,13 +29,12 @@ mate_multiload_applet_LDADD = \
 				$(GIO_LIBS)				\
 				-lm
 
-@INTLTOOL_XML_NOMERGE_RULE@
 multiload_gschema_in_files = org.mate.panel.applet.multiload.gschema.xml.in
 gsettings_SCHEMAS = $(multiload_gschema_in_files:.xml.in=.xml)
 @GSETTINGS_RULES@
 
 EXTRA_DIST =							\
-	org.mate.applets.MultiLoadApplet.mate-panel-applet.in.in	\
+	$(applet_in_files).in	\
 	$(service_in_files)					\
 	$(multiload_gschema_in_files)				\
 	$(ui_DATA)
@@ -44,8 +43,8 @@ uidir		= $(datadir)/mate/ui
 ui_DATA		= multiload-applet-menu.xml
 
 appletdir       = $(datadir)/mate-panel/applets
-applet_in_files = org.mate.applets.MultiLoadApplet.mate-panel-applet.in
-applet_DATA     = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet)
+applet_in_files = org.mate.applets.MultiLoadApplet.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 \
@@ -53,7 +52,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.MultiLoadAppletFactory.service.in
@@ -64,6 +64,6 @@ org.mate.panel.applet.MultiLoadAppletFactory.service: $(service_in_files)
             -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
             $< > $@
 
-CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS) *.gschema.valid
+CLEANFILES = $(applet_DATA) $(applet_in_files) $(service_DATA) $(gsettings_SCHEMAS) *.gschema.valid
 
 -include $(top_srcdir)/git.mk
diff --git a/multiload/org.mate.applets.MultiLoadApplet.mate-panel-applet.desktop.in.in b/multiload/org.mate.applets.MultiLoadApplet.mate-panel-applet.desktop.in.in
new file mode 100644
index 00000000..3eacb2fb
--- /dev/null
+++ b/multiload/org.mate.applets.MultiLoadApplet.mate-panel-applet.desktop.in.in
@@ -0,0 +1,17 @@
+[Applet Factory]
+Id=MultiLoadAppletFactory
+Location=@LIBEXECDIR@/mate-multiload-applet
+Name=MultiLoad Applet Factory
+Description=Factory for creating the load applet.
+
+[MultiLoadApplet]
+Name=System Monitor
+Description=A system load indicator
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+Icon=utilities-system-monitor
+MateComponentId=OAFIID:MATE_MultiLoadApplet
+X-MATE-Bugzilla-Bugzilla=MATE
+X-MATE-Bugzilla-Product=mate-applets
+X-MATE-Bugzilla-Component=multiload
+X-MATE-Bugzilla-Version=@VERSION@
+X-MATE-Bugzilla-OtherBinaries=multiload-applet-2
diff --git a/multiload/org.mate.applets.MultiLoadApplet.mate-panel-applet.in.in b/multiload/org.mate.applets.MultiLoadApplet.mate-panel-applet.in.in
deleted file mode 100644
index ad17fffe..00000000
--- a/multiload/org.mate.applets.MultiLoadApplet.mate-panel-applet.in.in
+++ /dev/null
@@ -1,16 +0,0 @@
-[Applet Factory]
-Id=MultiLoadAppletFactory
-Location=@LIBEXECDIR@/mate-multiload-applet
-Name=MultiLoad Applet Factory
-Description=Factory for creating the load applet.
-
-[MultiLoadApplet]
-_Name=System Monitor
-_Description=A system load indicator
-Icon=utilities-system-monitor
-MateComponentId=OAFIID:MATE_MultiLoadApplet
-X-MATE-Bugzilla-Bugzilla=MATE
-X-MATE-Bugzilla-Product=mate-applets
-X-MATE-Bugzilla-Component=multiload
-X-MATE-Bugzilla-Version=@VERSION@
-X-MATE-Bugzilla-OtherBinaries=multiload-applet-2
-- 
cgit v1.2.1