From b91dbe12e8f334e7fbaf9a36814d36d63c94dfd4 Mon Sep 17 00:00:00 2001
From: Wu Xiaotian <yetist@gmail.com>
Date: Wed, 25 Dec 2019 17:58:28 +0800
Subject: migrate from intltools to gettext

---
 stickynotes/Makefile.am                                 | 12 ++++++------
 ...ts.StickyNotesApplet.mate-panel-applet.desktop.in.in | 17 +++++++++++++++++
 ...te.applets.StickyNotesApplet.mate-panel-applet.in.in | 16 ----------------
 3 files changed, 23 insertions(+), 22 deletions(-)
 create mode 100644 stickynotes/org.mate.applets.StickyNotesApplet.mate-panel-applet.desktop.in.in
 delete mode 100644 stickynotes/org.mate.applets.StickyNotesApplet.mate-panel-applet.in.in

(limited to 'stickynotes')

diff --git a/stickynotes/Makefile.am b/stickynotes/Makefile.am
index 8ab9f7d0..04e79144 100644
--- a/stickynotes/Makefile.am
+++ b/stickynotes/Makefile.am
@@ -4,7 +4,7 @@ SUBDIRS = pixmaps docs
 
 ui_files = stickynotes-applet-menu.xml
 builder_files = stickynotes.ui
-applet_in_files = org.mate.applets.StickyNotesApplet.mate-panel-applet.in
+applet_in_files = org.mate.applets.StickyNotesApplet.mate-panel-applet.desktop.in
 service_in_files = org.mate.panel.applet.StickyNotesAppletFactory.service.in
 schemas_in_files = stickynotes.schemas.in
 
@@ -46,13 +46,12 @@ builder_DATA = $(builder_files)
 uidir = $(datadir)/mate/ui
 ui_DATA = $(ui_files)
 
-@INTLTOOL_XML_NOMERGE_RULE@
 stickynotes_gschema_in_files = org.mate.stickynotes.gschema.xml.in
 gsettings_SCHEMAS = $(stickynotes_gschema_in_files:.xml.in=.xml)
 @GSETTINGS_RULES@
 
 appletdir   = $(datadir)/mate-panel/applets
-applet_DATA = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet)
+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 \
@@ -60,7 +59,8 @@ $(applet_in_files): $(applet_in_files).in Makefile
             -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) Makefile
+	$(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
 
 servicedir   = $(datadir)/dbus-1/services
 service_DATA = $(service_in_files:.service.in=.service)
@@ -70,7 +70,7 @@ org.mate.panel.applet.StickyNotesAppletFactory.service: $(service_in_files)
             -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
             $< > $@
 
-CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS) *.gschema.valid
+CLEANFILES = $(applet_DATA) $(applet_in_files) $(service_DATA) $(gsettings_SCHEMAS) *.gschema.valid
 
 endif
 
@@ -79,7 +79,7 @@ EXTRA_DIST = \
 	     $(ui_files) \
 	     $(stickynotes_gschema_in_files) \
              $(service_in_files) \
-	     org.mate.applets.StickyNotesApplet.mate-panel-applet.in.in
+			 $(applet_in_files).in
 
 
 -include $(top_srcdir)/git.mk
diff --git a/stickynotes/org.mate.applets.StickyNotesApplet.mate-panel-applet.desktop.in.in b/stickynotes/org.mate.applets.StickyNotesApplet.mate-panel-applet.desktop.in.in
new file mode 100644
index 00000000..7e0725cf
--- /dev/null
+++ b/stickynotes/org.mate.applets.StickyNotesApplet.mate-panel-applet.desktop.in.in
@@ -0,0 +1,17 @@
+[Applet Factory]
+Id=StickyNotesAppletFactory
+Location=@LIBEXECDIR@/stickynotes-applet
+Name=Sticky Notes Applet Factory
+Description=Sticky Notes Applet Factory
+
+[StickyNotesApplet]
+Name=Sticky Notes
+Description=Create, view, and manage sticky notes on the desktop
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+Icon=mate-sticky-notes-applet
+MateComponentId=OAFIID:MATE_StickyNotesApplet
+X-MATE-Bugzilla-Bugzilla=MATE
+X-MATE-Bugzilla-Product=mate-applets
+X-MATE-Bugzilla-Component=stickynotes
+X-MATE-Bugzilla-Version=@VERSION@
+X-MATE-Bugzilla-OtherBinaries=stickynotes-applet
diff --git a/stickynotes/org.mate.applets.StickyNotesApplet.mate-panel-applet.in.in b/stickynotes/org.mate.applets.StickyNotesApplet.mate-panel-applet.in.in
deleted file mode 100644
index 4bdf2b36..00000000
--- a/stickynotes/org.mate.applets.StickyNotesApplet.mate-panel-applet.in.in
+++ /dev/null
@@ -1,16 +0,0 @@
-[Applet Factory]
-Id=StickyNotesAppletFactory
-Location=@LIBEXECDIR@/stickynotes-applet
-_Name=Sticky Notes Applet Factory
-_Description=Sticky Notes Applet Factory
-
-[StickyNotesApplet]
-_Name=Sticky Notes
-_Description=Create, view, and manage sticky notes on the desktop
-Icon=mate-sticky-notes-applet
-MateComponentId=OAFIID:MATE_StickyNotesApplet
-X-MATE-Bugzilla-Bugzilla=MATE
-X-MATE-Bugzilla-Product=mate-applets
-X-MATE-Bugzilla-Component=stickynotes
-X-MATE-Bugzilla-Version=@VERSION@
-X-MATE-Bugzilla-OtherBinaries=stickynotes-applet
-- 
cgit v1.2.1