From a549c42022eb8cf4acb1f3ba129ab2755b046304 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 29 Jan 2020 12:10:50 +0000 Subject: [PATCH 1/3] Update copy for right panel verification Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/dialogs/DeviceVerifyDialog.js | 5 +---- src/components/views/right_panel/EncryptionInfo.js | 2 +- src/components/views/verification/VerificationShowSas.js | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/components/views/dialogs/DeviceVerifyDialog.js b/src/components/views/dialogs/DeviceVerifyDialog.js index 67e1649bb9..4340082c3a 100644 --- a/src/components/views/dialogs/DeviceVerifyDialog.js +++ b/src/components/views/dialogs/DeviceVerifyDialog.js @@ -194,10 +194,7 @@ export default class DeviceVerifyDialog extends React.Component { { _t("Verify by comparing a short text string.") }

- {_t( - "For maximum security, we recommend you do this in person or " + - "use another trusted means of communication.", - )} + {_t("To be secure, do this in person or use another way to communicate.")}

{

{_t("Verify User")}

{_t("For extra security, verify this user by checking a one-time code on both of your devices.")}

-

{_t("For maximum security, do this in person.")}

+

{_t("To be secure, do this in person or use another way to communicate.")}

{ content }
diff --git a/src/components/views/verification/VerificationShowSas.js b/src/components/views/verification/VerificationShowSas.js index aee0f57cf8..04f7d86ae5 100644 --- a/src/components/views/verification/VerificationShowSas.js +++ b/src/components/views/verification/VerificationShowSas.js @@ -105,7 +105,7 @@ export default class VerificationShowSas extends React.Component { return

{sasCaption}

-

{_t("For ultimate security, do this in person or use another way to communicate.")}

+

{_t("To be secure, do this in person or use another way to communicate.")}

{sasDisplay} {confirm}
; From 227e6f63762e3268c7d4e4aa09ffc26e119e8f6e Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 29 Jan 2020 12:16:42 +0000 Subject: [PATCH 2/3] regen i18n Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/i18n/strings/en_EN.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 3ae0991f16..b00fcf3c11 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -451,7 +451,7 @@ "Waiting for %(displayName)s to verify…": "Waiting for %(displayName)s to verify…", "They match": "They match", "They don't match": "They don't match", - "For ultimate security, do this in person or use another way to communicate.": "For ultimate security, do this in person or use another way to communicate.", + "To be secure, do this in person or use another way to communicate.": "To be secure, do this in person or use another way to communicate.", "Dog": "Dog", "Cat": "Cat", "Lion": "Lion", @@ -1150,7 +1150,6 @@ "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Your messages are secured and only you and the recipient have the unique keys to unlock them.", "Verify User": "Verify User", "For extra security, verify this user by checking a one-time code on both of your devices.": "For extra security, verify this user by checking a one-time code on both of your devices.", - "For maximum security, do this in person.": "For maximum security, do this in person.", "Your messages are not secure": "Your messages are not secure", "One of the following may be compromised:": "One of the following may be compromised:", "Your homeserver": "Your homeserver", @@ -1462,7 +1461,6 @@ "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.", - "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.", "Begin Verifying": "Begin Verifying", "Waiting for partner to accept...": "Waiting for partner to accept...", "Nothing appearing? Not all clients support interactive verification yet. .": "Nothing appearing? Not all clients support interactive verification yet. .", From 957e8629397cc620a1790e7154dba4d866b1b5a0 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 29 Jan 2020 13:58:02 +0000 Subject: [PATCH 3/3] Update copy some more Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/dialogs/DeviceVerifyDialog.js | 2 +- src/components/views/right_panel/EncryptionInfo.js | 2 +- src/components/views/verification/VerificationShowSas.js | 2 +- src/i18n/strings/en_EN.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/views/dialogs/DeviceVerifyDialog.js b/src/components/views/dialogs/DeviceVerifyDialog.js index 4340082c3a..f2368ad795 100644 --- a/src/components/views/dialogs/DeviceVerifyDialog.js +++ b/src/components/views/dialogs/DeviceVerifyDialog.js @@ -194,7 +194,7 @@ export default class DeviceVerifyDialog extends React.Component { { _t("Verify by comparing a short text string.") }

- {_t("To be secure, do this in person or use another way to communicate.")} + {_t("To be secure, do this in person or use a trusted way to communicate.")}

{

{_t("Verify User")}

{_t("For extra security, verify this user by checking a one-time code on both of your devices.")}

-

{_t("To be secure, do this in person or use another way to communicate.")}

+

{_t("To be secure, do this in person or use a trusted way to communicate.")}

{ content }
diff --git a/src/components/views/verification/VerificationShowSas.js b/src/components/views/verification/VerificationShowSas.js index 04f7d86ae5..2a4888ffab 100644 --- a/src/components/views/verification/VerificationShowSas.js +++ b/src/components/views/verification/VerificationShowSas.js @@ -105,7 +105,7 @@ export default class VerificationShowSas extends React.Component { return

{sasCaption}

-

{_t("To be secure, do this in person or use another way to communicate.")}

+

{_t("To be secure, do this in person or use a trusted way to communicate.")}

{sasDisplay} {confirm}
; diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index b00fcf3c11..20c1234190 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -451,7 +451,7 @@ "Waiting for %(displayName)s to verify…": "Waiting for %(displayName)s to verify…", "They match": "They match", "They don't match": "They don't match", - "To be secure, do this in person or use another way to communicate.": "To be secure, do this in person or use another way to communicate.", + "To be secure, do this in person or use a trusted way to communicate.": "To be secure, do this in person or use a trusted way to communicate.", "Dog": "Dog", "Cat": "Cat", "Lion": "Lion",