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/notification_area/Makefile.am                 | 14 +++++++-------
 ...ficationAreaApplet.mate-panel-applet.desktop.in.in | 19 +++++++++++++++++++
 ...nel.NotificationAreaApplet.mate-panel-applet.in.in | 18 ------------------
 3 files changed, 26 insertions(+), 25 deletions(-)
 create mode 100644 applets/notification_area/org.mate.panel.NotificationAreaApplet.mate-panel-applet.desktop.in.in
 delete mode 100644 applets/notification_area/org.mate.panel.NotificationAreaApplet.mate-panel-applet.in.in

(limited to 'applets/notification_area')

diff --git a/applets/notification_area/Makefile.am b/applets/notification_area/Makefile.am
index 57ee0a3b..f7b68110 100644
--- a/applets/notification_area/Makefile.am
+++ b/applets/notification_area/Makefile.am
@@ -70,8 +70,11 @@ notification_area_applet_CFLAGS = $(AM_CFLAGS)
 endif
 
 appletdir       = $(datadir)/mate-panel/applets
-applet_in_files = org.mate.panel.NotificationAreaApplet.mate-panel-applet.in
-applet_DATA     = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet)
+applet_in_files = org.mate.panel.NotificationAreaApplet.mate-panel-applet.desktop.in
+applet_DATA     = $(applet_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet)
+
+$(applet_DATA): $(applet_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --keyword Name --keyword Description --template $< -d $(top_srcdir)/po -o $@
 
 $(applet_in_files): $(applet_in_files).in Makefile
 	$(AM_V_GEN)sed \
@@ -80,8 +83,6 @@ $(applet_in_files): $(applet_in_files).in Makefile
 		-e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
 		$< > $@
 
-@PANEL_INTLTOOL_MATE_PANEL_APPLET_RULE@
-
 if !NOTIFICATION_AREA_INPROCESS
 servicedir       = $(datadir)/dbus-1/services
 service_in_files = org.mate.panel.applet.NotificationAreaAppletFactory.service.in
@@ -110,11 +111,10 @@ BUILT_SOURCES = 		\
 	na-resources.c	\
 	na-resources.h
 
-@INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
 
 EXTRA_DIST =								\
-	org.mate.panel.NotificationAreaApplet.mate-panel-applet.in.in	\
+	org.mate.panel.NotificationAreaApplet.mate-panel-applet.desktop.in.in	\
 	$(notification_area_gschemas_in)				\
 	$(ui_FILES)	\
 	na.gresource.xml \
@@ -122,7 +122,7 @@ EXTRA_DIST =								\
 
 CLEANFILES =			\
 	$(applet_DATA) 		\
-	$(applet_DATA).in	\
+	$(applet_in_files)	\
 	$(service_DATA)		\
 	$(gsettings_SCHEMAS)
 
diff --git a/applets/notification_area/org.mate.panel.NotificationAreaApplet.mate-panel-applet.desktop.in.in b/applets/notification_area/org.mate.panel.NotificationAreaApplet.mate-panel-applet.desktop.in.in
new file mode 100644
index 00000000..f7652db6
--- /dev/null
+++ b/applets/notification_area/org.mate.panel.NotificationAreaApplet.mate-panel-applet.desktop.in.in
@@ -0,0 +1,19 @@
+[Applet Factory]
+Id=NotificationAreaAppletFactory
+InProcess=@IN_PROCESS@
+Location=@LOCATION@
+Name=Notification Area Factory
+Description=Factory for notification area
+
+[NotificationArea]
+Name=Notification Area
+Description=Area where notification icons appear
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+Icon=mate-panel-notification-area
+MateComponentId=OAFIID:MATE_NotificationAreaApplet;OAFIID:MATE_SystemTrayApplet;
+Platforms=X11;
+X-MATE-Bugzilla-Bugzilla=MATE
+X-MATE-Bugzilla-Product=mate-panel
+X-MATE-Bugzilla-Component=notification area
+X-MATE-Bugzilla-Version=@VERSION@
+X-MATE-Bugzilla-OtherBinaries=notification-area-applet
diff --git a/applets/notification_area/org.mate.panel.NotificationAreaApplet.mate-panel-applet.in.in b/applets/notification_area/org.mate.panel.NotificationAreaApplet.mate-panel-applet.in.in
deleted file mode 100644
index 9246ac9c..00000000
--- a/applets/notification_area/org.mate.panel.NotificationAreaApplet.mate-panel-applet.in.in
+++ /dev/null
@@ -1,18 +0,0 @@
-[Applet Factory]
-Id=NotificationAreaAppletFactory
-InProcess=@IN_PROCESS@
-Location=@LOCATION@
-_Name=Notification Area Factory
-_Description=Factory for notification area
-
-[NotificationArea]
-_Name=Notification Area
-_Description=Area where notification icons appear
-Icon=mate-panel-notification-area
-MateComponentId=OAFIID:MATE_NotificationAreaApplet;OAFIID:MATE_SystemTrayApplet;
-Platforms=X11;
-X-MATE-Bugzilla-Bugzilla=MATE
-X-MATE-Bugzilla-Product=mate-panel
-X-MATE-Bugzilla-Component=notification area
-X-MATE-Bugzilla-Version=@VERSION@
-X-MATE-Bugzilla-OtherBinaries=notification-area-applet
-- 
cgit v1.2.1