From 226abb457e2ca5b3302609b6a69033e1480e24f6 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 3 Jun 2020 12:24:22 +0100
Subject: [PATCH] Update copy in encryption upgrade swcreen

---
 .../secretstorage/CreateSecretStorageDialog.js     | 14 ++++++--------
 src/i18n/strings/en_EN.json                        |  6 ++----
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index dd71b13fb6..192427d384 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -389,10 +389,8 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         let authPrompt;
         let nextCaption = _t("Next");
         if (!this.state.backupSigStatus.usable) {
-            authPrompt = <div>
-                <div>{_t("Restore your key backup to upgrade your encryption")}</div>
-            </div>;
-            nextCaption = _t("Restore");
+            authPrompt = null;
+            nextCaption = _t("Upload");
         } else if (this.state.canUploadKeysWithPasswordOnly && !this.props.accountPassword) {
             authPrompt = <div>
                 <div>{_t("Enter your account password to confirm the upgrade:")}</div>
@@ -413,9 +411,9 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
 
         return <form onSubmit={this._onMigrateFormSubmit}>
             <p>{_t(
-                "Upgrade this session to allow it to verify other sessions, " +
-                "granting them access to encrypted messages and marking them " +
-                "as trusted for other users.",
+                "Upgrade your Recovery Key to store encryption keys & secrets " +
+                "with your account data. If you lose access to this login you'll " +
+                "need it to unlock your data.",
             )}</p>
             <div>{authPrompt}</div>
             <DialogButtons
@@ -547,7 +545,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             case PHASE_INTRO:
                 return _t('Create a Recovery Key');
             case PHASE_MIGRATE:
-                return _t('Upgrade your encryption');
+                return _t('Upgrade your Recovery Key');
             case PHASE_CONFIRM_SKIP:
                 return _t('Are you sure?');
             case PHASE_SHOWKEY:
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 9df98208a1..5652443e58 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2147,11 +2147,9 @@
     "Import": "Import",
     "Confirm encryption setup": "Confirm encryption setup",
     "Click the button below to confirm setting up encryption.": "Click the button below to confirm setting up encryption.",
-    "Restore your key backup to upgrade your encryption": "Restore your key backup to upgrade your encryption",
-    "Restore": "Restore",
     "Enter your account password to confirm the upgrade:": "Enter your account password to confirm the upgrade:",
     "You'll need to authenticate with the server to confirm the upgrade.": "You'll need to authenticate with the server to confirm the upgrade.",
-    "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.",
+    "Upgrade your Recovery Key to store encryption keys & secrets with your account data. If you lose access to this login you'll need it to unlock your data.": "Upgrade your Recovery Key to store encryption keys & secrets with your account data. If you lose access to this login you'll need it to unlock your data.",
     "Store your Recovery Key somewhere safe, it can be used to unlock your encrypted messages & data.": "Store your Recovery Key somewhere safe, it can be used to unlock your encrypted messages & data.",
     "Download": "Download",
     "Copy": "Copy",
@@ -2159,7 +2157,7 @@
     "Retry": "Retry",
     "Create a Recovery Key to store encryption keys & secrets with your account data. If you lose access to this login you’ll need it to unlock your data.": "Create a Recovery Key to store encryption keys & secrets with your account data. If you lose access to this login you’ll need it to unlock your data.",
     "Create a Recovery Key": "Create a Recovery Key",
-    "Upgrade your encryption": "Upgrade your encryption",
+    "Upgrade your Recovery Key": "Upgrade your Recovery Key",
     "Store your Recovery Key": "Store your Recovery Key",
     "Unable to set up secret storage": "Unable to set up secret storage",
     "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.",