diff --git a/dnssec-trigger-0.11-gui.patch b/dnssec-trigger-0.11-gui.patch
deleted file mode 100644
index 7b638e1..0000000
--- a/dnssec-trigger-0.11-gui.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -Naur dnssec-trigger-0.11-orig/panel/pui.xml dnssec-trigger-0.11/panel/pui.xml
---- dnssec-trigger-0.11-orig/panel/pui.xml 2012-03-29 09:48:23.000000000 -0400
-+++ dnssec-trigger-0.11/panel/pui.xml 2012-06-17 12:07:03.806278004 -0400
-@@ -17,7 +17,9 @@
- True
- False
- Some networks need insecure signon. After you log in to the
--network via its portal page, select <i>Reprobe</i> to get secure again.
-+network via its portal page, the network will be secured again
-+automatically. You can also select <i>Reprobe</i> to attempt to
-+force it to go into secure mode.
-
- <i>Please, stay safe out there.</i>
- True
-@@ -81,7 +83,7 @@
-
- False
- 5
-- No Web Access
-+ Web traffic hijacked
- dialog
- True
-
-@@ -138,12 +140,12 @@
-
- True
- False
-- There is no web access on this network. Do you have to login for that?
-+ The web traffic on this network is being hijacked. Is this a hotspot?
-
--While you login you are <i>insecure</i>, for backwards compatibility, until
--dnssec-trigger can detect web access.
-+While you login you are <i>insecure</i>, until the traffic hijacking has
-+stopped and dnssec-trigger has detected regular web access.
-
--<i>Skip</i> this if you do not have to log in on this network.
-+<i>Skip</i> if you are not logging into a hotspot right now .
- True
-
-
diff --git a/dnssec-trigger-0.11-improve_dialog_texts.patch b/dnssec-trigger-0.11-improve_dialog_texts.patch
new file mode 100644
index 0000000..360bfef
--- /dev/null
+++ b/dnssec-trigger-0.11-improve_dialog_texts.patch
@@ -0,0 +1,134 @@
+From d01ec0b07d425580cf3dcf7246ec807dbcf1aa5e Mon Sep 17 00:00:00 2001
+From: Tomas Hozza
+Date: Fri, 15 Nov 2013 10:44:45 +0100
+Subject: [PATCH] Improve texts in dialogs to be more clear
+
+Improve texts in Hotspot sing-on dialog and also
+some dialogs labels and pop-up panel button label,
+to describe the situation more clearly.
+
+Changes are proposed and reviewed by Red Hat
+Documentation Team.
+
+Signed-off-by: Tomas Hozza
+---
+ panel/pui.xml | 48 +++++++++++++++++++++++++++---------------------
+ 1 file changed, 27 insertions(+), 21 deletions(-)
+
+diff --git a/panel/pui.xml b/panel/pui.xml
+index 4915d83..f1051b2 100644
+--- a/panel/pui.xml
++++ b/panel/pui.xml
+@@ -4,7 +4,7 @@
+
+ False
+ 5
+- Hotspot Signon
++ Disable DNSSEC for Hotspot Sign On
+ dialog
+
+
+@@ -16,10 +16,15 @@
+
+ True
+ False
+- Some networks need insecure signon. After you log in to the
+-network via its portal page, select <i>Reprobe</i> to get secure again.
++ Some networks, such as Hotspots, require you to sign on, or register,
++before allowing full network access. By clicking <i>OK</i>, DNSSEC will be
++disabled to allow you to connect to the captive portal's sign-on
++page. After you have signed on and full network access has been enabled,
++DNSSEC-trigger should detect this and enable DNSSEC again. You can also
++select <i>Reprobe</i> to attempt to establish a secure connection to a DNSSEC
++capable name server.
+
+-<i>Please, stay safe out there.</i>
++<i>A red exclamation mark in the icon warns you when DNSSEC is disabled.</i>
+ True
+
+
+@@ -138,10 +143,10 @@ network via its portal page, select <i>Reprobe</i> to get secure aga
+
+ True
+ False
+- There is no web access on this network. Do you have to login for that?
++ There is no access to external websites from this network. Do you have to login for that?
+
+-While you login you are <i>insecure</i>, for backwards compatibility, until
+-dnssec-trigger can detect web access.
++When you select <i>Log in</i>, DNSSEC will be disabled for backwards compatibility reasons, until
++DNSSEC-trigger can detect web access.
+
+ <i>Skip</i> this if you do not have to log in on this network.
+ True
+@@ -162,7 +167,7 @@ dnssec-trigger can detect web access.
+
+ False
+ 5
+- probe dnssec results
++ Results of DNSSEC probe
+ 400
+ 280
+ normal
+@@ -251,7 +256,7 @@ dnssec-trigger can detect web access.
+ True
+ False
+ False
+- Hotspot signon
++ Hotspot sign-on
+ True
+
+
+@@ -331,28 +336,29 @@ dnssec-trigger can detect web access.
+
+ True
+ False
+- <b>The Network Fails to Support DNSSEC</b>
++ <b>This Network Fails to Support DNSSEC</b>
+
+-The network you are connected to does not allow DNSSEC, via
+-the provided DNS caches, nor via contacting servers on the
+-internet directly (it filters traffic to this end). It is not possible
+-to provide DNSSEC security, but you can connect insecurely.
++The network you are connected to does not allow DNS Security
++Extensions (DNSSEC) via the provided DNS caches, nor via contacting
++DNS name servers on the Internet directly (it filters traffic
++to this end). It is not possible to provide DNSSEC, but you can
++connect insecurely.
+
+ Do you want to connect insecurely?
+
+-* if you choose <b>Disconnect</b> then DNS is disabled. It is safe,
+-but there is very little that works.
++* if you choose <b>Disconnect</b> then DNS is disabled.
++It is safe, but there is very little that works.
+
+-* if you choose <b>Insecure</b> then the DNSSEC security is lost.
++* if you choose <b>Insecure</b> then DNSSEC is disabled and security is lost.
+ You can connect and work. But there is no safety. The network
+ interferes with DNSSEC, it may also interfere with other things.
+ Have caution and work with sensitive personal and financial
+ things some other time.
+
+-Some hotspots may work after you have gained access via
+-its signon page. Then use <i>Reprobe</i> from the menu to retry.
++Some Hotspots may work after you have gained access via
++its sign-on page. Then use <i>Reprobe</i> from the menu to retry.
+
+-<i>Stay safe out there!</i>
++<i>A red exclamation mark in the icon warns you when DNSSEC is disabled.</i>
+ True
+
+
+@@ -383,7 +389,7 @@ its signon page. Then use <i>Reprobe</i> from the menu to retry.
+
+ True
+ False
+- There is a software update available for dnssec-trigger.
++ There is a software update available for DNSSEC-trigger.
+ Do you wish to install the update?
+ True
+
+--
+1.8.3.1
+
diff --git a/dnssec-trigger.spec b/dnssec-trigger.spec
index b913a00..b6277c8 100644
--- a/dnssec-trigger.spec
+++ b/dnssec-trigger.spec
@@ -1,7 +1,7 @@
Summary: NetworkManager plugin to update/reconfigure DNSSEC resolving
Name: dnssec-trigger
Version: 0.11
-Release: 15%{?dist}
+Release: 16%{?dist}
License: BSD
Url: http://www.nlnetlabs.nl/downloads/dnssec-trigger/
Source: http://www.nlnetlabs.nl/downloads/dnssec-trigger/%{name}-%{version}.tar.gz
@@ -12,7 +12,7 @@ Source3: dnssec-trigger.conf
# http://www.nlnetlabs.nl/svn/dnssec-trigger/trunk/01-dnssec-trigger-hook.sh.in
Source4: 01-dnssec-trigger-hook
Source5: dnssec-trigger.tmpfiles.d
-Patch1: dnssec-trigger-0.11-gui.patch
+Patch1: dnssec-trigger-0.11-improve_dialog_texts.patch
Patch2: dnssec-trigger-842455.patch
# https://www.nlnetlabs.nl/bugs-script/show_bug.cgi?id=489
Patch3: dnssec-trigger-0.11-nl489.patch
@@ -130,6 +130,9 @@ fi
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
%changelog
+* Mon Nov 18 2013 Tomas Hozza - 0.11-16
+- Improve GUI dialogs texts
+
* Tue Nov 12 2013 Tomas Hozza - 0.11-15
- Fix NM dispatcher script to work with NM >= 0.9.9.0 (#1029571)