From f5354df76377627dde56b079c9328b46865033d2 Mon Sep 17 00:00:00 2001
From: Wu Xiaotian <yetist@gmail.com>
Date: Wed, 30 Oct 2019 20:33:54 +0800
Subject: migrate from intltool to gettext

---
 applets/fish/Makefile.am                              | 12 ++++++------
 ...e.panel.FishApplet.mate-panel-applet.desktop.in.in | 19 +++++++++++++++++++
 .../org.mate.panel.FishApplet.mate-panel-applet.in.in | 18 ------------------
 3 files changed, 25 insertions(+), 24 deletions(-)
 create mode 100644 applets/fish/org.mate.panel.FishApplet.mate-panel-applet.desktop.in.in
 delete mode 100644 applets/fish/org.mate.panel.FishApplet.mate-panel-applet.in.in

(limited to 'applets/fish')

diff --git a/applets/fish/Makefile.am b/applets/fish/Makefile.am
index d9a894f5..6b823e09 100644
--- a/applets/fish/Makefile.am
+++ b/applets/fish/Makefile.am
@@ -40,8 +40,8 @@ fish_applet_CFLAGS = $(AM_CFLAGS)
 endif
 
 appletdir       = $(datadir)/mate-panel/applets
-applet_in_files = org.mate.panel.FishApplet.mate-panel-applet.in
-applet_DATA     = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet)
+applet_in_files = org.mate.panel.FishApplet.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 \
@@ -50,7 +50,8 @@ $(applet_in_files): $(applet_in_files).in Makefile
 		-e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
 		$< > $@
 
-@PANEL_INTLTOOL_MATE_PANEL_APPLET_RULE@
+$(applet_DATA): $(applet_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --keyword Name --keyword Description --template $< -d $(top_srcdir)/po -o $@
 
 if !FISH_INPROCESS
 servicedir       = $(datadir)/dbus-1/services
@@ -87,18 +88,17 @@ BUILT_SOURCES = 		\
 
 fish_gschemas_in = org.mate.panel.applet.fish.gschema.xml.in
 gsettings_SCHEMAS = $(fish_gschemas_in:.xml.in=.xml)
-@INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
 
 EXTRA_DIST = \
 	wanda.svg \
 	$(fishbitmaps_DATA) \
-	org.mate.panel.FishApplet.mate-panel-applet.in.in \
+	org.mate.panel.FishApplet.mate-panel-applet.desktop.in.in \
 	$(service_in_files) \
 	$(ui_FILES)	\
 	fish.gresource.xml \
 	$(fish_gschemas_in)
 
-CLEANFILES = $(BUILT_SOURCES) $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS)
+CLEANFILES = $(BUILT_SOURCES) $(applet_DATA) $(applet_in_files) $(service_DATA) $(gsettings_SCHEMAS)
 
 -include $(top_srcdir)/git.mk
diff --git a/applets/fish/org.mate.panel.FishApplet.mate-panel-applet.desktop.in.in b/applets/fish/org.mate.panel.FishApplet.mate-panel-applet.desktop.in.in
new file mode 100644
index 00000000..1df3717e
--- /dev/null
+++ b/applets/fish/org.mate.panel.FishApplet.mate-panel-applet.desktop.in.in
@@ -0,0 +1,19 @@
+[Applet Factory]
+Id=FishAppletFactory
+InProcess=@IN_PROCESS@
+Location=@LOCATION@
+Name=Wanda Factory
+Description=From Whence That Stupid Fish Came
+
+[FishApplet]
+Name=Fish
+Description=Display a swimming fish or another animated creature
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+Icon=mate-panel-fish
+MateComponentId=OAFIID:MATE_FishApplet;
+Platforms=X11;Wayland;
+X-MATE-Bugzilla-Bugzilla=MATE
+X-MATE-Bugzilla-Product=mate-panel
+X-MATE-Bugzilla-Component=fish
+X-MATE-Bugzilla-Version=@VERSION@
+X-MATE-Bugzilla-OtherBinaries=fish-applet-2
diff --git a/applets/fish/org.mate.panel.FishApplet.mate-panel-applet.in.in b/applets/fish/org.mate.panel.FishApplet.mate-panel-applet.in.in
deleted file mode 100644
index 92b07c69..00000000
--- a/applets/fish/org.mate.panel.FishApplet.mate-panel-applet.in.in
+++ /dev/null
@@ -1,18 +0,0 @@
-[Applet Factory]
-Id=FishAppletFactory
-InProcess=@IN_PROCESS@
-Location=@LOCATION@
-_Name=Wanda Factory
-_Description=From Whence That Stupid Fish Came
-
-[FishApplet]
-_Name=Fish
-_Description=Display a swimming fish or another animated creature
-Icon=mate-panel-fish
-MateComponentId=OAFIID:MATE_FishApplet;
-Platforms=X11;Wayland;
-X-MATE-Bugzilla-Bugzilla=MATE
-X-MATE-Bugzilla-Product=mate-panel
-X-MATE-Bugzilla-Component=fish
-X-MATE-Bugzilla-Version=@VERSION@
-X-MATE-Bugzilla-OtherBinaries=fish-applet-2
-- 
cgit v1.2.1