imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into t3chguy/password_completion

Browse source
This commit is contained in:
Michael Telatynski 2020-02-05 20:24:37 +00:00 • committed by GitHub
commit 4d0d6cdaa4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
150 changed files with 2181 additions and 4589 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js
View file

@ -137,7 +137,7 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
)}</p>
<p>{_t(
"Access your secure message history and your cross-signing " +
"identity for verifying other devices by entering your passphrase.",
"identity for verifying other sessions by entering your passphrase.",
)}</p>
<form className="mx_AccessSecretStorageDialog_primaryContainer">
@ -212,7 +212,7 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
)}</p>
<p>{_t(
"Access your secure message history and your cross-signing " +
"identity for verifying other devices by entering your recovery key.",
"identity for verifying other sessions by entering your recovery key.",
)}</p>
<form className="mx_AccessSecretStorageDialog_primaryContainer">