From 39bd1da1d0b2d1c23554c8cb3a55cc7fcfda4f54 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 20 Mar 2020 15:30:17 +0100
Subject: [PATCH] update copy

---
 .../dialogs/ManualDeviceKeyVerificationDialog.js    | 13 ++++---------
 src/i18n/strings/en_EN.json                         |  7 +++++--
 src/verification.js                                 |  4 ++--
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/components/views/dialogs/ManualDeviceKeyVerificationDialog.js b/src/components/views/dialogs/ManualDeviceKeyVerificationDialog.js
index 2db090a901..4b9d7239e6 100644
--- a/src/components/views/dialogs/ManualDeviceKeyVerificationDialog.js
+++ b/src/components/views/dialogs/ManualDeviceKeyVerificationDialog.js
@@ -50,12 +50,9 @@ export default class ManualDeviceKeyVerificationDialog extends React.Component {
 
         let text;
         if (MatrixClientPeg.get().getUserId() === this.props.userId) {
-            text = _t("To verify that this session can be trusted, please check that the key you see " +
-                "in User Settings on that device matches the key below:");
+            text = _t("Confirm by comparing the following with the User Settings in your other session:");
         } else {
-            text = _t("To verify that this session can be trusted, please contact its owner using some other " +
-                "means (e.g. in person or a phone call) and ask them whether the key they see in their User Settings " +
-                "for this session matches the key below:");
+            text = _t("Confirm this user's session by comparing the following with their User Settings:");
         }
 
         const key = FormattingUtils.formatCryptoKey(this.props.device.getFingerprint());
@@ -72,9 +69,7 @@ export default class ManualDeviceKeyVerificationDialog extends React.Component {
                     </ul>
                 </div>
                 <p>
-                    { _t("If it matches, press the verify button below. " +
-                        "If it doesn't, then someone else is intercepting this session " +
-                        "and you probably want to press the blacklist button instead.") }
+                    { _t("If they don't match, the security of your communication may be compromised.") }
                 </p>
             </div>
         );
@@ -83,7 +78,7 @@ export default class ManualDeviceKeyVerificationDialog extends React.Component {
             <QuestionDialog
                 title={_t("Verify session")}
                 description={body}
-                button={_t("I verify that the keys match")}
+                button={_t("Verify session")}
                 onFinished={this._onLegacyFinished}
             />
         );
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index e04946b5a3..4ff7ebc9c1 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -294,8 +294,8 @@
     "Not Trusted": "Not Trusted",
     "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) signed in to a new session without verifying it:",
     "Ask this user to verify their session, or manually verify it below.": "Ask this user to verify their session, or manually verify it below.",
-    "Legacy Verify Device": "Legacy Verify Device",
-    "Verify Device by Emoji": "Verify Device by Emoji",
+    "Manually Verify by Text": "Manually Verify by Text",
+    "Interactively verify by Emoji": "Interactively verify by Emoji",
     "Done": "Done",
     "%(displayName)s is typing …": "%(displayName)s is typing …",
     "%(names)s and %(count)s others are typing …|other": "%(names)s and %(count)s others are typing …",
@@ -1614,6 +1614,9 @@
     "Manually export keys": "Manually export keys",
     "You'll lose access to your encrypted messages": "You'll lose access to your encrypted messages",
     "Are you sure you want to sign out?": "Are you sure you want to sign out?",
+    "Confirm by comparing the following with the User Settings in your other session:": "Confirm by comparing the following with the User Settings in your other session:",
+    "Confirm this user's session by comparing the following with their User Settings:": "Confirm this user's session by comparing the following with their User Settings:",
+    "If they don't match, the security of your communication may be compromised.": "If they don't match, the security of your communication may be compromised.",
     "Your homeserver doesn't seem to support this feature.": "Your homeserver doesn't seem to support this feature.",
     "Message edits": "Message edits",
     "Your account is not secure": "Your account is not secure",
diff --git a/src/verification.js b/src/verification.js
index e33a569a73..d0f6fd7806 100644
--- a/src/verification.js
+++ b/src/verification.js
@@ -53,8 +53,8 @@ function UntrustedDeviceDialog(props) {
             <p>{_t("Ask this user to verify their session, or manually verify it below.")}</p>
         </div>
         <div className='mx_Dialog_buttons'>
-            <AccessibleButton element="button" kind="secondary" onClick={() => onFinished("legacy")}>{_t("Legacy Verify Device")}</AccessibleButton>
-            <AccessibleButton element="button" kind="secondary" onClick={() => onFinished("sas")}>{_t("Verify Device by Emoji")}</AccessibleButton>
+            <AccessibleButton element="button" kind="secondary" onClick={() => onFinished("legacy")}>{_t("Manually Verify by Text")}</AccessibleButton>
+            <AccessibleButton element="button" kind="secondary" onClick={() => onFinished("sas")}>{_t("Interactively verify by Emoji")}</AccessibleButton>
             <AccessibleButton kind="primary" onClick={() => onFinished()}>{_t("Done")}</AccessibleButton>
         </div>
     </BaseDialog>;