zeitgeist team mailing list archive

[Gabor Kelemen <kelemeng@xxxxxxxx>]

Gabor Kelemen has proposed merging lp:~kelemeng/activity-log-manager/i18n-fixes into lp:activity-log-manager.

Requested reviews:
  Activity Log Manager (activity-log-manager)
Related bugs:
  Bug #944362 in Activity Log Manager: "i18n problems in activity-log-manager"
  https://bugs.launchpad.net/activity-log-manager/+bug/944362

For more details, see:
https://code.launchpad.net/~kelemeng/activity-log-manager/i18n-fixes/+merge/95472
-- 
https://code.launchpad.net/~kelemeng/activity-log-manager/i18n-fixes/+merge/95472
Your team Activity Log Manager is requested to review the proposed merge of lp:~kelemeng/activity-log-manager/i18n-fixes into lp:activity-log-manager.

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2012-02-20 18:36:10 +0000
+++ po/POTFILES.in	2012-03-01 21:36:27 +0000
@@ -6,4 +6,5 @@
 src/applications-widget.vala
 src/files-widget.vala
 src/history-widget.vala
-src/diagnostics/whoopsie.ui
+src/diagnostics/com.ubuntu.whoopsiepreferences.policy.in
+[type: gettext/glade]src/diagnostics/whoopsie.ui

=== modified file 'src/diagnostics/Makefile.am'
--- src/diagnostics/Makefile.am	2012-02-20 17:24:27 +0000
+++ src/diagnostics/Makefile.am	2012-03-01 21:36:27 +0000
@@ -20,17 +20,20 @@
 	$(POLKIT_LIBS) \
 	$(GIO_UNIX_LIBS)
 
+policykit_in_files = \ 
+	com.ubuntu.whoopsiepreferences.policy.in
+
 EXTRA_DIST = \
 	whoopsie-preferences.xml \
 	com.ubuntu.WhoopsiePreferences.service \
 	com.ubuntu.WhoopsiePreferences.conf \
-	com.ubuntu.whoopsiepreferences.policy \
+	$(policykit_in_files) \
 	whoopsie.ui
 
 gnomeccui_DATA = \
 	whoopsie.ui
 policykit_DATA = \
-	com.ubuntu.whoopsiepreferences.policy
+	$(policykit_in_files:.policy.in=.policy)
 dbussystem_DATA = \
 	com.ubuntu.WhoopsiePreferences.conf
 dbusservice_DATA = \
@@ -41,4 +44,6 @@
 		--generate-c-code whoopsie-generated \
 		$<
 
-CLEANFILES = whoopsie-generated.[ch]
+CLEANFILES = whoopsie-generated.[ch] \
+	$(policykit_DATA)
+@INTLTOOL_POLICY_RULE@

=== renamed file 'src/diagnostics/com.ubuntu.whoopsiepreferences.policy' => 'src/diagnostics/com.ubuntu.whoopsiepreferences.policy.in'
--- src/diagnostics/com.ubuntu.whoopsiepreferences.policy	2012-02-20 09:51:28 +0000
+++ src/diagnostics/com.ubuntu.whoopsiepreferences.policy.in	2012-03-01 21:36:27 +0000
@@ -7,8 +7,8 @@
   <vendor_url>https://launchpad.net/whoopsie-daisy</vendor_url>
   <icon_name>stock_lock</icon_name>
   <action id="com.ubuntu.whoopsiepreferences.change">
-    <description gettext-domain="whoopsie">Privacy settings</description>
-    <message gettext-domain="whoopsie">To change your privacy settings you need to authenticate.</message>
+    <_description>Privacy settings</_description>
+    <_message>To change your privacy settings you need to authenticate.</_message>
     <defaults>
       <allow_any>auth_admin</allow_any>
       <allow_inactive>auth_admin</allow_inactive>