Merge pull request #2917 from jryans/key-backup-restore-button

Clarify that use backup means restore
matrix-org · Apr 15, 2019 · 1dc9e48 · 1dc9e48
2 parents c0cf6a3 + 2054d53
commit 1dc9e48
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/src/components/views/settings/KeyBackupPanel.js b/src/components/views/settings/KeyBackupPanel.js
@@ -187,12 +187,17 @@ export default class KeyBackupPanel extends React.PureComponent {
                 clientBackupStatus = <div>
                     <p>{encryptedMessageAreEncrypted}</p>
                     <p>{_t(
-                        "This device is <b>not backing up your keys</b>.", {},
+                        "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.", {},
                         {b: sub => <b>{sub}</b>},
                     )}</p>
-                    <p>{_t("Back up your keys before signing out to avoid losing them.")}</p>
+                    <p>{_t(
+                        "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("Use key backup");
+                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
@@ -467,9 +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>.": "This device is <b>not backing up your keys</b>.",
-    "Back up your keys before signing out to avoid losing them.": "Back up your keys before signing out to avoid losing them.",
-    "Use key backup": "Use key backup",
+    "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.",
@@ -485,6 +485,7 @@
     "Backup version: ": "Backup version: ",
     "Algorithm: ": "Algorithm: ",
     "Your keys are <b>not being backed up from this device</b>.": "Your keys are <b>not being backed up from this device</b>.",
+    "Back up your keys before signing out to avoid losing them.": "Back up your keys before signing out to avoid losing them.",
     "Start using Key Backup": "Start using Key Backup",
     "Error saving email notification preferences": "Error saving email notification preferences",
     "An error occurred whilst saving your email notification preferences.": "An error occurred whilst saving your email notification preferences.",