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/clock/Makefile.am                            | 12 ++++++------
 ...panel.ClockApplet.mate-panel-applet.desktop.in.in | 20 ++++++++++++++++++++
 ...rg.mate.panel.ClockApplet.mate-panel-applet.in.in | 19 -------------------
 3 files changed, 26 insertions(+), 25 deletions(-)
 create mode 100644 applets/clock/org.mate.panel.ClockApplet.mate-panel-applet.desktop.in.in
 delete mode 100644 applets/clock/org.mate.panel.ClockApplet.mate-panel-applet.in.in

(limited to 'applets/clock')

diff --git a/applets/clock/Makefile.am b/applets/clock/Makefile.am
index 3b390974..fb06adb1 100644
--- a/applets/clock/Makefile.am
+++ b/applets/clock/Makefile.am
@@ -125,8 +125,8 @@ BUILT_SOURCES =					\
 	clock-typebuiltins.h
 
 appletdir       = $(datadir)/mate-panel/applets
-applet_in_files = org.mate.panel.ClockApplet.mate-panel-applet.in
-applet_DATA     = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet)
+applet_in_files = org.mate.panel.ClockApplet.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 \
@@ -135,7 +135,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 !CLOCK_INPROCESS
 servicedir       = $(datadir)/dbus-1/services
@@ -161,11 +162,10 @@ clock-resources.h: clock.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourc
 clock_gschemas_in = org.mate.panel.applet.clock.gschema.xml.in
 gsettings_SCHEMAS = $(clock_gschemas_in:.xml.in=.xml)
 
-@INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
 
 EXTRA_DIST =						\
-	org.mate.panel.ClockApplet.mate-panel-applet.in.in	\
+	org.mate.panel.ClockApplet.mate-panel-applet.desktop.in.in	\
 	$(clock_gschemas_in)				\
 	$(ui_FILES)					\
 	clock.gresource.xml				\
@@ -175,7 +175,7 @@ EXTRA_DIST =						\
 CLEANFILES =			\
 	$(BUILT_SOURCES)	\
 	$(applet_DATA) 		\
-	$(applet_DATA).in	\
+	$(applet_in_files) 	\
 	$(service_DATA)		\
 	$(polkit_DATA)		\
 	$(dbus_services_DATA)	\
diff --git a/applets/clock/org.mate.panel.ClockApplet.mate-panel-applet.desktop.in.in b/applets/clock/org.mate.panel.ClockApplet.mate-panel-applet.desktop.in.in
new file mode 100644
index 00000000..cc8a191f
--- /dev/null
+++ b/applets/clock/org.mate.panel.ClockApplet.mate-panel-applet.desktop.in.in
@@ -0,0 +1,20 @@
+[Applet Factory]
+Id=ClockAppletFactory
+InProcess=@IN_PROCESS@
+Location=@LOCATION@
+Name=Clock Applet Factory
+Description=Factory for clock applet
+
+[ClockApplet]
+Name=Clock
+Description=Get the current time and date
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+Icon=mate-panel-clock
+MateComponentId=OAFIID:MATE_ClockApplet;
+Platforms=X11;Wayland;
+X-MATE-Bugzilla-Bugzilla=MATE
+X-MATE-Bugzilla-Product=mate-panel
+X-MATE-Bugzilla-Component=clock
+X-MATE-Bugzilla-Version=@VERSION@
+X-MATE-Bugzilla-OtherBinaries=clock-applet
+
diff --git a/applets/clock/org.mate.panel.ClockApplet.mate-panel-applet.in.in b/applets/clock/org.mate.panel.ClockApplet.mate-panel-applet.in.in
deleted file mode 100644
index 5eaf19d1..00000000
--- a/applets/clock/org.mate.panel.ClockApplet.mate-panel-applet.in.in
+++ /dev/null
@@ -1,19 +0,0 @@
-[Applet Factory]
-Id=ClockAppletFactory
-InProcess=@IN_PROCESS@
-Location=@LOCATION@
-_Name=Clock Applet Factory
-_Description=Factory for clock applet
-
-[ClockApplet]
-_Name=Clock
-_Description=Get the current time and date
-Icon=mate-panel-clock
-MateComponentId=OAFIID:MATE_ClockApplet;
-Platforms=X11;Wayland;
-X-MATE-Bugzilla-Bugzilla=MATE
-X-MATE-Bugzilla-Product=mate-panel
-X-MATE-Bugzilla-Component=clock
-X-MATE-Bugzilla-Version=@VERSION@
-X-MATE-Bugzilla-OtherBinaries=clock-applet
-
-- 
cgit v1.2.1