Merge pull request #2509 from matrix-org/dbkr/logout_warning_wording

Tweak wording on logout warning

src/components/views/dialogs/LogoutDialog.js

@@ -138,7 +138,9 @@ export default class LogoutDialog extends React.Component {
                     // once you can restorew a backup by verifying a device
                     description={_t(
                         "When signing in again, you can access encrypted chat history by " +
-                        "restoring your key backup. You'll need your recovery key.",
+                        "restoring your key backup. You'll need your recovery passphrase " +
+                        "or, if you didn't set a recovery passphrase, your recovery key " +
+                        "(that you downloaded).",
                     )}
                     button={_t("Sign out")}
                     onFinished={this._onFinished}

src/i18n/strings/en_EN.json

@@ -667,12 +667,13 @@
     "You are trying to access a room.": "You are trying to access a room.",
     "<a>Click here</a> to join the discussion!": "<a>Click here</a> to join the discussion!",
     "This is a preview of this room. Room interactions have been disabled": "This is a preview of this room. Room interactions have been disabled",
+    "Set up": "Set up",
     "Secure Message Recovery has been set up on another device: <deviceName></deviceName>": "Secure Message Recovery has been set up on another device: <deviceName></deviceName>",
     "To view your secure message history and ensure you can view new messages on future devices, verify that device now.": "To view your secure message history and ensure you can view new messages on future devices, verify that device now.",
+    "Verify device": "Verify device",
     "If you log out or use another device, you'll lose your secure message history. To prevent this, set up Secure Message Recovery.": "If you log out or use another device, you'll lose your secure message history. To prevent this, set up Secure Message Recovery.",
     "Secure Message Recovery": "Secure Message Recovery",
     "Don't ask again": "Don't ask again",
-    "Set up": "Set up",
     "To change the room's avatar, you must be a": "To change the room's avatar, you must be a",
     "To change the room's name, you must be a": "To change the room's name, you must be a",
     "To change the room's main address, you must be a": "To change the room's main address, you must be a",
@@ -998,7 +999,6 @@
     "Device key": "Device key",
     "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this device and you probably want to press the blacklist button instead.": "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this device and you probably want to press the blacklist button instead.",
     "In future this verification process will be more sophisticated.": "In future this verification process will be more sophisticated.",
-    "Verify device": "Verify device",
     "I verify that the keys match": "I verify that the keys match",
     "Back": "Back",
     "Send Custom Event": "Send Custom Event",
@@ -1033,7 +1033,7 @@
     "For security, logging out will delete any end-to-end encryption keys from this browser. If you want to be able to decrypt your conversation history from future Riot sessions, please export your room keys for safe-keeping.": "For security, logging out will delete any end-to-end encryption keys from this browser. If you want to be able to decrypt your conversation history from future Riot sessions, please export your room keys for safe-keeping.",
     "Set a Recovery Method": "Set a Recovery Method",
     "I understand, log out without": "I understand, log out without",
-    "When signing in again, you can access encrypted chat history by restoring your key backup. You'll need your recovery key.": "When signing in again, you can access encrypted chat history by restoring your key backup. You'll need your recovery key.",
+    "When signing in again, you can access encrypted chat history by restoring your key backup. You'll need your recovery passphrase or, if you didn't set a recovery passphrase, your recovery key (that you downloaded).": "When signing in again, you can access encrypted chat history by restoring your key backup. You'll need your recovery passphrase or, if you didn't set a recovery passphrase, your recovery key (that you downloaded).",
     "Thanks for testing the Riot Redesign. If you run into any bugs or visual issues, please let us know on GitHub.": "Thanks for testing the Riot Redesign. If you run into any bugs or visual issues, please let us know on GitHub.",
     "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.",
     "Report bugs & give feedback": "Report bugs & give feedback",