matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-13 08:02:38 +03:00
Code Activity

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
parent 920daa3125 73b177d075
commit 4d0d6cdaa4
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">