hal: Branch 'master'

[Danny Kukawka]

 policy/org.freedesktop.hal.storage.policy |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit cb3ef76fb73ed42bc703182360cae66810ebdb77
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Fri Mar 7 16:19:16 2008 +0100

    make crypto-setup policy description more clear
    
    Maked crypto-setup policy description for fixed and removable
    storage devices/media more clear as pointed out in fd.o bug #14808
    and https://bugs.launchpad.net/hal/+bug/186282.

diff --git a/policy/org.freedesktop.hal.storage.policy b/policy/org.freedesktop.hal.storage.policy
index 656b955..f866117 100644
--- a/policy/org.freedesktop.hal.storage.policy
+++ b/policy/org.freedesktop.hal.storage.policy
@@ -53,7 +53,7 @@ details.
   </action>
   
   <action id="org.freedesktop.hal.storage.crypto-setup-fixed">
-    <description>Set up decryption for encrypted storage devices.</description>
+    <description>Set up decryption for encrypted fixed storage devices.</description>
     <message>System policy prevents accessing encrypted fixed media</message>
     <defaults>
       <allow_inactive>no</allow_inactive>
@@ -62,7 +62,7 @@ details.
   </action>
 
   <action id="org.freedesktop.hal.storage.crypto-setup-removable">
-    <description>Set up decryption for encrypted storage devices.</description>
+    <description>Set up decryption for encrypted removable storage devices.</description>
     <message>System policy prevents accessing encrypted removable media</message>
     <defaults>
       <allow_inactive>no</allow_inactive>