summaryrefslogtreecommitdiff
path: root/multiload
diff options
context:
space:
mode:
Diffstat (limited to 'multiload')
-rw-r--r--multiload/Makefile.am12
-rw-r--r--multiload/org.mate.applets.MultiLoadApplet.mate-panel-applet.desktop.in.in (renamed from multiload/org.mate.applets.MultiLoadApplet.mate-panel-applet.in.in)5
2 files changed, 9 insertions, 8 deletions
diff --git a/multiload/Makefile.am b/multiload/Makefile.am
index 2cad698c..da30c8da 100644
--- a/multiload/Makefile.am
+++ b/multiload/Makefile.am
@@ -29,13 +29,12 @@ mate_multiload_applet_LDADD = \
$(GIO_LIBS) \
-lm
-@INTLTOOL_XML_NOMERGE_RULE@
multiload_gschema_in_files = org.mate.panel.applet.multiload.gschema.xml.in
gsettings_SCHEMAS = $(multiload_gschema_in_files:.xml.in=.xml)
@GSETTINGS_RULES@
EXTRA_DIST = \
- org.mate.applets.MultiLoadApplet.mate-panel-applet.in.in \
+ $(applet_in_files).in \
$(service_in_files) \
$(multiload_gschema_in_files) \
$(ui_DATA)
@@ -44,8 +43,8 @@ uidir = $(datadir)/mate/ui
ui_DATA = multiload-applet-menu.xml
appletdir = $(datadir)/mate-panel/applets
-applet_in_files = org.mate.applets.MultiLoadApplet.mate-panel-applet.in
-applet_DATA = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet)
+applet_in_files = org.mate.applets.MultiLoadApplet.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 \
@@ -53,7 +52,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.MultiLoadAppletFactory.service.in
@@ -64,6 +64,6 @@ org.mate.panel.applet.MultiLoadAppletFactory.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/multiload/org.mate.applets.MultiLoadApplet.mate-panel-applet.in.in b/multiload/org.mate.applets.MultiLoadApplet.mate-panel-applet.desktop.in.in
index ad17fffe..3eacb2fb 100644
--- a/multiload/org.mate.applets.MultiLoadApplet.mate-panel-applet.in.in
+++ b/multiload/org.mate.applets.MultiLoadApplet.mate-panel-applet.desktop.in.in
@@ -5,8 +5,9 @@ Name=MultiLoad Applet Factory
Description=Factory for creating the load applet.
[MultiLoadApplet]
-_Name=System Monitor
-_Description=A system load indicator
+Name=System Monitor
+Description=A system load indicator
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
Icon=utilities-system-monitor
MateComponentId=OAFIID:MATE_MultiLoadApplet
X-MATE-Bugzilla-Bugzilla=MATE