From 682781aa48fb4f2b41ebae6662cd24628c33ddce Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 25 Feb 2020 13:27:59 +0100
Subject: [PATCH] better word smithing

---
 src/components/views/messages/MKeyVerificationRequest.js | 4 ++--
 src/components/views/right_panel/EncryptionInfo.js       | 2 +-
 src/components/views/verification/VerificationShowSas.js | 2 +-
 src/i18n/strings/en_EN.json                              | 7 ++++---
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/components/views/messages/MKeyVerificationRequest.js b/src/components/views/messages/MKeyVerificationRequest.js
index df1e14a717..f49ae1b6b1 100644
--- a/src/components/views/messages/MKeyVerificationRequest.js
+++ b/src/components/views/messages/MKeyVerificationRequest.js
@@ -136,9 +136,9 @@ export default class MKeyVerificationRequest extends React.Component {
             } else if (request.cancelled) {
                 stateLabel = this._cancelledLabel(request.cancellingUserId);
             } else if (request.accepting) {
-                stateLabel = _t("accepting …");
+                stateLabel = _t("Accepting …");
             } else if (request.declining) {
-                stateLabel = _t("declining …");
+                stateLabel = _t("Declining …");
             }
             stateNode = (<div className="mx_cryptoEvent_state">{stateLabel}</div>);
         }
diff --git a/src/components/views/right_panel/EncryptionInfo.js b/src/components/views/right_panel/EncryptionInfo.js
index 3638e1058f..bbedc9b303 100644
--- a/src/components/views/right_panel/EncryptionInfo.js
+++ b/src/components/views/right_panel/EncryptionInfo.js
@@ -37,7 +37,7 @@ const EncryptionInfo = ({waitingForOtherParty, waitingForNetwork, member, onStar
                 displayName: member.displayName || member.name || member.userId,
             });
         } else {
-            text = _t("Waiting for network…");
+            text = _t("Accepting…");
         }
         content = <PendingActionSpinner text={text} />;
     } else {
diff --git a/src/components/views/verification/VerificationShowSas.js b/src/components/views/verification/VerificationShowSas.js
index ea81ef3d65..e640a75129 100644
--- a/src/components/views/verification/VerificationShowSas.js
+++ b/src/components/views/verification/VerificationShowSas.js
@@ -109,7 +109,7 @@ export default class VerificationShowSas extends React.Component {
                 const {displayName} = this.props;
                 text = _t("Waiting for %(displayName)s to verify…", {displayName});
             } else {
-                text = _t("Waiting for network…");
+                text = _t("Cancelling…");
             }
             confirm = <PendingActionSpinner text={text} />;
         } else {
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 6192302d18..3b2bca49a3 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -465,6 +465,7 @@
     "Verify this user by confirming the following number appears on their screen.": "Verify this user by confirming the following number appears on their screen.",
     "Unable to find a supported verification method.": "Unable to find a supported verification method.",
     "Waiting for %(displayName)s to verify…": "Waiting for %(displayName)s to verify…",
+    "Cancelling…": "Cancelling…",
     "They match": "They match",
     "They don't match": "They don't match",
     "To be secure, do this in person or use a trusted way to communicate.": "To be secure, do this in person or use a trusted way to communicate.",
@@ -1165,7 +1166,7 @@
     "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.",
     "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.",
     "Waiting for %(displayName)s to accept…": "Waiting for %(displayName)s to accept…",
-    "Waiting for network…": "Waiting for network…",
+    "Accepting…": "Accepting…",
     "Start Verification": "Start Verification",
     "Messages in this room are end-to-end encrypted.": "Messages in this room are end-to-end encrypted.",
     "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Your messages are secured and only you and the recipient have the unique keys to unlock them.",
@@ -1249,8 +1250,8 @@
     "You cancelled": "You cancelled",
     "%(name)s declined": "%(name)s declined",
     "%(name)s cancelled": "%(name)s cancelled",
-    "accepting …": "accepting …",
-    "declining …": "declining …",
+    "Accepting …": "Accepting …",
+    "Declining …": "Declining …",
     "%(name)s wants to verify": "%(name)s wants to verify",
     "You sent a verification request": "You sent a verification request",
     "Error decrypting video": "Error decrypting video",