From 62c73146dc35337cd739cff7bd14b24526a5eec2 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Wed, 29 Apr 2020 14:14:39 +0100
Subject: [PATCH] copy changes

---
 .../dialogs/keybackup/RestoreKeyBackupDialog.js      | 12 ++++++------
 src/i18n/strings/en_EN.json                          | 10 +++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
index 92d23f9e65..da67fb9777 100644
--- a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
+++ b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
@@ -283,15 +283,15 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
         let content;
         let title;
         if (this.state.loading) {
-            title = _t("Loading...");
+            title = _t("Restoring keys from backup");
             let details;
             if (this.state.progress.stage === "fetch") {
-                details = _t("Downloading from server...");
+                details = _t("Fetching keys from server...");
             } else if (this.state.progress.stage === "load_keys") {
                 const { total, successes, failures } = this.state.progress;
-                details = _t("Loaded %(completed)s of %(total)s", { total, completed: successes + failures });
+                details = _t("%(completed)s of %(total)s keys restored", { total, completed: successes + failures });
             } else if (this.state.progress.stage === "prefetch") {
-                details = _t("Requesting from server...");
+                details = _t("Fetching keys from server...");
             }
             content = <div>
                 <div>{details}</div>
@@ -328,7 +328,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
             content = _t("No backup found!");
         } else if (this.state.recoverInfo) {
             const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
-            title = _t("Backup restored");
+            title = _t("Keys restored");
             let failedToDecrypt;
             if (this.state.recoverInfo.total > this.state.recoverInfo.imported) {
                 failedToDecrypt = <p>{_t(
@@ -337,7 +337,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
                 )}</p>;
             }
             content = <div>
-                <p>{_t("Restored %(sessionCount)s session keys", {sessionCount: this.state.recoverInfo.imported})}</p>
+                <p>{_t("Successfully restored %(sessionCount)s keys", {sessionCount: this.state.recoverInfo.imported})}</p>
                 {failedToDecrypt}
                 <DialogButtons primaryButton={_t('OK')}
                     onPrimaryButtonClick={this._onDone}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index e33a389e27..5593df1f0a 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1791,9 +1791,9 @@
     "Not a valid recovery key": "Not a valid recovery key",
     "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.": "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.",
     "If you've forgotten your recovery key you can <button>set up new recovery options</button>.": "If you've forgotten your recovery key you can <button>set up new recovery options</button>.",
-    "Downloading from server...": "Downloading from server...",
-    "Loaded %(completed)s of %(total)s": "Loaded %(completed)s of %(total)s",
-    "Requesting from server...": "Requesting from server...",
+    "Restoring keys from backup": "Restoring keys from backup",
+    "Fetching keys from server...": "Fetching keys from server...",
+    "%(completed)s of %(total)s keys restored": "%(completed)s of %(total)s keys restored",
     "Unable to load backup status": "Unable to load backup status",
     "Recovery key mismatch": "Recovery key mismatch",
     "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.",
@@ -1801,9 +1801,9 @@
     "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.",
     "Unable to restore backup": "Unable to restore backup",
     "No backup found!": "No backup found!",
-    "Backup restored": "Backup restored",
+    "Keys restored": "Keys restored",
     "Failed to decrypt %(failedCount)s sessions!": "Failed to decrypt %(failedCount)s sessions!",
-    "Restored %(sessionCount)s session keys": "Restored %(sessionCount)s session keys",
+    "Successfully restored %(sessionCount)s keys": "Successfully restored %(sessionCount)s keys",
     "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Warning</b>: you should only set up key backup from a trusted computer.",
     "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Access your secure message history and set up secure messaging by entering your recovery passphrase.",
     "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>",