Merge branch 'develop' into new-guest-access

This commit is contained in:
Luke Barnard 2017-06-07 12:08:37 +01:00 committed by GitHub
commit 53ea41e8a5
42 changed files with 561 additions and 91 deletions

View file

@ -697,7 +697,7 @@ module.exports = React.createClass({
if (!unsentMessages.length) return "";
for (const event of unsentMessages) {
if (!event.error || event.error.name !== "UnknownDeviceError") {
return _t("Some of your messages have not been sent") + ".";
return _t("Some of your messages have not been sent.");
}
}
return _t("Message not sent due to unknown devices being present");