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

Merge pull request #1061 from matrix-org/rav/megolm_key_encryption_errors

Browse source 
Improve error logging/reporting in megolm import/export
This commit is contained in:
Richard van der Hoff 2017-06-12 10:09:52 +01:00 • committed by GitHub
commit 57b4c422b1
5 changed files with 176 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/i18n/strings/en_EN.json
View file

@ -908,5 +908,8 @@
"Username not available": "Username not available",
"Something went wrong!": "Something went wrong!",
"This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.",
"If you already have a Matrix account you can <a>log in</a> instead.": "If you already have a Matrix account you can <a>log in</a> instead."
"If you already have a Matrix account you can <a>log in</a> instead.": "If you already have a Matrix account you can <a>log in</a> instead.",
"Your browser does not support the required cryptography extensions": "Your browser does not support the required cryptography extensions",
"Not a valid Riot keyfile": "Not a valid Riot keyfile",
"Authentication check failed: incorrect password?": "Authentication check failed: incorrect password?"
}