Merge branch 'develop' into travis/echo/audit

This commit is contained in:
Travis Ralston 2020-07-30 10:18:30 -06:00
commit 968fbd5cba
142 changed files with 592 additions and 1334 deletions

View file

@ -426,6 +426,8 @@
"There was an error joining the room": "There was an error joining the room",
"Sorry, your homeserver is too old to participate in this room.": "Sorry, your homeserver is too old to participate in this room.",
"Please contact your homeserver administrator.": "Please contact your homeserver administrator.",
"The person who invited you already left the room.": "The person who invited you already left the room.",
"The person who invited you already left the room, or their server is offline.": "The person who invited you already left the room, or their server is offline.",
"Failed to join room": "Failed to join room",
"You joined the call": "You joined the call",
"%(senderName)s joined the call": "%(senderName)s joined the call",