Merge lp:~nathwill-deactivatedaccount-deactivatedaccount/ubuntu/precise/usb-creator/lp.943235 into lp:ubuntu/precise/usb-creator

Proposed by Nathan Williams
Status: Merged
Merged at revision: 60
Proposed branch: lp:~nathwill-deactivatedaccount-deactivatedaccount/ubuntu/precise/usb-creator/lp.943235
Merge into: lp:ubuntu/precise/usb-creator
Diff against target: 59 lines (+11/-6)
2 files modified
dbus/com.ubuntu.usbcreator.policy.in (+5/-6)
debian/changelog (+6/-0)
To merge this branch: bzr merge lp:~nathwill-deactivatedaccount-deactivatedaccount/ubuntu/precise/usb-creator/lp.943235
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+95826@code.launchpad.net

Description of the change

proposed verbiage changes for lp: #943235

To post a comment you must log in.
61. By Nathan Williams

changed to align with user management messaging

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'dbus/com.ubuntu.usbcreator.policy.in'
2--- dbus/com.ubuntu.usbcreator.policy.in 2011-04-29 13:06:10 +0000
3+++ dbus/com.ubuntu.usbcreator.policy.in 2012-03-07 03:39:17 +0000
4@@ -10,7 +10,7 @@
5
6 <action id="com.ubuntu.usbcreator.bootloader">
7 <_description>Install the bootloader</_description>
8- <_message>System policy prevents installing the bootloader</_message>
9+ <_message>Authentication is required to install bootloader</_message>
10 <defaults>
11 <allow_any>no</allow_any>
12 <allow_inactive>no</allow_inactive>
13@@ -19,7 +19,7 @@
14 </action>
15 <action id="com.ubuntu.usbcreator.format">
16 <_description>Format the device</_description>
17- <_message>System policy prevents formatting this device</_message>
18+ <_message>Authentication required to format this device</_message>
19 <defaults>
20 <allow_any>no</allow_any>
21 <allow_inactive>no</allow_inactive>
22@@ -28,7 +28,7 @@
23 </action>
24 <action id="com.ubuntu.usbcreator.image">
25 <_description>Image the device</_description>
26- <_message>System policy prevents writing a disk image to this device</_message>
27+ <_message>Authentication is required to write disk image</_message>
28 <defaults>
29 <allow_any>no</allow_any>
30 <allow_inactive>no</allow_inactive>
31@@ -37,12 +37,11 @@
32 </action>
33 <action id="com.ubuntu.usbcreator.mount">
34 <_description>Mount a device</_description>
35- <_message>System policy prevents mounting</_message>
36+ <_message>Authentication is required to mount device</_message>
37 <defaults>
38 <allow_any>no</allow_any>
39 <allow_inactive>no</allow_inactive>
40 <allow_active>auth_admin_keep</allow_active>
41 </defaults>
42 </action>
43-</policyconfig>
44-
45+</policyconfig>
46
47=== modified file 'debian/changelog'
48--- debian/changelog 2012-01-13 10:14:16 +0000
49+++ debian/changelog 2012-03-07 03:39:17 +0000
50@@ -1,3 +1,9 @@
51+usb-creator (0.2.35.2ubuntu1) precise; urgency=low
52+
53+ * add user-friendly requests for authorization (lp: #943235)
54+
55+ -- Nathan Williams <nathan@nathanewilliams.com> Sun, 04 Mar 2012 17:05:59 -0800
56+
57 usb-creator (0.2.35.2) precise; urgency=low
58
59 * depends on gir unity 5.0 (for real, this time)

Subscribers

People subscribed via source and target branches

to all changes: