From 21f845c1a7cb1b416a04b769fd86c8a88adb2027 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 4 Dec 2018 12:44:30 -0500
Subject: [PATCH] Revise polkit messages again

I realized that these messages are a bit confusing, with
keep permissions and implications. We end up asking a
question about one ref, but then use the permission we optained
to operate on other refs. This will get a bit worse with
the new hints, so go back to more generic messages that
don't talk about the details. The ultimate goal here is
less messages, anyway.

Closes: #2384
Approved by: alexlarsson
---
 .../org.freedesktop.Flatpak.policy.in          | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/system-helper/org.freedesktop.Flatpak.policy.in b/system-helper/org.freedesktop.Flatpak.policy.in
index b0a03880..6c3c6d20 100644
--- a/system-helper/org.freedesktop.Flatpak.policy.in
+++ b/system-helper/org.freedesktop.Flatpak.policy.in
@@ -21,7 +21,7 @@
             in the wheel group to install without authenticating.
      -->
     <description>Install signed application</description>
-    <message>Authentication is required to install $(ref) from $(origin)</message>
+    <message>Authentication is required to install software</message>
     <icon_name>package-x-generic</icon_name>
     <defaults>
       <allow_any>auth_admin</allow_any>
@@ -39,7 +39,7 @@
             in the wheel group to install without authenticating.
     -->
     <description>Install signed runtime</description>
-    <message>Authentication is required to install $(ref) from $(origin)</message>
+    <message>Authentication is required to install software</message>
     <icon_name>package-x-generic</icon_name>
     <defaults>
       <allow_any>auth_admin</allow_any>
@@ -58,7 +58,7 @@
             updates.
      -->
     <description>Update signed application</description>
-    <message>Authentication is required to update $(ref) from $(origin)</message>
+    <message>Authentication is required to update software</message>
     <icon_name>package-x-generic</icon_name>
     <defaults>
       <allow_any>auth_admin</allow_any>
@@ -77,7 +77,7 @@
             updates.
      -->
     <description>Update signed runtime</description>
-    <message>Authentication is required to update $(ref) from $(origin)</message>
+    <message>Authentication is required to update software</message>
     <icon_name>package-x-generic</icon_name>
     <defaults>
       <allow_any>auth_admin</allow_any>
@@ -92,7 +92,7 @@
             from signed repositories.
      -->
     <description>Update remote metadata</description>
-    <message>Authentication is required to update the remote $(remote)</message>
+    <message>Authentication is required to update remote info</message>
     <icon_name>package-x-generic</icon_name>
     <defaults>
       <allow_any>auth_admin</allow_any>
@@ -109,7 +109,7 @@
             in the wheel group to modify repos without authenticating.
      -->
     <description>Update system repository</description>
-    <message>Authentication is required to modify the system repository</message>
+    <message>Authentication is required to modify a system repository</message>
     <icon_name>package-x-generic</icon_name>
     <defaults>
       <allow_any>auth_admin</allow_any>
@@ -142,7 +142,7 @@
             in the wheel group to uninstall without authenticating.
      -->
     <description>Uninstall runtime</description>
-    <message>Authentication is required to uninstall $(ref)</message>
+    <message>Authentication is required to uninstall software</message>
     <icon_name>package-x-generic</icon_name>
     <defaults>
       <allow_any>auth_admin</allow_any>
@@ -175,7 +175,7 @@
             software repositories.
      -->
     <description>Configure Remote</description>
-    <message>Authentication is required to configure the remote $(remote)</message>
+    <message>Authentication is required to configure software repositories</message>
     <icon_name>package-x-generic</icon_name>
     <defaults>
       <allow_any>auth_admin</allow_any>
@@ -208,7 +208,7 @@
             updates.
      -->
     <description>Update appstream</description>
-    <message>Authentication is required to update information from $(origin)</message>
+    <message>Authentication is required to update information about software</message>
     <icon_name>package-x-generic</icon_name>
     <defaults>
       <allow_any>auth_admin</allow_any>