From 4b6d373147649c13d6ea625c31f15a34ced324e3 Mon Sep 17 00:00:00 2001
From: Wu Xiaotian <yetist@gmail.com>
Date: Wed, 30 Oct 2019 11:50:07 +0800
Subject: migrate from intltool to gettext

---
 applets/brightness/Makefile.am                          | 15 ++++++++-------
 ...ate.BrightnessApplet.mate-panel-applet.desktop.in.in | 17 +++++++++++++++++
 .../org.mate.BrightnessApplet.mate-panel-applet.in.in   | 16 ----------------
 3 files changed, 25 insertions(+), 23 deletions(-)
 create mode 100644 applets/brightness/org.mate.BrightnessApplet.mate-panel-applet.desktop.in.in
 delete mode 100644 applets/brightness/org.mate.BrightnessApplet.mate-panel-applet.in.in

(limited to 'applets/brightness')

diff --git a/applets/brightness/Makefile.am b/applets/brightness/Makefile.am
index bcc28d2..4560164 100644
--- a/applets/brightness/Makefile.am
+++ b/applets/brightness/Makefile.am
@@ -39,17 +39,18 @@ mate_brightness_applet_LDADD =					\
 	$(PANEL_LIBS)
 
 appletdir       = $(datadir)/mate-panel/applets
-applet_in_files = org.mate.BrightnessApplet.mate-panel-applet.in
-applet_DATA     = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet)
+applet_in_files = org.mate.BrightnessApplet.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 \
+$(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
+	$(AM_V_GEN) sed \
             -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
             -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
-
 servicedir       = $(datadir)/dbus-1/services
 service_in_files = org.mate.panel.applet.BrightnessAppletFactory.service.in
 service_DATA     = $(service_in_files:.service.in=.service)
@@ -62,7 +63,7 @@ org.mate.panel.applet.BrightnessAppletFactory.service: $(service_in_files)
 uidir   = $(datadir)/mate-power-manager/ui
 ui_DATA = brightness-applet-menu.xml
 
-EXTRA_DIST = org.mate.BrightnessApplet.mate-panel-applet.in.in $(ui_DATA) $(service_in_files)
+EXTRA_DIST = $(applet_in_files).in $(ui_DATA) $(service_in_files)
 
 DISTCLEANFILES =						\
 	$(applet_DATA) $(applet_DATA).in $(service_DATA)
diff --git a/applets/brightness/org.mate.BrightnessApplet.mate-panel-applet.desktop.in.in b/applets/brightness/org.mate.BrightnessApplet.mate-panel-applet.desktop.in.in
new file mode 100644
index 0000000..bddc939
--- /dev/null
+++ b/applets/brightness/org.mate.BrightnessApplet.mate-panel-applet.desktop.in.in
@@ -0,0 +1,17 @@
+[Applet Factory]
+Id=BrightnessAppletFactory
+Location=@LIBEXECDIR@/mate-brightness-applet
+Name=Brightness Applet Factory
+Description=Factory for Brightness Applet
+
+[BrightnessApplet]
+Name=Brightness Applet
+Description=Adjusts Laptop panel brightness
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+Icon=mate-brightness-applet
+MateComponentId=OAFIID:MATE_BrightnessApplet
+X-MATE-Bugzilla-Bugzilla=MATE
+X-MATE-Bugzilla-Product=mate-power-manager
+X-MATE-Bugzilla-Component=applets
+X-MATE-Bugzilla-Version=@VERSION@
+X-MATE-Bugzilla-OtherBinaries=mate-brightness-applet
diff --git a/applets/brightness/org.mate.BrightnessApplet.mate-panel-applet.in.in b/applets/brightness/org.mate.BrightnessApplet.mate-panel-applet.in.in
deleted file mode 100644
index 3a3a0a8..0000000
--- a/applets/brightness/org.mate.BrightnessApplet.mate-panel-applet.in.in
+++ /dev/null
@@ -1,16 +0,0 @@
-[Applet Factory]
-Id=BrightnessAppletFactory
-Location=@LIBEXECDIR@/mate-brightness-applet
-_Name=Brightness Applet Factory
-_Description=Factory for Brightness Applet
-
-[BrightnessApplet]
-_Name=Brightness Applet
-_Description=Adjusts Laptop panel brightness
-Icon=mate-brightness-applet
-MateComponentId=OAFIID:MATE_BrightnessApplet
-X-MATE-Bugzilla-Bugzilla=MATE
-X-MATE-Bugzilla-Product=mate-power-manager
-X-MATE-Bugzilla-Component=applets
-X-MATE-Bugzilla-Version=@VERSION@
-X-MATE-Bugzilla-OtherBinaries=mate-brightness-applet
-- 
cgit v1.2.1