From 58627a721af9d8460f5a4366b6257e1281bb6d34 Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz@redhat.com>
Date: Thu, 5 Jun 2008 21:15:17 -0400
Subject: [PATCH] reword some authentication messages and change some of the
 defaults

---
 policy/org.freedesktop.devicekit.disks.policy.in | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/policy/org.freedesktop.devicekit.disks.policy.in b/policy/org.freedesktop.devicekit.disks.policy.in
index b0f424c..4926887 100644
--- a/policy/org.freedesktop.devicekit.disks.policy.in
+++ b/policy/org.freedesktop.devicekit.disks.policy.in
@@ -61,7 +61,7 @@ file are instantly applied.
 
   <action id="org.freedesktop.devicekit.disks.filesystem-unmount-others">
     <_description>Unmount a disk mounted by another user</_description>
-    <_message>Authentication is required to unmount disks mounted by others than yourself</_message>
+    <_message>Authentication is required to unmount disks mounted by another user</_message>
     <defaults>
       <allow_any>no</allow_any>
       <allow_inactive>no</allow_inactive>
@@ -71,11 +71,11 @@ file are instantly applied.
 
   <action id="org.freedesktop.devicekit.disks.filesystem-unmount-others-system-internal">
     <_description>Unmount a system-internal device mounted by another user</_description>
-    <_message>Authentication is required to unmount a device mounted by others than yourself</_message>
+    <_message>Authentication is required to unmount a device mounted by another user</_message>
     <defaults>
       <allow_any>no</allow_any>
       <allow_inactive>no</allow_inactive>
-      <allow_active>auth_admin_keep_always</allow_active>
+      <allow_active>auth_admin</allow_active>
     </defaults>
   </action>
 
@@ -141,7 +141,7 @@ file are instantly applied.
 
   <action id="org.freedesktop.devicekit.disks.luks-lock-others">
     <_description>Lock an encrypted device unlocked by another user</_description>
-    <_message>Authentication is required to lock an encrypted device unlocked by others than yourself</_message>
+    <_message>Authentication is required to lock an encrypted device unlocked by another user</_message>
     <defaults>
       <allow_any>no</allow_any>
       <allow_inactive>no</allow_inactive>
@@ -149,9 +149,9 @@ file are instantly applied.
     </defaults>
   </action>
 
-  <action id="org.freedesktop.devicekit.disks.lock-lock-others-system-internal">
+  <action id="org.freedesktop.devicekit.disks.luks-lock-others-system-internal">
     <_description>Lock an encrypted system-internal device unlocked by another user</_description>
-    <_message>Authentication is required to lock an encrypted device unlocked by others than yourself</_message>
+    <_message>Authentication is required to lock an encrypted device unlocked by another user</_message>
     <defaults>
       <allow_any>no</allow_any>
       <allow_inactive>no</allow_inactive>
@@ -166,7 +166,7 @@ file are instantly applied.
     <defaults>
       <allow_any>no</allow_any>
       <allow_inactive>no</allow_inactive>
-      <allow_active>auth_admin_keep_always</allow_active>
+      <allow_active>yes</allow_active>
     </defaults>
   </action>
 
-- 
2.7.4