Merge branch 'develop' into t3chguy/piwik

2017-05-30 15:58:55 +01:00
parent bdf94b14a4 70e7d81093
commit 93a35dc07a
50 changed files with 1426 additions and 302 deletions
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -830,7 +830,7 @@ module.exports = React.createClass({
            reject = (
                <AccessibleButton className="mx_UserSettings_button danger"
                onClick={this._onRejectAllInvitesClicked.bind(this, invitedRooms)}>
-                    Reject all {invitedRooms.length} invites
+                    {_t("Reject all %(invitedRooms)s invites", {invitedRooms: invitedRooms.length})}
                </AccessibleButton>
            );
        }