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

---
 netspeed/data/Makefile.am                                | 13 +++++++------
 ...pplets.NetspeedApplet.mate-panel-applet.desktop.in.in | 16 ++++++++++++++++
 ...g.mate.applets.NetspeedApplet.mate-panel-applet.in.in | 15 ---------------
 3 files changed, 23 insertions(+), 21 deletions(-)
 create mode 100644 netspeed/data/org.mate.applets.NetspeedApplet.mate-panel-applet.desktop.in.in
 delete mode 100644 netspeed/data/org.mate.applets.NetspeedApplet.mate-panel-applet.in.in

(limited to 'netspeed')

diff --git a/netspeed/data/Makefile.am b/netspeed/data/Makefile.am
index 5bc783cf..7875af7d 100644
--- a/netspeed/data/Makefile.am
+++ b/netspeed/data/Makefile.am
@@ -1,14 +1,16 @@
 APPLET_LOCATION = $(libexecdir)/mate-netspeed-applet
 
 appletdir       = $(datadir)/mate-panel/applets
-applet_in_files = org.mate.applets.NetspeedApplet.mate-panel-applet.in
-applet_DATA     = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet)
+applet_in_files = org.mate.applets.NetspeedApplet.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 \
 		-e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \
 		$< > $@
-%.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 $@
 
 xmluidir   = $(datadir)/mate/ui
 xmlui_DATA = netspeed-menu.xml
@@ -24,11 +26,10 @@ org.mate.panel.applet.NetspeedAppletFactory.service: $(service_in_files)
 
 netspeed_gschema_in_files = org.mate.panel.applet.netspeed.gschema.xml.in
 gsettings_SCHEMAS = $(netspeed_gschema_in_files:.xml.in=.xml)
-@INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
 
 EXTRA_DIST = \
-	org.mate.applets.NetspeedApplet.mate-panel-applet.in.in \
+	$(applet_in_files).in	\
 	$(xmlui_DATA) \
 	$(service_in_files) \
 	$(netspeed_gschema_in_files)
@@ -37,7 +38,7 @@ CLEANFILES = \
 	$(gsettings_SCHEMAS) \
 	$(service_DATA) \
 	$(applet_in_files) \
-	org.mate.applets.NetspeedApplet.mate-panel-applet
+	$(applet_DATA)
 
 
 -include $(top_srcdir)/git.mk
diff --git a/netspeed/data/org.mate.applets.NetspeedApplet.mate-panel-applet.desktop.in.in b/netspeed/data/org.mate.applets.NetspeedApplet.mate-panel-applet.desktop.in.in
new file mode 100644
index 00000000..fdc64666
--- /dev/null
+++ b/netspeed/data/org.mate.applets.NetspeedApplet.mate-panel-applet.desktop.in.in
@@ -0,0 +1,16 @@
+[Applet Factory]
+Id=NetspeedAppletFactory
+Location=@LOCATION@
+Name=Netspeed Applet Factory
+Description=Netspeed Applet
+
+[NetspeedApplet]
+Name=Network Monitor
+Description=Netspeed Applet
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+Icon=mate-netspeed-applet
+MateComponentId=OAFIID:MATE_NetspeedApplet
+X-MATE-Bugzilla-Bugzilla=MATE
+X-MATE-Bugzilla-Product=mate-netspeed
+X-MATE-Bugzilla-Component=netspeed
+X-MATE-Bugzilla-Version=@VERSION@
diff --git a/netspeed/data/org.mate.applets.NetspeedApplet.mate-panel-applet.in.in b/netspeed/data/org.mate.applets.NetspeedApplet.mate-panel-applet.in.in
deleted file mode 100644
index 7563a229..00000000
--- a/netspeed/data/org.mate.applets.NetspeedApplet.mate-panel-applet.in.in
+++ /dev/null
@@ -1,15 +0,0 @@
-[Applet Factory]
-Id=NetspeedAppletFactory
-Location=@LOCATION@
-_Name=Netspeed Applet Factory
-_Description=Netspeed Applet
- 
-[NetspeedApplet]
-_Name=Network Monitor
-_Description=Netspeed Applet
-Icon=mate-netspeed-applet
-MateComponentId=OAFIID:MATE_NetspeedApplet
-X-MATE-Bugzilla-Bugzilla=MATE
-X-MATE-Bugzilla-Product=mate-netspeed
-X-MATE-Bugzilla-Component=netspeed
-X-MATE-Bugzilla-Version=@VERSION@
-- 
cgit v1.2.1