diff --git a/res/css/_components.scss b/res/css/_components.scss
index 45ed6b3300..be1818cf8e 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -199,10 +199,10 @@
@import "./views/settings/_E2eAdvancedPanel.scss";
@import "./views/settings/_EmailAddresses.scss";
@import "./views/settings/_IntegrationManager.scss";
-@import "./views/settings/_KeyBackupPanel.scss";
@import "./views/settings/_Notifications.scss";
@import "./views/settings/_PhoneNumbers.scss";
@import "./views/settings/_ProfileSettings.scss";
+@import "./views/settings/_SecureBackupPanel.scss";
@import "./views/settings/_SetIdServer.scss";
@import "./views/settings/_SetIntegrationManager.scss";
@import "./views/settings/_UpdateCheckButton.scss";
diff --git a/res/css/views/settings/_KeyBackupPanel.scss b/res/css/views/settings/_SecureBackupPanel.scss
similarity index 95%
rename from res/css/views/settings/_KeyBackupPanel.scss
rename to res/css/views/settings/_SecureBackupPanel.scss
index 872162caad..3522a81e32 100644
--- a/res/css/views/settings/_KeyBackupPanel.scss
+++ b/res/css/views/settings/_SecureBackupPanel.scss
@@ -1,6 +1,6 @@
/*
Copyright 2018 New Vector Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/src/components/views/settings/KeyBackupPanel.js b/src/components/views/settings/SecureBackupPanel.js
similarity index 99%
rename from src/components/views/settings/KeyBackupPanel.js
rename to src/components/views/settings/SecureBackupPanel.js
index 8a74276f58..35009bc22d 100644
--- a/src/components/views/settings/KeyBackupPanel.js
+++ b/src/components/views/settings/SecureBackupPanel.js
@@ -23,7 +23,7 @@ import { _t } from '../../../languageHandler';
import Modal from '../../../Modal';
import { isSecureBackupRequired } from '../../../utils/WellKnownUtils';
-export default class KeyBackupPanel extends React.PureComponent {
+export default class SecureBackupPanel extends React.PureComponent {
constructor(props) {
super(props);
diff --git a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
index 90dcc0b658..c25ac438e0 100644
--- a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
@@ -29,6 +29,7 @@ import {sleep} from "../../../../../utils/promise";
import dis from "../../../../../dispatcher/dispatcher";
import {privateShouldBeEncrypted} from "../../../../../createRoom";
import {SettingLevel} from "../../../../../settings/SettingLevel";
+import SecureBackupPanel from "../../SecureBackupPanel";
export class IgnoredUser extends React.Component {
static propTypes = {
@@ -288,12 +289,11 @@ export default class SecurityUserSettingsTab extends React.Component {
const SettingsFlag = sdk.getComponent('views.elements.SettingsFlag');
const EventIndexPanel = sdk.getComponent('views.settings.EventIndexPanel');
- const KeyBackupPanel = sdk.getComponent('views.settings.KeyBackupPanel');
- const keyBackup = (
+ const secureBackup = (
-
{_t("Key backup")}
+
{_t("Secure Backup")}
-
+
);
@@ -352,7 +352,7 @@ export default class SecurityUserSettingsTab extends React.Component {
{_t("Encryption")}
- {keyBackup}
+ {secureBackup}
{eventIndex}
{crossSigning}
{this._renderCurrentDeviceInfo()}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 95b6c23a77..464edba6ce 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -697,36 +697,6 @@
"Connecting to integration manager...": "Connecting to integration manager...",
"Cannot connect to integration manager": "Cannot connect to integration manager",
"The integration manager is offline or it cannot reach your homeserver.": "The integration manager is offline or it cannot reach your homeserver.",
- "Delete Backup": "Delete Backup",
- "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.",
- "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.",
- "Unable to load key backup status": "Unable to load key backup status",
- "Restore from Backup": "Restore from Backup",
- "This session is backing up your keys. ": "This session is backing up your keys. ",
- "This session is not backing up your keys, but you do have an existing backup you can restore from and add to going forward.": "This session is not backing up your keys, but you do have an existing backup you can restore from and add to going forward.",
- "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.",
- "Connect this session to Key Backup": "Connect this session to Key Backup",
- "not stored": "not stored",
- "Backing up %(sessionsRemaining)s keys...": "Backing up %(sessionsRemaining)s keys...",
- "All keys backed up": "All keys backed up",
- "Backup has a valid signature from this user": "Backup has a valid signature from this user",
- "Backup has a invalid signature from this user": "Backup has a invalid signature from this user",
- "Backup has a signature from unknown user with ID %(deviceId)s": "Backup has a signature from unknown user with ID %(deviceId)s",
- "Backup has a signature from unknown session with ID %(deviceId)s": "Backup has a signature from unknown session with ID %(deviceId)s",
- "Backup has a valid signature from this session": "Backup has a valid signature from this session",
- "Backup has an invalid signature from this session": "Backup has an invalid signature from this session",
- "Backup has a valid signature from verified session ": "Backup has a valid signature from verified session ",
- "Backup has a valid signature from unverified session ": "Backup has a valid signature from unverified session ",
- "Backup has an invalid signature from verified session ": "Backup has an invalid signature from verified session ",
- "Backup has an invalid signature from unverified session ": "Backup has an invalid signature from unverified session ",
- "Backup is not signed by any of your sessions": "Backup is not signed by any of your sessions",
- "This backup is trusted because it has been restored on this session": "This backup is trusted because it has been restored on this session",
- "Backup version: ": "Backup version: ",
- "Algorithm: ": "Algorithm: ",
- "Backup key stored: ": "Backup key stored: ",
- "Your keys are not being backed up from this session.": "Your keys are not being backed up from this session.",
- "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.",
"Keywords": "Keywords",
@@ -758,6 +728,36 @@
"Display Name": "Display Name",
"Profile picture": "Profile picture",
"Save": "Save",
+ "Delete Backup": "Delete Backup",
+ "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.",
+ "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.",
+ "Unable to load key backup status": "Unable to load key backup status",
+ "Restore from Backup": "Restore from Backup",
+ "This session is backing up your keys. ": "This session is backing up your keys. ",
+ "This session is not backing up your keys, but you do have an existing backup you can restore from and add to going forward.": "This session is not backing up your keys, but you do have an existing backup you can restore from and add to going forward.",
+ "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.",
+ "Connect this session to Key Backup": "Connect this session to Key Backup",
+ "not stored": "not stored",
+ "Backing up %(sessionsRemaining)s keys...": "Backing up %(sessionsRemaining)s keys...",
+ "All keys backed up": "All keys backed up",
+ "Backup has a valid signature from this user": "Backup has a valid signature from this user",
+ "Backup has a invalid signature from this user": "Backup has a invalid signature from this user",
+ "Backup has a signature from unknown user with ID %(deviceId)s": "Backup has a signature from unknown user with ID %(deviceId)s",
+ "Backup has a signature from unknown session with ID %(deviceId)s": "Backup has a signature from unknown session with ID %(deviceId)s",
+ "Backup has a valid signature from this session": "Backup has a valid signature from this session",
+ "Backup has an invalid signature from this session": "Backup has an invalid signature from this session",
+ "Backup has a valid signature from verified session ": "Backup has a valid signature from verified session ",
+ "Backup has a valid signature from unverified session ": "Backup has a valid signature from unverified session ",
+ "Backup has an invalid signature from verified session ": "Backup has an invalid signature from verified session ",
+ "Backup has an invalid signature from unverified session ": "Backup has an invalid signature from unverified session ",
+ "Backup is not signed by any of your sessions": "Backup is not signed by any of your sessions",
+ "This backup is trusted because it has been restored on this session": "This backup is trusted because it has been restored on this session",
+ "Backup version: ": "Backup version: ",
+ "Algorithm: ": "Algorithm: ",
+ "Backup key stored: ": "Backup key stored: ",
+ "Your keys are not being backed up from this session.": "Your keys are not being backed up from this session.",
+ "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",
"Identity Server URL must be HTTPS": "Identity Server URL must be HTTPS",
"Not a valid Identity Server (status code %(code)s)": "Not a valid Identity Server (status code %(code)s)",
"Could not connect to Identity Server": "Could not connect to Identity Server",
@@ -904,7 +904,7 @@
"Bulk options": "Bulk options",
"Accept all %(invitedRooms)s invites": "Accept all %(invitedRooms)s invites",
"Reject all %(invitedRooms)s invites": "Reject all %(invitedRooms)s invites",
- "Key backup": "Key backup",
+ "Secure Backup": "Secure Backup",
"Message search": "Message search",
"Cross-signing": "Cross-signing",
"Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.",