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

Merge remote-tracking branch 'upstream/develop' into feature/update-tile-copy/18376

Browse source
This commit is contained in:
Šimon Brandner 2021-08-04 15:48:53 +02:00
commit a04a8006fc
No known key found for this signature in database
GPG key ID: CC823428E9B582FB
5 changed files with 11 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -64,8 +64,6 @@
"Unable to transfer call": "Unable to transfer call",
"Transfer Failed": "Transfer Failed",
"Failed to transfer call": "Failed to transfer call",
"Call in Progress": "Call in Progress",
"A call is currently being placed!": "A call is currently being placed!",
"Permission Required": "Permission Required",
"You do not have permission to start a conference call in this room": "You do not have permission to start a conference call in this room",
"End conference": "End conference",