From b68b0e25c874ac9ec9853c889b7f9f1bbaadd833 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Wed, 22 Feb 2017 16:59:45 +0000
Subject: [PATCH] Merge Matthew's wording patch

---
 src/components/views/dialogs/UnknownDeviceDialog.js | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/components/views/dialogs/UnknownDeviceDialog.js b/src/components/views/dialogs/UnknownDeviceDialog.js
index 75c27a6f1b..97e6c8391c 100644
--- a/src/components/views/dialogs/UnknownDeviceDialog.js
+++ b/src/components/views/dialogs/UnknownDeviceDialog.js
@@ -126,14 +126,10 @@ export default React.createClass({
         } else {
             warning = (
                 <div>
-                    <p>
-                        This means there is no guarantee that the devices
-                        belong to the users they claim to.
-                    </p>
                     <p>
                         We recommend you go through the verification process
-                        for each device before continuing, but you can send
-                        without verifying if you prefer.
+                        for each device to confirm they belong to their legitimate owner,
+                        but you can resend the message without verifying if you prefer.
                     </p>
                 </div>
             );
@@ -152,8 +148,7 @@ export default React.createClass({
             >
                 <GeminiScrollbar autoshow={false} className="mx_Dialog_content">
                     <h4>
-                        This room contains unknown devices which have not been
-                        verified.
+                        This room contains devices that you haven't seen before.
                     </h4>
                     { warning }
                     Unknown devices: