Merge pull request #3973 from matrix-org/t3chguy/update_copy

Update copy for right panel verification
This commit is contained in:
Michael Telatynski 2020-01-29 14:09:09 +00:00 committed by GitHub
commit 64e96331ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 9 deletions

View File

@ -194,10 +194,7 @@ export default class DeviceVerifyDialog extends React.Component {
{ _t("Verify by comparing a short text string.") } { _t("Verify by comparing a short text string.") }
</p> </p>
<p> <p>
{_t( {_t("To be secure, do this in person or use a trusted way to communicate.")}
"For maximum security, we recommend you do this in person or " +
"use another trusted means of communication.",
)}
</p> </p>
<DialogButtons <DialogButtons
primaryButton={_t('Begin Verifying')} primaryButton={_t('Begin Verifying')}

View File

@ -56,7 +56,7 @@ const EncryptionInfo = ({pending, member, onStartVerification}) => {
<h3>{_t("Verify User")}</h3> <h3>{_t("Verify User")}</h3>
<div> <div>
<p>{_t("For extra security, verify this user by checking a one-time code on both of your devices.")}</p> <p>{_t("For extra security, verify this user by checking a one-time code on both of your devices.")}</p>
<p>{_t("For maximum security, do this in person.")}</p> <p>{_t("To be secure, do this in person or use a trusted way to communicate.")}</p>
{ content } { content }
</div> </div>
</div> </div>

View File

@ -105,7 +105,7 @@ export default class VerificationShowSas extends React.Component {
return <div className="mx_VerificationShowSas"> return <div className="mx_VerificationShowSas">
<p>{sasCaption}</p> <p>{sasCaption}</p>
<p>{_t("For ultimate security, do this in person or use another way to communicate.")}</p> <p>{_t("To be secure, do this in person or use a trusted way to communicate.")}</p>
{sasDisplay} {sasDisplay}
{confirm} {confirm}
</div>; </div>;

View File

@ -451,7 +451,7 @@
"Waiting for %(displayName)s to verify…": "Waiting for %(displayName)s to verify…", "Waiting for %(displayName)s to verify…": "Waiting for %(displayName)s to verify…",
"They match": "They match", "They match": "They match",
"They don't match": "They don't 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 a trusted way to communicate.": "To be secure, do this in person or use a trusted way to communicate.",
"Dog": "Dog", "Dog": "Dog",
"Cat": "Cat", "Cat": "Cat",
"Lion": "Lion", "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.", "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", "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 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", "Your messages are not secure": "Your messages are not secure",
"One of the following may be compromised:": "One of the following may be compromised:", "One of the following may be compromised:": "One of the following may be compromised:",
"Your homeserver": "Your homeserver", "Your homeserver": "Your homeserver",
@ -1462,7 +1461,6 @@
"Verify device": "Verify device", "Verify device": "Verify device",
"Use Legacy Verification (for older clients)": "Use Legacy Verification (for older clients)", "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.", "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", "Begin Verifying": "Begin Verifying",
"Waiting for partner to accept...": "Waiting for partner to accept...", "Waiting for partner to accept...": "Waiting for partner to accept...",
"Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.", "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.",