make the PackageKit actions localised, and generally enable gettext

3 files changed, 30 insertions, 25 deletions

diff --git a/policy/.gitignore b/policy/.gitignore
index 355a9b88..171e2604 100644
--- a/policy/.gitignore
+++ b/policy/.gitignore
@@ -4,3 +4,5 @@ Makefile
 Makefile.in
 *.o
 *~
+org.freedesktop.packagekit.policy
+
diff --git a/policy/Makefile.am b/policy/Makefile.am
index d995057f..9fcdc91b 100644
--- a/policy/Makefile.am
+++ b/policy/Makefile.am
@@ -1,19 +1,22 @@
 
 NULL =
 
-polkitdir = $(datadir)/PolicyKit/policy
-polkit_DATA =					\
-	org.freedesktop.packagekit.policy	\
+polkit_policydir = $(datadir)/PolicyKit/policy
+dist_polkit_policy_DATA =					\
+	org.freedesktop.packagekit.policy			\
 	$(NULL)
 
-EXTRA_DIST =					\
-	$(polkit_DATA)				\
-	$(NULL)
+# You will need a recent intltool or the patch from this bug
+# http://bugzilla.gnome.org/show_bug.cgi?id=462312
+@INTLTOOL_POLICY_RULE@
 
 if SECURITY_TYPE_POLKIT
 check:
-	$(POLKIT_POLICY_FILE_VALIDATE) $(top_srcdir)/policy/$(polkit_DATA)
+	$(POLKIT_POLICY_FILE_VALIDATE) $(top_srcdir)/policy/$(dist_polkit_policy_DATA)
 endif
 
+EXTRA_DIST = org.freedesktop.packagekit.policy.in
+DISTCLEANFILES = org.freedesktop.packagekit.policy
+
 clean-local :
 	rm -f *~
diff --git a/policy/org.freedesktop.packagekit.policy b/policy/org.freedesktop.packagekit.policy.in
index 8e8a632f..aedb5dc4 100644
--- a/policy/org.freedesktop.packagekit.policy
+++ b/policy/org.freedesktop.packagekit.policy.in
@@ -14,8 +14,8 @@
   <icon_name>package-x-generic</icon_name>
 
   <action id="org.freedesktop.packagekit.install">
-    <description>Install package</description>
-    <message>System policy prevents installing package</message>
+    <_description>Install package</_description>
+    <_message>System policy prevents installing package</_message>
     <icon_name>pk-package-add</icon_name>
     <vendor_url>http://www.packagekit.org/pk-reference.html#api-install-package</vendor_url>
     <defaults>
@@ -25,8 +25,8 @@
   </action>
 
   <action id="org.freedesktop.packagekit.localinstall">
-    <description>Install local file</description>
-    <message>System policy prevents installing file</message>
+    <_description>Install local file</_description>
+    <_message>System policy prevents installing file</_message>
     <icon_name>pk-package-add</icon_name>
     <vendor_url>http://www.packagekit.org/pk-reference.html#api-install-file</vendor_url>
     <defaults>
@@ -36,8 +36,8 @@
   </action>
 
   <action id="org.freedesktop.packagekit.service-pack">
-    <description>Update from service pack</description>
-    <message>System policy prevents updating from service pack</message>
+    <_description>Update from service pack</_description>
+    <_message>System policy prevents updating from service pack</_message>
     <icon_name>pk-package-update</icon_name>
     <vendor_url>http://www.packagekit.org/pk-reference.html#api-service-pack</vendor_url>
     <defaults>
@@ -47,8 +47,8 @@
   </action>
 
   <action id="org.freedesktop.packagekit.update-package">
-    <description>Update package</description>
-    <message>System policy prevents updating package</message>
+    <_description>Update package</_description>
+    <_message>System policy prevents updating package</_message>
     <icon_name>pk-package-update</icon_name>
     <vendor_url>http://www.packagekit.org/pk-reference.html#api-update</vendor_url>
     <defaults>
@@ -58,8 +58,8 @@
   </action>
 
   <action id="org.freedesktop.packagekit.remove">
-    <description>Remove package</description>
-    <message>System policy prevents removing package</message>
+    <_description>Remove package</_description>
+    <_message>System policy prevents removing package</_message>
     <icon_name>pk-package-delete</icon_name>
     <vendor_url>http://www.packagekit.org/pk-reference.html#api-remove</vendor_url>
     <defaults>
@@ -69,8 +69,8 @@
   </action>
 
   <action id="org.freedesktop.packagekit.update-system">
-    <description>Update all packages on system</description>
-    <message>System policy prevents updating system</message>
+    <_description>Update all packages on system</_description>
+    <_message>System policy prevents updating system</_message>
     <icon_name>pk-package-update</icon_name>
     <vendor_url>http://www.packagekit.org/pk-reference.html#api-update-system</vendor_url>
     <defaults>
@@ -80,8 +80,8 @@
   </action>
 
   <action id="org.freedesktop.packagekit.rollback">
-    <description>Rollback to a previous transaction</description>
-    <message>System policy prevents rollback</message>
+    <_description>Rollback to a previous transaction</_description>
+    <_message>System policy prevents rollback</_message>
     <icon_name>pk-rollback</icon_name>
     <vendor_url>http://www.packagekit.org/pk-reference.html#api-rollback</vendor_url>
     <defaults>
@@ -91,8 +91,8 @@
   </action>
 
   <action id="org.freedesktop.packagekit.repo-change">
-    <description>Change repository parameters</description>
-    <message>System policy prevents changing repository parameters</message>
+    <_description>Change repository parameters</_description>
+    <_message>System policy prevents changing repository parameters</_message>
     <icon_name>pk-package-info</icon_name>
     <vendor_url>http://www.packagekit.org/pk-reference.html#api-repo-enable</vendor_url>
     <defaults>
@@ -102,8 +102,8 @@
   </action>
 
   <action id="org.freedesktop.packagekit.refresh-cache">
-    <description>Refresh package cache</description>
-    <message>System policy prevents refresh package cache</message>
+    <_description>Refresh package cache</_description>
+    <_message>System policy prevents refresh package cache</_message>
     <icon_name>pk-refresh-cache</icon_name>
     <vendor_url>http://www.packagekit.org/pk-reference.html#api-refresh-cache</vendor_url>
     <defaults>