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

2018-01-18 09:57:38 +00:00 · 2018-01-18 09:57:38 +00:00 · 5fd7c30dbf
parent 9e987337b7 80d3edfbb3
commit 5fd7c30dbf
1 changed files with 1 additions and 1 deletions
--- a/src/components/structures/RoomStatusBar.js
+++ b/src/components/structures/RoomStatusBar.js
@ -296,7 +296,7 @@ module.exports = React.createClass({
        if (hasUDE) {
            title = _t("Message not sent due to unknown devices being present");
            content = _t(
-                "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>mark devices known and send</sendAnywayText> or <cancelText>cancel all</cancelText>.",
+                "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.",
                {},
                {
                    'showDevicesText': (sub) => <a className="mx_RoomStatusBar_resend_link" key="resend" onClick={this._onShowDevicesClick}>{ sub }</a>,