From bf443149b5cd08cac4b7f9016e600ba802111b6f Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Wed, 19 Jun 2019 15:07:33 -0600 Subject: [PATCH] Make the verification cancelled dialog say OK instead of Cancel Fixes https://github.com/vector-im/riot-web/issues/9306 Includes unexpected cleanup of i18n --- src/components/views/verification/VerificationCancelled.js | 2 +- src/i18n/strings/en_EN.json | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/components/views/verification/VerificationCancelled.js b/src/components/views/verification/VerificationCancelled.js index b21153f2cc..baace2ca1e 100644 --- a/src/components/views/verification/VerificationCancelled.js +++ b/src/components/views/verification/VerificationCancelled.js @@ -31,7 +31,7 @@ export default class VerificationCancelled extends React.Component { "The other party cancelled the verification.", )}

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index c17b5d9fec..3edaaf6241 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -372,7 +372,7 @@ "Decline": "Decline", "Accept": "Accept", "The other party cancelled the verification.": "The other party cancelled the verification.", - "Cancel": "Cancel", + "OK": "OK", "Verified!": "Verified!", "You've successfully verified this user.": "You've successfully verified this user.", "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.", @@ -380,6 +380,7 @@ "Verify this user by confirming the following emoji appear on their screen.": "Verify this user by confirming the following emoji appear on their screen.", "Verify this user by confirming the following number appears on their screen.": "Verify this user by confirming the following number appears on their screen.", "Unable to find a supported verification method.": "Unable to find a supported verification method.", + "Cancel": "Cancel", "For maximum security, we recommend you do this in person or use another trusted means of communication.": "For maximum security, we recommend you do this in person or use another trusted means of communication.", "Dog": "Dog", "Cat": "Cat", @@ -518,7 +519,6 @@ "An error occurred whilst saving your email notification preferences.": "An error occurred whilst saving your email notification preferences.", "Keywords": "Keywords", "Enter keywords separated by a comma:": "Enter keywords separated by a comma:", - "OK": "OK", "Failed to change settings": "Failed to change settings", "Can't update user notification settings": "Can't update user notification settings", "Failed to update keywords": "Failed to update keywords", @@ -1145,7 +1145,6 @@ "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.", "Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)", "To continue, please enter your password:": "To continue, please enter your password:", - "password": "password", "Verify device": "Verify device", "Use Legacy Verification (for older clients)": "Use Legacy Verification (for older clients)", "Verify by comparing a short text string.": "Verify by comparing a short text string.", @@ -1335,7 +1334,6 @@ "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use this app with an existing Matrix account on a different homeserver.": "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use this app with an existing Matrix account on a different homeserver.", "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.", "To continue, please enter your password.": "To continue, please enter your password.", - "Password:": "Password:", "Please review and accept all of the homeserver's policies": "Please review and accept all of the homeserver's policies", "Please review and accept the policies of this homeserver:": "Please review and accept the policies of this homeserver:", "An email has been sent to %(emailAddress)s": "An email has been sent to %(emailAddress)s", @@ -1567,7 +1565,6 @@ "This server does not support authentication with a phone number.": "This server does not support authentication with a phone number.", "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).": "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).", "Continue with previous account": "Continue with previous account", - "Sign out of previous account": "Sign out of previous account", "Log in to your new account.": "Log in to your new account.", "You can now close this window or log in to your new account.": "You can now close this window or log in to your new account.", "Registration Successful": "Registration Successful",