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/inhibit/Makefile.am                             | 16 ++++++++--------
 ...g.mate.InhibitApplet.mate-panel-applet.desktop.in.in | 17 +++++++++++++++++
 .../org.mate.InhibitApplet.mate-panel-applet.in.in      | 16 ----------------
 3 files changed, 25 insertions(+), 24 deletions(-)
 create mode 100644 applets/inhibit/org.mate.InhibitApplet.mate-panel-applet.desktop.in.in
 delete mode 100644 applets/inhibit/org.mate.InhibitApplet.mate-panel-applet.in.in

(limited to 'applets/inhibit')

diff --git a/applets/inhibit/Makefile.am b/applets/inhibit/Makefile.am
index 1b10447..3ec2f90 100644
--- a/applets/inhibit/Makefile.am
+++ b/applets/inhibit/Makefile.am
@@ -39,16 +39,17 @@ mate_inhibit_applet_LDADD =					\
 	$(PANEL_LIBS)
 
 appletdir       = $(datadir)/mate-panel/applets
-applet_in_files = org.mate.InhibitApplet.mate-panel-applet.in
-applet_DATA     = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet)
+applet_in_files = org.mate.InhibitApplet.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_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
+$(applet_DATA): $(applet_in_files)
+	$(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.InhibitAppletFactory.service.in
@@ -62,7 +63,6 @@ org.mate.panel.applet.InhibitAppletFactory.service: $(service_in_files)
 uidir   = $(datadir)/mate-power-manager/ui
 ui_DATA = inhibit-applet-menu.xml
 
-EXTRA_DIST = org.mate.InhibitApplet.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)
+DISTCLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA)
diff --git a/applets/inhibit/org.mate.InhibitApplet.mate-panel-applet.desktop.in.in b/applets/inhibit/org.mate.InhibitApplet.mate-panel-applet.desktop.in.in
new file mode 100644
index 0000000..645fc21
--- /dev/null
+++ b/applets/inhibit/org.mate.InhibitApplet.mate-panel-applet.desktop.in.in
@@ -0,0 +1,17 @@
+[Applet Factory]
+Id=InhibitAppletFactory
+Location=@LIBEXECDIR@/mate-inhibit-applet
+Name=Inhibit Applet Factory
+Description=Factory for Inhibit Applet
+
+[InhibitApplet]
+Name=Inhibit Applet
+Description=Allows user to inhibit automatic power saving
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+Icon=mate-inhibit-applet
+MateComponentId=OAFIID:MATE_InhibitApplet
+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-inhibit-applet
diff --git a/applets/inhibit/org.mate.InhibitApplet.mate-panel-applet.in.in b/applets/inhibit/org.mate.InhibitApplet.mate-panel-applet.in.in
deleted file mode 100644
index d65060b..0000000
--- a/applets/inhibit/org.mate.InhibitApplet.mate-panel-applet.in.in
+++ /dev/null
@@ -1,16 +0,0 @@
-[Applet Factory]
-Id=InhibitAppletFactory
-Location=@LIBEXECDIR@/mate-inhibit-applet
-_Name=Inhibit Applet Factory
-_Description=Factory for Inhibit Applet
-
-[InhibitApplet]
-_Name=Inhibit Applet
-_Description=Allows user to inhibit automatic power saving
-Icon=mate-inhibit-applet
-MateComponentId=OAFIID:MATE_InhibitApplet
-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-inhibit-applet
-- 
cgit v1.2.1