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

---
 charpick/Makefile.am                                    | 12 ++++++------
 ...ets.CharpickerApplet.mate-panel-applet.desktop.in.in | 17 +++++++++++++++++
 ...ate.applets.CharpickerApplet.mate-panel-applet.in.in | 16 ----------------
 3 files changed, 23 insertions(+), 22 deletions(-)
 create mode 100644 charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.desktop.in.in
 delete mode 100644 charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.in.in

(limited to 'charpick')

diff --git a/charpick/Makefile.am b/charpick/Makefile.am
index d1c6abda..ee1728cd 100644
--- a/charpick/Makefile.am
+++ b/charpick/Makefile.am
@@ -20,8 +20,8 @@ mate_charpick_applet_LDADD = \
 		       $(GUCHARMAP_LIBS)
 
 appletdir       = $(datadir)/mate-panel/applets
-applet_in_files = org.mate.applets.CharpickerApplet.mate-panel-applet.in
-applet_DATA     = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet)
+applet_in_files = org.mate.applets.CharpickerApplet.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 \
@@ -29,7 +29,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_in_files = org.mate.panel.applet.CharpickerAppletFactory.service.in
@@ -40,7 +41,6 @@ org.mate.panel.applet.CharpickerAppletFactory.service: $(service_in_files)
             -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
             $< > $@
 
-@INTLTOOL_XML_NOMERGE_RULE@
 charpick_gschema_in_files = org.mate.panel.applet.charpick.gschema.xml.in
 gsettings_SCHEMAS = $(charpick_gschema_in_files:.xml.in=.xml)
 @GSETTINGS_RULES@
@@ -48,10 +48,10 @@ gsettings_SCHEMAS = $(charpick_gschema_in_files:.xml.in=.xml)
 uidir = $(datadir)/mate/ui
 ui_DATA = charpick-applet-menu.xml
 
-CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS) *.gschema.valid
+CLEANFILES = $(applet_DATA)  $(applet_in_files) $(service_DATA) $(gsettings_SCHEMAS) *.gschema.valid
 
 EXTRA_DIST =							\
-	org.mate.applets.CharpickerApplet.mate-panel-applet.in.in	\
+	$(applet_in_files).in	\
 	$(service_in_files)					\
 	$(ui_DATA)						\
 	$(charpick_gschema_in_files)
diff --git a/charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.desktop.in.in b/charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.desktop.in.in
new file mode 100644
index 00000000..65a3c76d
--- /dev/null
+++ b/charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.desktop.in.in
@@ -0,0 +1,17 @@
+[Applet Factory]
+Id=CharpickerAppletFactory
+Location=@LIBEXECDIR@/mate-charpick-applet
+Name=Charpicker Applet Factory
+Description=Charpicker Applet Factory
+
+[CharpickerApplet]
+Name=Character Palette
+Description=Insert characters
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+Icon=accessories-character-map
+MateComponentId=OAFIID:MATE_CharpickerApplet
+X-MATE-Bugzilla-Bugzilla=MATE
+X-MATE-Bugzilla-Product=mate-applets
+X-MATE-Bugzilla-Component=charpick
+X-MATE-Bugzilla-Version=@VERSION@
+X-MATE-Bugzilla-OtherBinaries=charpick_applet2
diff --git a/charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.in.in b/charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.in.in
deleted file mode 100644
index 3642f058..00000000
--- a/charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.in.in
+++ /dev/null
@@ -1,16 +0,0 @@
-[Applet Factory]
-Id=CharpickerAppletFactory
-Location=@LIBEXECDIR@/mate-charpick-applet
-_Name=Charpicker Applet Factory
-_Description=Charpicker Applet Factory
-
-[CharpickerApplet]
-_Name=Character Palette
-_Description=Insert characters
-Icon=accessories-character-map
-MateComponentId=OAFIID:MATE_CharpickerApplet
-X-MATE-Bugzilla-Bugzilla=MATE
-X-MATE-Bugzilla-Product=mate-applets
-X-MATE-Bugzilla-Component=charpick
-X-MATE-Bugzilla-Version=@VERSION@
-X-MATE-Bugzilla-OtherBinaries=charpick_applet2
-- 
cgit v1.2.1