diff options
Diffstat (limited to 'cpufreq')
| -rw-r--r-- | cpufreq/Makefile.am | 23 | ||||
| -rw-r--r-- | cpufreq/org.mate.applets.CPUFreqApplet.mate-panel-applet.desktop.in.in (renamed from cpufreq/org.mate.applets.CPUFreqApplet.mate-panel-applet.in.in) | 9 | ||||
| -rw-r--r-- | cpufreq/src/Makefile.am | 2 | ||||
| -rw-r--r-- | cpufreq/src/cpufreq-selector/Makefile.am | 4 | ||||
| -rw-r--r-- | cpufreq/src/cpufreq-selector/org.mate.cpufreqselector.policy.in | 4 |
5 files changed, 19 insertions, 23 deletions
diff --git a/cpufreq/Makefile.am b/cpufreq/Makefile.am index af18f188..f8136efc 100644 --- a/cpufreq/Makefile.am +++ b/cpufreq/Makefile.am @@ -1,13 +1,12 @@ SUBDIRS = help pixmaps src -@INTLTOOL_XML_NOMERGE_RULE@ cpufreq_gschema_in_files = org.mate.panel.applet.cpufreq.gschema.xml.in gsettings_SCHEMAS = $(cpufreq_gschema_in_files:.xml.in=.xml) @GSETTINGS_RULES@ appletdir = $(datadir)/mate-panel/applets -applet_in_files = org.mate.applets.CPUFreqApplet.mate-panel-applet.in -applet_DATA = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet) +applet_in_files = org.mate.applets.CPUFreqApplet.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 \ @@ -15,7 +14,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.CPUFreqAppletFactory.service.in @@ -33,7 +33,7 @@ ui_DATA = cpufreq-applet-menu.xml CLEANFILES = \ $(applet_DATA) \ - $(applet_DATA).in \ + $(applet_in_files) \ $(service_DATA) \ $(gsettings_SCHEMAS) \ *.gschema.valid \ @@ -41,13 +41,10 @@ CLEANFILES = \ *.gladep EXTRA_DIST = \ - org.mate.applets.CPUFreqApplet.mate-panel-applet.in.in \ - $(service_in_files) \ - $(cpufreq_gschema_in_files) \ - $(builder_DATA) \ - $(ui_DATA) - - - + $(applet_in_files).in \ + $(service_in_files) \ + $(cpufreq_gschema_in_files) \ + $(builder_DATA) \ + $(ui_DATA) -include $(top_srcdir)/git.mk diff --git a/cpufreq/org.mate.applets.CPUFreqApplet.mate-panel-applet.in.in b/cpufreq/org.mate.applets.CPUFreqApplet.mate-panel-applet.desktop.in.in index 45a9f5ad..168c6317 100644 --- a/cpufreq/org.mate.applets.CPUFreqApplet.mate-panel-applet.in.in +++ b/cpufreq/org.mate.applets.CPUFreqApplet.mate-panel-applet.desktop.in.in @@ -1,12 +1,13 @@ [Applet Factory] Id=CPUFreqAppletFactory Location=@LIBEXECDIR@/mate-cpufreq-applet -_Name=CPU Frequency Scaling Monitor -_Description=Monitor the CPU Frequency Scaling +Name=CPU Frequency Scaling Monitor +Description=Monitor the CPU Frequency Scaling [CPUFreqApplet] -_Name=CPU Frequency Scaling Monitor -_Description=Monitor the CPU Frequency Scaling +Name=CPU Frequency Scaling Monitor +Description=Monitor the CPU Frequency Scaling +# Translators: Do NOT translate or transliterate this text (this is an icon file name)! Icon=mate-cpu-frequency-applet MateComponentId=OAFIID:MATE_CPUFreqApplet X-MATE-Bugzilla-Bugzilla=MATE diff --git a/cpufreq/src/Makefile.am b/cpufreq/src/Makefile.am index fa8b8040..40d7c01c 100644 --- a/cpufreq/src/Makefile.am +++ b/cpufreq/src/Makefile.am @@ -35,6 +35,4 @@ mate_cpufreq_applet_LDADD = \ $(LIBCPUFREQ_LIBS) \ $(DBUS_LIBS) - - -include $(top_srcdir)/git.mk diff --git a/cpufreq/src/cpufreq-selector/Makefile.am b/cpufreq/src/cpufreq-selector/Makefile.am index 27dfac69..dc913c70 100644 --- a/cpufreq/src/cpufreq-selector/Makefile.am +++ b/cpufreq/src/cpufreq-selector/Makefile.am @@ -66,9 +66,9 @@ $(dbus_services_DATA): $(dbus_services_in_files) sed -e "s|\@BINDIR\@|$(DESTDIR)$(bindir)|" $< > $@ dbus_conf_DATA = org.mate.CPUFreqSelector.conf -@INTLTOOL_POLICY_RULE@ polkit_DATA = $(polkit_in_files:.policy.in=.policy) - +$(polkit_DATA): $(polkit_in_files) + $(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@ else dbus_services_DATA= dbus_conf_DATA= diff --git a/cpufreq/src/cpufreq-selector/org.mate.cpufreqselector.policy.in b/cpufreq/src/cpufreq-selector/org.mate.cpufreqselector.policy.in index 6864e82b..d2afd81b 100644 --- a/cpufreq/src/cpufreq-selector/org.mate.cpufreqselector.policy.in +++ b/cpufreq/src/cpufreq-selector/org.mate.cpufreqselector.policy.in @@ -11,8 +11,8 @@ <icon_name>mate-cpu-frequency-applet</icon_name> <action id="org.mate.cpufreqselector"> - <_description>Change CPU Frequency scaling</_description> - <_message>Privileges are required to change the CPU Frequency scaling.</_message> + <description>Change CPU Frequency scaling</description> + <message>Privileges are required to change the CPU Frequency scaling.</message> <defaults> <allow_inactive>no</allow_inactive> <allow_active>auth_admin_keep</allow_active> |