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

---
 drivemount/Makefile.am                                  | 14 +++++++-------
 ...ets.DriveMountApplet.mate-panel-applet.desktop.in.in | 17 +++++++++++++++++
 ...ate.applets.DriveMountApplet.mate-panel-applet.in.in | 16 ----------------
 3 files changed, 24 insertions(+), 23 deletions(-)
 create mode 100644 drivemount/org.mate.applets.DriveMountApplet.mate-panel-applet.desktop.in.in
 delete mode 100644 drivemount/org.mate.applets.DriveMountApplet.mate-panel-applet.in.in

(limited to 'drivemount')

diff --git a/drivemount/Makefile.am b/drivemount/Makefile.am
index 328f08f1..7656efd2 100644
--- a/drivemount/Makefile.am
+++ b/drivemount/Makefile.am
@@ -23,21 +23,20 @@ mate_drivemount_applet_LDADD =	\
 uidir           = $(datadir)/mate/ui
 ui_DATA         = drivemount-applet-menu.xml
 
-@INTLTOOL_XML_NOMERGE_RULE@
 drivemount_gschema_in_files = org.mate.drivemount.gschema.xml.in
 gsettings_SCHEMAS = $(drivemount_gschema_in_files:.xml.in=.xml)
 @GSETTINGS_RULES@
 
 EXTRA_DIST =                                                    \
-        org.mate.applets.DriveMountApplet.mate-panel-applet.in.in        \
+        $(applet_in_files).in                                   \
         $(service_in_files)                                     \
-        $(drivemount_gschema_in_files)                           \
+        $(drivemount_gschema_in_files)                          \
         $(ui_DATA)
 
 
 appletdir       = $(datadir)/mate-panel/applets
-applet_in_files = org.mate.applets.DriveMountApplet.mate-panel-applet.in
-applet_DATA     = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet)
+applet_in_files = org.mate.applets.DriveMountApplet.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 \
@@ -45,7 +44,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.DriveMountAppletFactory.service.in
@@ -56,6 +56,6 @@ org.mate.panel.applet.DriveMountAppletFactory.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
 
 -include $(top_srcdir)/git.mk
diff --git a/drivemount/org.mate.applets.DriveMountApplet.mate-panel-applet.desktop.in.in b/drivemount/org.mate.applets.DriveMountApplet.mate-panel-applet.desktop.in.in
new file mode 100644
index 00000000..637628d2
--- /dev/null
+++ b/drivemount/org.mate.applets.DriveMountApplet.mate-panel-applet.desktop.in.in
@@ -0,0 +1,17 @@
+[Applet Factory]
+Id=DriveMountAppletFactory
+Location=@LIBEXECDIR@/mate-drivemount-applet
+Name=Drive Mount Applet Factory
+Description=Factory for drive mount applet
+
+[DriveMountApplet]
+Name=Disk Mounter
+Description=Mount local disks and devices
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+Icon=media-floppy
+MateComponentId=OAFIID:MATE_DriveMountApplet
+X-MATE-Bugzilla-Bugzilla=MATE
+X-MATE-Bugzilla-Product=mate-applets
+X-MATE-Bugzilla-Component=Disk Mounter (drivemount)
+X-MATE-Bugzilla-Version=@VERSION@
+X-MATE-Bugzilla-OtherBinaries=drivemount_applet2
diff --git a/drivemount/org.mate.applets.DriveMountApplet.mate-panel-applet.in.in b/drivemount/org.mate.applets.DriveMountApplet.mate-panel-applet.in.in
deleted file mode 100644
index 39bae82b..00000000
--- a/drivemount/org.mate.applets.DriveMountApplet.mate-panel-applet.in.in
+++ /dev/null
@@ -1,16 +0,0 @@
-[Applet Factory]
-Id=DriveMountAppletFactory
-Location=@LIBEXECDIR@/mate-drivemount-applet
-_Name=Drive Mount Applet Factory
-_Description=Factory for drive mount applet
-
-[DriveMountApplet]
-_Name=Disk Mounter
-_Description=Mount local disks and devices
-Icon=media-floppy
-MateComponentId=OAFIID:MATE_DriveMountApplet
-X-MATE-Bugzilla-Bugzilla=MATE
-X-MATE-Bugzilla-Product=mate-applets
-X-MATE-Bugzilla-Component=Disk Mounter (drivemount)
-X-MATE-Bugzilla-Version=@VERSION@
-X-MATE-Bugzilla-OtherBinaries=drivemount_applet2
-- 
cgit v1.2.1