From e54077e020c2a31f27dc7770e47d23d37e64b311 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 14 Apr 2020 17:26:23 +0200 Subject: [PATCH] String copied to Riot project --- vector/src/main/res/values/strings.xml | 104 ++++++++++++++++++ vector/src/main/res/values/strings_riotX.xml | 106 +------------------ 2 files changed, 106 insertions(+), 104 deletions(-) diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml index 3f176c4ee9..6b0591595a 100644 --- a/vector/src/main/res/values/strings.xml +++ b/vector/src/main/res/values/strings.xml @@ -2194,4 +2194,108 @@ Not all features in Riot are implemented in RiotX yet. Main missing (and coming Keys are already up to date! + RiotX Android + + Key Requests + + Unlock encrypted messages history + + Refresh + + New Session + Tap to review & verify + Use this session to verify your new one, granting it access to encrypted messages. + This wasn’t me + Your account may be compromised + + If you cancel, you won’t be able to read encrypted messages on this device, and other users won’t trust it + If you cancel, you won’t be able to read encrypted messages on your new device, and other users won’t trust it + You won’t verify %1$s (%2$s) if you cancel now. Start again in their user profile. + + + One of the following may be compromised:\n\n- Your password\n- Your homeserver\n- This device, or the other device\n- The internet connection either device is using\n\nWe recommend you change your password & recovery key in Settings immediately. + + + Verify your devices from Settings. + Verification Cancelled + + Message Password + Message Key + Account Password + + + Set a %s + Generate a Message Key + + + Confirm %s + + + Enter your %s to continue. + + + Secure & unlock encrypted messages and trust with a %s. + + Enter your %s again to confirm it. + Don’t re-use your account password. + + + This might take several seconds, please be patient. + Setting up recovery. + Your recovery key + You‘re done! + Keep it safe + Finish + + + Use this %1$s as a safety net in case you forget your %2$s. + + Publishing created identity keys + Generating secure key from passphrase + Defining SSSS default Key + Synchronizing Master key + Synchronizing User key + Synchronizing Self Signing key + Setting Up Key Backup + + + + Your %2$s & %1$s are now set.\n\nKeep them safe! You’ll need them to unlock encrypted messages and secure information if you lose all of your active sessions. + + + Print it and store it somewhere safe + Save it on a USB key or backup drive + Copy it to your personal cloud storage + + You cannot do that from mobile + + Setting a Message Password lets you secure & unlock encrypted messages and trust.\n\nIf you don’t want to set a Message Password, generate a Message Key instead. + Setting a Message Password lets you secure & unlock encrypted messages and trust. + + + Encryption enabled + Messages in this room are end-to-end encrypted. Learn more & verify users in their profile. + Encryption not enabled + The encryption used by this room is not supported + + %s created and configured the room. + + Almost there! Is the other device showing the same shield? + Almost there! Waiting for confirmation… + Waiting for %s… + + Failed to import keys + + Notifications configuration + Messages containing @room + Encrypted messages in one-to-one chats + Encrypted messages in group chats + When rooms are upgraded + Troubleshoot + Set notification importance by event + + Sends a message as plain text, without interpreting it as markdown + + Incorrect username and/or password. The entered password starts or ends with spaces, please check it. + diff --git a/vector/src/main/res/values/strings_riotX.xml b/vector/src/main/res/values/strings_riotX.xml index 1752197c28..00bf65e121 100644 --- a/vector/src/main/res/values/strings_riotX.xml +++ b/vector/src/main/res/values/strings_riotX.xml @@ -7,112 +7,11 @@ - RiotX Android - - Key Requests - - Unlock encrypted messages history - - Refresh - - - New Session - Tap to review & verify - Use this session to verify your new one, granting it access to encrypted messages. - This wasn’t me - Your account may be compromised - - If you cancel, you won’t be able to read encrypted messages on this device, and other users won’t trust it - If you cancel, you won’t be able to read encrypted messages on your new device, and other users won’t trust it - You won’t verify %1$s (%2$s) if you cancel now. Start again in their user profile. - - - One of the following may be compromised:\n\n- Your password\n- Your homeserver\n- This device, or the other device\n- The internet connection either device is using\n\nWe recommend you change your password & recovery key in Settings immediately. - - - Verify your devices from Settings. - Verification Cancelled - - Message Password - Message Key - Account Password - - - - Set a %s - Generate a Message Key - - - Confirm %s - - - - Enter your %s to continue. - - - Secure & unlock encrypted messages and trust with a %s. - - Enter your %s again to confirm it. - Don’t re-use your account password. - - - This might take several seconds, please be patient. - Setting up recovery. - Your recovery key - You‘re done! - Keep it safe - Finish - - - Use this %1$s as a safety net in case you forget your %2$s. - - Publishing created identity keys - Generating secure key from passphrase - Defining SSSS default Key - Synchronizing Master key - Synchronizing User key - Synchronizing Self Signing key - Setting Up Key Backup - - - - Your %2$s & %1$s are now set.\n\nKeep them safe! You’ll need them to unlock encrypted messages and secure information if you lose all of your active sessions. - - - Print it and store it somewhere safe - Save it on a USB key or backup drive - Copy it to your personal cloud storage - - You cannot do that from mobile - - Setting a Message Password lets you secure & unlock encrypted messages and trust.\n\nIf you don’t want to set a Message Password, generate a Message Key instead. - Setting a Message Password lets you secure & unlock encrypted messages and trust. - - - Encryption enabled - Messages in this room are end-to-end encrypted. Learn more & verify users in their profile. - Encryption not enabled - The encryption used by this room is not supported - - %s created and configured the room. - - Almost there! Is the other device showing the same shield? - Almost there! Waiting for confirmation… - Waiting for %s… - - Failed to import keys - - Notifications configuration - Messages containing @room - Encrypted messages in one-to-one chats - Encrypted messages in group chats - When rooms are upgraded - Troubleshoot - Set notification importance by event + @@ -127,8 +26,7 @@ - Sends a message as plain text, without interpreting it as markdown + - Incorrect username and/or password. The entered password starts or ends with spaces, please check it.