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

Merge pull request #996 from matrix-org/rav/handle_received_room_key_requests

Browse source 
Pop up a dialog when we get a room key request
This commit is contained in:
Richard van der Hoff 2017-06-20 13:20:58 +01:00 • committed by GitHub
commit 0c431887b0
4 changed files with 326 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -911,5 +911,11 @@
"Authentication check failed: incorrect password?": "Authentication check failed: incorrect password?",
"Disable Peer-to-Peer for 1:1 calls": "Disable Peer-to-Peer for 1:1 calls",
"Do you want to set an email address?": "Do you want to set an email address?",
"This will allow you to reset your password and receive notifications.": "This will allow you to reset your password and receive notifications."
"This will allow you to reset your password and receive notifications.": "This will allow you to reset your password and receive notifications.",
"Start verification": "Start verification",
"Share without verifying": "Share without verifying",
"Ignore request": "Ignore request",
"You added a new device '%(displayName)s', which is requesting encryption keys.": "You added a new device '%(displayName)s', which is requesting encryption keys.",
"Your unverified device '%(displayName)s' is requesting encryption keys.": "Your unverified device '%(displayName)s' is requesting encryption keys.",
"Encryption key request": "Encryption key request"
}