Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Weblate 2018-10-22 18:34:37 +00:00
commit 1fd6155163
14 changed files with 56 additions and 93 deletions

View file

@ -512,6 +512,7 @@
"You have no historical rooms": "You have no historical rooms",
"Historical": "Historical",
"System Alerts": "System Alerts",
"Joining room...": "Joining room...",
"Unable to ascertain that the address this invite was sent to matches one associated with your account.": "Unable to ascertain that the address this invite was sent to matches one associated with your account.",
"This invitation was sent to an email address which is not associated with this account:": "This invitation was sent to an email address which is not associated with this account:",
"You may wish to login with a different account, or add this email to this account.": "You may wish to login with a different account, or add this email to this account.",