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

Merge pull request #2557 from matrix-org/bwindels/e2eicons

Browse source 
Add e2e icon to room header/composer/member info, more ...
This commit is contained in:
Bruno Windels 2019-02-01 22:02:28 +00:00 • committed by GitHub
commit 45e982ac13
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 251 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -571,6 +571,10 @@
" (unsupported)": " (unsupported)",
"Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.",
"Ongoing conference call%(supportedText)s.": "Ongoing conference call%(supportedText)s.",
"Some devices for this user are not trusted": "Some devices for this user are not trusted",
"Some devices in this encrypted room are not trusted": "Some devices in this encrypted room are not trusted",
"All devices for this user are trusted": "All devices for this user are trusted",
"All devices in this encrypted room are trusted": "All devices in this encrypted room are trusted",
"This event could not be displayed": "This event could not be displayed",
"%(senderName)s sent an image": "%(senderName)s sent an image",
"%(senderName)s sent a video": "%(senderName)s sent a video",
@ -582,16 +586,10 @@
"Key request sent.": "Key request sent.",
"<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Re-request encryption keys</requestLink> from your other devices.",
"Undecryptable": "Undecryptable",
"Encrypting": "Encrypting",
"Encrypted, not sent": "Encrypted, not sent",
"Encrypted by a verified device": "Encrypted by a verified device",
"Encrypted by an unverified device": "Encrypted by an unverified device",
"Unencrypted message": "Unencrypted message",
"Please select the destination room for this message": "Please select the destination room for this message",
"Scroll to bottom of page": "Scroll to bottom of page",
"Blacklisted": "Blacklisted",
"Verified": "Verified",
"Unverified": "Unverified",
"device id: ": "device id: ",
"Disinvite": "Disinvite",
"Kick": "Kick",
@ -643,8 +641,6 @@
"Are you sure you want to upload the following files?": "Are you sure you want to upload the following files?",
"The following files cannot be uploaded:": "The following files cannot be uploaded:",
"Upload Files": "Upload Files",
"Encrypted room": "Encrypted room",
"Unencrypted room": "Unencrypted room",
"Hangup": "Hangup",
"Voice call": "Voice call",
"Video call": "Video call",
@ -1437,6 +1433,7 @@
"Users": "Users",
"unknown device": "unknown device",
"NOT verified": "NOT verified",
"Blacklisted": "Blacklisted",
"verified": "verified",
"Name": "Name",
"Verification": "Verification",