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

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

(limited to 'trashapplet')

diff --git a/trashapplet/Makefile.am b/trashapplet/Makefile.am
index 27160254..7941dba2 100644
--- a/trashapplet/Makefile.am
+++ b/trashapplet/Makefile.am
@@ -1,8 +1,8 @@
 SUBDIRS = src docs
 
 appletdir       = $(datadir)/mate-panel/applets
-applet_in_files = org.mate.applets.TrashApplet.mate-panel-applet.in
-applet_DATA     = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet)
+applet_in_files = org.mate.applets.TrashApplet.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 \
@@ -10,7 +10,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.TrashAppletFactory.service.in
@@ -28,10 +29,10 @@ builder_DATA = trashapplet-empty-progress.ui
 
 EXTRA_DIST = \
 	$(ui_DATA) \
-	org.mate.applets.TrashApplet.mate-panel-applet.in.in \
+	$(applet_in_files).in	\
 	$(service_in_files) \
 	$(builder_DATA)
 
-CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA)
+CLEANFILES = $(applet_DATA) $(applet_in_files) $(service_DATA)
 
 -include $(top_srcdir)/git.mk
diff --git a/trashapplet/org.mate.applets.TrashApplet.mate-panel-applet.desktop.in.in b/trashapplet/org.mate.applets.TrashApplet.mate-panel-applet.desktop.in.in
new file mode 100644
index 00000000..77161ccc
--- /dev/null
+++ b/trashapplet/org.mate.applets.TrashApplet.mate-panel-applet.desktop.in.in
@@ -0,0 +1,17 @@
+[Applet Factory]
+Id=TrashAppletFactory
+Location=@LIBEXECDIR@/trashapplet
+Name=Trash Applet Factory
+Description=Trash Applet Factory
+
+[TrashApplet]
+Name=Trash
+Description=Go to Trash
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+Icon=user-trash-full
+MateComponentId=OAFIID:MATE_Panel_TrashApplet
+X-MATE-Bugzilla-Bugzilla=MATE
+X-MATE-Bugzilla-Product=mate-applets
+X-MATE-Bugzilla-Component=trash applet
+X-MATE-Bugzilla-Version=@VERSION@
+X-MATE-Bugzilla-OtherBinaries=trashapplet
diff --git a/trashapplet/org.mate.applets.TrashApplet.mate-panel-applet.in.in b/trashapplet/org.mate.applets.TrashApplet.mate-panel-applet.in.in
deleted file mode 100644
index 028de62e..00000000
--- a/trashapplet/org.mate.applets.TrashApplet.mate-panel-applet.in.in
+++ /dev/null
@@ -1,16 +0,0 @@
-[Applet Factory]
-Id=TrashAppletFactory
-Location=@LIBEXECDIR@/trashapplet
-Name=Trash Applet Factory
-Description=Trash Applet Factory
-
-[TrashApplet]
-_Name=Trash
-_Description=Go to Trash
-Icon=user-trash-full
-MateComponentId=OAFIID:MATE_Panel_TrashApplet
-X-MATE-Bugzilla-Bugzilla=MATE
-X-MATE-Bugzilla-Product=mate-applets
-X-MATE-Bugzilla-Component=trash applet
-X-MATE-Bugzilla-Version=@VERSION@
-X-MATE-Bugzilla-OtherBinaries=trashapplet
-- 
cgit v1.2.1