summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2013-10-01 21:29:40 +0100
committerColin Guthrie <colin@mageia.org>2013-10-01 21:29:40 +0100
commit8223c275633a16738af4580ee99a6b3e10cfa46e (patch)
treec3f786ee8b482fc8ca35866db0663fa2321727be
parent16ddc7a83aeac4a7e09de7d31918eb359dc018ac (diff)
downloadcontrol-center-8223c275633a16738af4580ee99a6b3e10cfa46e.tar
control-center-8223c275633a16738af4580ee99a6b3e10cfa46e.tar.gz
control-center-8223c275633a16738af4580ee99a6b3e10cfa46e.tar.bz2
control-center-8223c275633a16738af4580ee99a6b3e10cfa46e.tar.xz
control-center-8223c275633a16738af4580ee99a6b3e10cfa46e.zip
polkit: Make the polkit policy files translatable.
-rw-r--r--Makefile10
-rw-r--r--po/Makefile8
-rw-r--r--polkit/policy/org.mageia.control-centre-gui.policy.in (renamed from polkit/org.mageia.control-centre-gui.policy)4
-rw-r--r--polkit/policy/org.mageia.control-centre.policy.in (renamed from polkit/org.mageia.control-centre.policy)4
-rwxr-xr-xpolkit/wrappers/drakxconf (renamed from polkit/drakxconf)0
5 files changed, 13 insertions, 13 deletions
diff --git a/Makefile b/Makefile
index 58b87ea5..239c8d25 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
VERSION = 12.42
NAME = drakconf
-SUBDIRS = po pixmaps #data
+SUBDIRS = po pixmaps polkit/policy #data
localedir = $(DESTDIR)/usr/share/locale
mcc_dir = $(DESTDIR)/usr/share/mcc
SYSCONFDIR = $(DESTDIR)/etc/sysconfig
@@ -19,23 +19,23 @@ drakconf:
clean:
$(MAKE) -C po $@
+ $(MAKE) -C polkit/policy $@
rm -f *~ drakconf core .#*[0-9] core.* *.bak
for d in $(SUBDIRS); do ( cd $$d ; make $@ ) ; done
install: all
$(MAKE) -C po $@
+ $(MAKE) -C polkit/policy $@
find -name '*.p[lm]' -o -name control-center -o -name drakconf | xargs perl -pi -e 's/\s*use\s+(diagnostics|vars|strict).*//g'
- install -d $(DESTDIR)/usr/{bin,sbin,libexec,share/icons,share/polkit-1/actions}
+ install -d $(DESTDIR)/usr/{bin,sbin,libexec,share/icons}
install -d $(mcc_dir)/themes/default/
install -m644 control-center.rc $(mcc_dir)/themes/default/gtkrc
install -m755 $(NAME) $(DESTDIR)/usr/libexec/
- install -m644 polkit/org.mageia.control-centre.policy $(DESTDIR)/usr/share/polkit-1/actions
install -m755 wrapper $(DESTDIR)/usr/bin/$(NAME)
install -m755 menus_launcher.pl $(DESTDIR)/usr/sbin/
install -m755 print_launcher.pl $(DESTDIR)/usr/sbin/
install -m755 drakxconf $(DESTDIR)/usr/libexec/
- install -m644 polkit/org.mageia.control-centre-gui.policy $(DESTDIR)/usr/share/polkit-1/actions
- install -m755 polkit/drakxconf $(DESTDIR)/usr/bin
+ install -m755 polkit/wrappers/drakxconf $(DESTDIR)/usr/bin
install -m755 drakconsole $(DESTDIR)/usr/sbin/
install -m755 mdkwebadmin.pl $(DESTDIR)/usr/bin/
for d in $(SUBDIRS); do ( cd $$d ; make $@ ) ; done
diff --git a/po/Makefile b/po/Makefile
index df4b4b20..acbb0701 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -35,13 +35,13 @@ clean:
msgfmt -o $@ $<
POTFILES.in:
- (cd .. ; /bin/ls data/*.desktop.in data/*.directory.in *.desktop.in) > POTFILES.in
+ (cd .. ; /bin/ls -1 data/*.desktop.in data/*.directory.in *.desktop.in polkit/policy/*.in) > POTFILES.in
$(PGOAL).pot: $(PL_FILES) POTFILES.in
- intltool-update --gettext-package desktopstuff --pot
+ intltool-update --gettext-package non-perl --pot
perl_checker -q --generate-pot $(PGOAL)_tmp.pot $(PL_FILES)
- msgcat --use-first $(PGOAL)_tmp.pot desktopstuff.pot > $@
- rm -f desktopstuff.pot $(PGOAL)_tmp.pot
+ msgcat --use-first $(PGOAL)_tmp.pot non-perl.pot > $@
+ rm -f non-perl.pot $(PGOAL)_tmp.pot
update_n_merge: $(PGOAL).pot merge
diff --git a/polkit/org.mageia.control-centre-gui.policy b/polkit/policy/org.mageia.control-centre-gui.policy.in
index 2e25fe17..958ca7a6 100644
--- a/polkit/org.mageia.control-centre-gui.policy
+++ b/polkit/policy/org.mageia.control-centre-gui.policy.in
@@ -8,8 +8,8 @@
<vendor_url>http://mageia.org/control-centre-gui</vendor_url>
<action id="org.mageia.control-centre-gui.pkexec.run">
- <description>Run Mageia Control Centre GUI</description>
- <message>Authentication is required to run Mageia Control Centre GUI</message>
+ <_description>Run Mageia Control Centre GUI</_description>
+ <_message>Authentication is required to run Mageia Control Centre GUI</_message>
<icon_name>drakconf</icon_name>
<defaults>
<allow_any>no</allow_any>
diff --git a/polkit/org.mageia.control-centre.policy b/polkit/policy/org.mageia.control-centre.policy.in
index bdc43663..4772b0fc 100644
--- a/polkit/org.mageia.control-centre.policy
+++ b/polkit/policy/org.mageia.control-centre.policy.in
@@ -8,8 +8,8 @@
<vendor_url>http://mageia.org/control-centre</vendor_url>
<action id="org.mageia.control-centre.pkexec.run">
- <description>Run Mageia Control Centre</description>
- <message>Authentication is required to run Mageia Control Centre</message>
+ <_description>Run Mageia Control Centre</_description>
+ <_message>Authentication is required to run Mageia Control Centre</_message>
<icon_name>drakconf</icon_name>
<defaults>
<allow_any>no</allow_any>
diff --git a/polkit/drakxconf b/polkit/wrappers/drakxconf
index db38e46a..db38e46a 100755
--- a/polkit/drakxconf
+++ b/polkit/wrappers/drakxconf