From c16dd6cc8260871d510b1d2ca27c5f5bbc3cb87f Mon Sep 17 00:00:00 2001 From: Wu Xiaotian Date: Mon, 28 Oct 2019 17:28:03 +0800 Subject: migrate from intltools to gettext --- mate-volume-control/Makefile.am | 9 ++++++--- ...org.mate.applets.GvcApplet.mate-panel-applet.desktop.in.in | 11 +++++++++++ .../org.mate.applets.GvcApplet.mate-panel-applet.in.in | 11 ----------- 3 files changed, 17 insertions(+), 14 deletions(-) create mode 100644 mate-volume-control/org.mate.applets.GvcApplet.mate-panel-applet.desktop.in.in delete mode 100644 mate-volume-control/org.mate.applets.GvcApplet.mate-panel-applet.in.in (limited to 'mate-volume-control') diff --git a/mate-volume-control/Makefile.am b/mate-volume-control/Makefile.am index 3812a52..68913ac 100644 --- a/mate-volume-control/Makefile.am +++ b/mate-volume-control/Makefile.am @@ -28,14 +28,16 @@ if ENABLE_PANELAPPLET APPLET_LOCATION = $(libexecdir)/mate-volume-control-applet appletsdir = $(datadir)/mate-panel/applets -applets_in_files = org.mate.applets.GvcApplet.mate-panel-applet.in -applets_DATA = $(applets_in_files:.mate-panel-applet.in=.mate-panel-applet) +applets_in_files = org.mate.applets.GvcApplet.mate-panel-applet.desktop.in +applets_DATA = $(applets_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet) $(applets_in_files): $(applets_in_files).in Makefile $(AM_V_GEN)sed \ -e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \ $< > $@ -%.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 + +$(applets_DATA): $(applets_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.GvcAppletFactory.service.in @@ -125,6 +127,7 @@ BUILT_SOURCES = \ $(NULL) CLEANFILES = \ + $(applets_in_files) \ $(BUILT_SOURCES) \ $(NULL) diff --git a/mate-volume-control/org.mate.applets.GvcApplet.mate-panel-applet.desktop.in.in b/mate-volume-control/org.mate.applets.GvcApplet.mate-panel-applet.desktop.in.in new file mode 100644 index 0000000..46a8374 --- /dev/null +++ b/mate-volume-control/org.mate.applets.GvcApplet.mate-panel-applet.desktop.in.in @@ -0,0 +1,11 @@ +[Applet Factory] +Id=GvcAppletFactory +Location=@LOCATION@ +Name=Volume Control Factory +Description=Volume Control Factory + +[GvcApplet] +Name=Volume Control +Description=Control multimedia volume +Icon=multimedia-volume-control + diff --git a/mate-volume-control/org.mate.applets.GvcApplet.mate-panel-applet.in.in b/mate-volume-control/org.mate.applets.GvcApplet.mate-panel-applet.in.in deleted file mode 100644 index ca9f5d4..0000000 --- a/mate-volume-control/org.mate.applets.GvcApplet.mate-panel-applet.in.in +++ /dev/null @@ -1,11 +0,0 @@ -[Applet Factory] -Id=GvcAppletFactory -Location=@LOCATION@ -_Name=Volume Control Factory -_Description=Volume Control Factory - -[GvcApplet] -_Name=Volume Control -_Description=Control multimedia volume -Icon=multimedia-volume-control - -- cgit v1.2.1