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

This commit is contained in:
Weblate 2018-08-29 17:38:53 +00:00
commit dae22a753a
4 changed files with 88 additions and 2 deletions

View file

@ -396,6 +396,8 @@
"At this time it is not possible to reply with a file so this will be sent without being a reply.": "At this time it is not possible to reply with a file so this will be sent without being a reply.",
"Upload Files": "Upload Files",
"Are you sure you want to upload the following files?": "Are you sure you want to upload the following files?",
"This room has been replaced and is no longer active.": "This room has been replaced and is no longer active.",
"The conversation continues here.": "The conversation continues here.",
"Encrypted room": "Encrypted room",
"Unencrypted room": "Unencrypted room",
"Hangup": "Hangup",