From 2054d5378274000572d7a932e844d70f1ead15ec Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Mon, 15 Apr 2019 15:10:19 +0100
Subject: [PATCH] Tweaked wording after discussing with @lampholder

---
 src/components/views/settings/KeyBackupPanel.js | 10 +++++-----
 src/i18n/strings/en_EN.json                     |  5 +++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/components/views/settings/KeyBackupPanel.js b/src/components/views/settings/KeyBackupPanel.js
index e85491bf60..2ba05a0e6b 100644
--- a/src/components/views/settings/KeyBackupPanel.js
+++ b/src/components/views/settings/KeyBackupPanel.js
@@ -176,7 +176,7 @@ export default class KeyBackupPanel extends React.PureComponent {
         } else if (this.state.backupInfo) {
             const EmojiText = sdk.getComponent('elements.EmojiText');
             let clientBackupStatus;
-            const restoreButtonCaption = _t("Restore from Backup");
+            let restoreButtonCaption = _t("Restore from Backup");
 
             if (MatrixClientPeg.get().getKeyBackupEnabled()) {
                 clientBackupStatus = <div>
@@ -188,16 +188,16 @@ export default class KeyBackupPanel extends React.PureComponent {
                     <p>{encryptedMessageAreEncrypted}</p>
                     <p>{_t(
                         "This device is <b>not backing up your keys</b>, " +
-                        "but there is an existing backup you can restore from " +
+                        "but you do have an existing backup you can restore from " +
                         "and add to going forward.", {},
                         {b: sub => <b>{sub}</b>},
                     )}</p>
                     <p>{_t(
-                        "Enable key backup on this device via the restore " +
-                        "process before signing out to avoid losing any keys " +
-                        "that may only be on this device.",
+                        "Connect this device to key backup before signing out to avoid " +
+                        "losing any keys that may only be on this device.",
                     )}</p>
                 </div>;
+                restoreButtonCaption = _t("Connect this device to Key Backup");
             }
 
             let uploadStatus;
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 5d390f815a..d0f265e430 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -467,8 +467,9 @@
     "Unable to load key backup status": "Unable to load key backup status",
     "Restore from Backup": "Restore from Backup",
     "This device is backing up your keys. ": "This device is backing up your keys. ",
-    "This device is <b>not backing up your keys</b>, but there is an existing backup you can restore from and add to going forward.": "This device is <b>not backing up your keys</b>, but there is an existing backup you can restore from and add to going forward.",
-    "Enable key backup on this device via the restore process before signing out to avoid losing any keys that may only be on this device.": "Enable key backup on this device via the restore process before signing out to avoid losing any keys that may only be on this device.",
+    "This device is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "This device is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.",
+    "Connect this device to key backup before signing out to avoid losing any keys that may only be on this device.": "Connect this device to key backup before signing out to avoid losing any keys that may only be on this device.",
+    "Connect this device to Key Backup": "Connect this device to Key Backup",
     "Backing up %(sessionsRemaining)s keys...": "Backing up %(sessionsRemaining)s keys...",
     "All keys backed up": "All keys backed up",
     "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s.": "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s.",