Merge lp:~evfool/jockey/stringfixes into lp:jockey

[Robert Roth]

Fixes two string-fix bugs, one in the VMWare description string caused by missing a space from both the end of the line and the beginning of the next line in the source (bug #722936), and another one related to the authentication required strings presented, made them more user-friendly, similar to the ones in software-center/aptdaemon, as suggested in bug #799725.

[Martin Pitt (pitti)]

Thanks Robert! This looks good, and I already merged the "toolsfor" change into trunk. The other change requires an UIF first, I asked in https://bugs.launchpad.net/hundredpapercuts/+bug/799725/comments/3

review: Approve

=== modified file 'backend/com.ubuntu.devicedriver.policy.in'
--- backend/com.ubuntu.devicedriver.policy.in	2009-07-13 15:43:16 +0000
+++ backend/com.ubuntu.devicedriver.policy.in	2011-09-02 00:06:29 +0000
@@ -16,7 +16,7 @@
 
   <action id="com.ubuntu.devicedriver.info">
     <_description>Get information about local device drivers</_description>
-    <_message>System policy prevents querying device drivers</_message>
+    <_message>To query the device drivers, you need to authenticate.</_message>
     <defaults>
       <allow_any>yes</allow_any>
       <allow_inactive>yes</allow_inactive>
@@ -26,7 +26,7 @@
 
   <action id="com.ubuntu.devicedriver.check">
     <_description>Check for newly available drivers for, and used drivers on this system</_description>
-    <_message>System policy prevents checking driver status</_message>
+    <_message>To check the driver status, you need to authenticate.</_message>
     <defaults>
       <allow_inactive>yes</allow_inactive>
       <allow_active>yes</allow_active>
@@ -35,7 +35,7 @@
 
   <action id="com.ubuntu.devicedriver.update">
     <_description>Query local and remote driver databases for updated drivers for the system</_description>
-    <_message>System policy prevents querying driver databases for updates</_message>
+    <_message>To query the driver databases for updates, you need to authenticate.</_message>
     <defaults>
       <allow_inactive>yes</allow_inactive>
       <allow_active>yes</allow_active>
@@ -44,7 +44,7 @@
 
   <action id="com.ubuntu.devicedriver.install">
     <_description>Install or remove device drivers</_description>
-    <_message>System policy prevents installation/removal of device drivers</_message>
+    <_message>To install or remove device drivers, you need to authenticate.</_message>
     <defaults>
       <allow_any>auth_admin</allow_any>
       <allow_inactive>auth_admin</allow_inactive>

=== modified file 'examples/handlers/vmware-client.py'
--- examples/handlers/vmware-client.py	2011-02-14 09:20:53 +0000
+++ examples/handlers/vmware-client.py	2011-09-02 00:06:29 +0000
@@ -17,7 +17,7 @@
                 name=_('VMWare Client Tools'),
                 description=_('Install VMWare client drivers and tools'),
                 rationale=_('Install the VMWare client drivers and tools'
-                    'for your VMWare based Ubuntu installation.\n\n'
+                    ' for your VMWare based Ubuntu installation.\n\n'
                     'This should help you use Ubuntu in your VM.'))
         self.package = 'open-vm-dkms'
         self._free = True