From 17262ad80d4a7596c698f6c13caa2842903e36bc Mon Sep 17 00:00:00 2001
From: Pablo Saavedra <psaavedra@igalia.com>
Date: Mon, 8 May 2017 12:18:31 +0200
Subject: [PATCH 001/123] Added TextInputWithCheckbox dialog

---
 src/component-index.js                        |   2 +
 src/components/structures/MatrixChat.js       |  15 ++-
 .../dialogs/TextInputWithCheckboxDialog.js    | 108 ++++++++++++++++++
 3 files changed, 122 insertions(+), 3 deletions(-)
 create mode 100644 src/components/views/dialogs/TextInputWithCheckboxDialog.js

diff --git a/src/component-index.js b/src/component-index.js
index d6873c6dfd..ed538a6fcb 100644
--- a/src/component-index.js
+++ b/src/component-index.js
@@ -99,6 +99,8 @@ import views$dialogs$SetDisplayNameDialog from './components/views/dialogs/SetDi
 views$dialogs$SetDisplayNameDialog && (module.exports.components['views.dialogs.SetDisplayNameDialog'] = views$dialogs$SetDisplayNameDialog);
 import views$dialogs$TextInputDialog from './components/views/dialogs/TextInputDialog';
 views$dialogs$TextInputDialog && (module.exports.components['views.dialogs.TextInputDialog'] = views$dialogs$TextInputDialog);
+import views$dialogs$TextInputWithCheckboxDialog from './components/views/dialogs/TextInputWithCheckboxDialog';
+views$dialogs$TextInputWithCheckboxDialog && (module.exports.components['views.dialogs.TextInputWithCheckboxDialog'] = views$dialogs$TextInputWithCheckboxDialog);
 import views$dialogs$UnknownDeviceDialog from './components/views/dialogs/UnknownDeviceDialog';
 views$dialogs$UnknownDeviceDialog && (module.exports.components['views.dialogs.UnknownDeviceDialog'] = views$dialogs$UnknownDeviceDialog);
 import views$elements$AccessibleButton from './components/views/elements/AccessibleButton';
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index b449ff3094..d87ca203ce 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -191,6 +191,10 @@ module.exports = React.createClass({
         return this.props.config.default_is_url || "https://vector.im";
     },
 
+    getDefaultFederate() {
+        return this.props.config.default_federate && true;
+    },
+
     componentWillMount: function() {
         SdkConfig.put(this.props.config);
 
@@ -501,15 +505,20 @@ module.exports = React.createClass({
                 //this._setPage(PageTypes.CreateRoom);
                 //this.notifyNewScreen('new');
 
-                var TextInputDialog = sdk.getComponent("dialogs.TextInputDialog");
-                Modal.createDialog(TextInputDialog, {
+                var TextInputWithCheckboxDialog = sdk.getComponent("dialogs.TextInputWithCheckboxDialog");
+                Modal.createDialog(TextInputWithCheckboxDialog, {
                     title: "Create Room",
                     description: "Room name (optional)",
                     button: "Create Room",
-                    onFinished: (should_create, name) => {
+                    check: this.getDefaultFederate(),
+                    checkLabel: "Federate room in domain " + MatrixClientPeg.get().getDomain(),
+                    onFinished: (should_create, name, isFederate) => {
                         if (should_create) {
                             const createOpts = {};
                             if (name) createOpts.name = name;
+                            if (isFederate) {
+                                createOpts.creation_content = {"m.federate": isFederate}
+                            }
                             createRoom({createOpts}).done();
                         }
                     }
diff --git a/src/components/views/dialogs/TextInputWithCheckboxDialog.js b/src/components/views/dialogs/TextInputWithCheckboxDialog.js
new file mode 100644
index 0000000000..916de16af5
--- /dev/null
+++ b/src/components/views/dialogs/TextInputWithCheckboxDialog.js
@@ -0,0 +1,108 @@
+/*
+Copyright 2015, 2016 OpenMarket Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import sdk from '../../../index';
+
+export default React.createClass({
+    displayName: 'TextInputWithCheckboxDialog',
+    propTypes: {
+        title: React.PropTypes.string,
+        description: React.PropTypes.oneOfType([
+            React.PropTypes.element,
+            React.PropTypes.string,
+        ]),
+        value: React.PropTypes.string,
+        button: React.PropTypes.string,
+        focus: React.PropTypes.bool,
+        checkLabel: React.PropTypes.string,
+        check: React.PropTypes.bool,
+        onFinished: React.PropTypes.func.isRequired,
+    },
+
+    getDefaultProps: function() {
+        return {
+            title: "",
+            value: "",
+            description: "",
+            button: "OK",
+            focus: true,
+            checkLabel: "",
+            check: true,
+        };
+    },
+
+    getInitialState: function() {
+        return {
+            isChecked: this.props.check,
+        };
+    },
+
+    componentDidMount: function() {
+        if (this.props.focus) {
+            // Set the cursor at the end of the text input
+            this.refs.textinput.value = this.props.value;
+        }
+    },
+
+    onOk: function() {
+        this.props.onFinished(true, this.refs.textinput.value, this.state.isChecked);
+    },
+
+    onCancel: function() {
+        this.props.onFinished(false);
+    },
+
+    _onToggle: function(keyName, checkedValue, uncheckedValue, ev) {
+        console.log("Checkbox toggle: %s %s", keyName, ev.target.checked);
+        var state = {};
+        state[keyName] = ev.target.checked ? checkedValue : uncheckedValue;
+        this.setState(state);
+    },
+
+    render: function() {
+        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
+        return (
+            <BaseDialog className="mx_TextInputWithCheckboxDialog" onFinished={this.props.onFinished}
+                onEnterPressed={this.onOk}
+                title={this.props.title}
+            >
+                <div className="mx_Dialog_content">
+                    <div className="mx_TextInputWithCheckboxDialog_label">
+                        <label htmlFor="textinput"> {this.props.description} </label>
+                    </div>
+                    <div>
+                        <input id="textinput" ref="textinput" className="mx_TextInputWithCheckboxDialog_input" defaultValue={this.props.value} autoFocus={this.props.focus} size="64" onKeyDown={this.onKeyDown}/>
+                    </div>
+                    <label>
+                        <input type="checkbox" id="checkbox" ref="checkbox"
+                               onChange={ this._onToggle.bind(this, "isChecked", true, false)}
+                               checked={this.state.isChecked}/>
+												{this.props.checkLabel}?
+                    </label>
+                </div>
+                <div className="mx_Dialog_buttons">
+                    <button onClick={this.onCancel}>
+                        Cancel
+                    </button>
+                    <button className="mx_Dialog_primary" onClick={this.onOk}>
+                        {this.props.button}
+                    </button>
+                </div>
+            </BaseDialog>
+        );
+    },
+});

From 4b4b7302331b195e199e44bd2abddbf1a2c68b29 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 2 Aug 2017 13:41:26 +0100
Subject: [PATCH 002/123] fix and i18n the impl

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/MatrixChat.js       | 24 ++++++++------
 .../dialogs/TextInputWithCheckboxDialog.js    | 33 +++++++------------
 src/i18n/strings/en_EN.json                   |  2 ++
 3 files changed, 27 insertions(+), 32 deletions(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 50ee9963a6..22119585d9 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -214,10 +214,6 @@ module.exports = React.createClass({
         return this.props.config.default_is_url || "https://vector.im";
     },
 
-    getDefaultFederate() {
-        return this.props.config.default_federate && true;
-    },
-
     componentWillMount: function() {
         SdkConfig.put(this.props.config);
 
@@ -790,19 +786,27 @@ module.exports = React.createClass({
             dis.dispatch({action: 'view_set_mxid'});
             return;
         }
+        // Dialog shows inverse of m.federate (noFederate) strict false check to skip undefined check (default = true)
+        const defaultNoFederate = this.props.config.default_federate === false;
         const TextInputWithCheckboxDialog = sdk.getComponent("dialogs.TextInputWithCheckboxDialog");
         Modal.createDialog(TextInputWithCheckboxDialog, {
             title: _t('Create Room'),
             description: _t('Room name (optional)'),
             button: _t('Create Room'),
-            // TODO i18n below.
-            check: this.getDefaultFederate(),
-            checkLabel: 'Federate room in domain ' + MatrixClientPeg.get().getDomain(),
-            onFinished: (shouldCreate, name, federate) => {
+            check: defaultNoFederate,
+            checkLabel: <span>
+                {_t('Block users on other matrix homeservers from joining this room')}
+                <br/>
+                ({_t('This setting cannot be changed later!')})
+            </span>,
+            onFinished: (shouldCreate, name, noFederate) => {
                 if (shouldCreate) {
-                    const createOpts = {};
+                    const createOpts = {
+                        creation_content: {
+                            "m.federate": !noFederate,
+                        },
+                    };
                     if (name) createOpts.name = name;
-                    if (federate) createOpts.creation_content = {"m.federate": federate};
                     createRoom({createOpts}).done();
                 }
             },
diff --git a/src/components/views/dialogs/TextInputWithCheckboxDialog.js b/src/components/views/dialogs/TextInputWithCheckboxDialog.js
index 916de16af5..613fab4cdb 100644
--- a/src/components/views/dialogs/TextInputWithCheckboxDialog.js
+++ b/src/components/views/dialogs/TextInputWithCheckboxDialog.js
@@ -16,6 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import sdk from '../../../index';
+import { _t } from '../../../languageHandler';
 
 export default React.createClass({
     displayName: 'TextInputWithCheckboxDialog',
@@ -28,7 +29,10 @@ export default React.createClass({
         value: React.PropTypes.string,
         button: React.PropTypes.string,
         focus: React.PropTypes.bool,
-        checkLabel: React.PropTypes.string,
+        checkLabel: React.PropTypes.oneOfType([
+            React.PropTypes.element,
+            React.PropTypes.string,
+        ]),
         check: React.PropTypes.bool,
         onFinished: React.PropTypes.func.isRequired,
     },
@@ -38,16 +42,9 @@ export default React.createClass({
             title: "",
             value: "",
             description: "",
-            button: "OK",
             focus: true,
             checkLabel: "",
-            check: true,
-        };
-    },
-
-    getInitialState: function() {
-        return {
-            isChecked: this.props.check,
+            check: false,
         };
     },
 
@@ -59,20 +56,13 @@ export default React.createClass({
     },
 
     onOk: function() {
-        this.props.onFinished(true, this.refs.textinput.value, this.state.isChecked);
+        this.props.onFinished(true, this.refs.textinput.value, this.refs.checkbox.value);
     },
 
     onCancel: function() {
         this.props.onFinished(false);
     },
 
-    _onToggle: function(keyName, checkedValue, uncheckedValue, ev) {
-        console.log("Checkbox toggle: %s %s", keyName, ev.target.checked);
-        var state = {};
-        state[keyName] = ev.target.checked ? checkedValue : uncheckedValue;
-        this.setState(state);
-    },
-
     render: function() {
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
         return (
@@ -87,16 +77,15 @@ export default React.createClass({
                     <div>
                         <input id="textinput" ref="textinput" className="mx_TextInputWithCheckboxDialog_input" defaultValue={this.props.value} autoFocus={this.props.focus} size="64" onKeyDown={this.onKeyDown}/>
                     </div>
+                    <br/>
                     <label>
-                        <input type="checkbox" id="checkbox" ref="checkbox"
-                               onChange={ this._onToggle.bind(this, "isChecked", true, false)}
-                               checked={this.state.isChecked}/>
-												{this.props.checkLabel}?
+                        <input type="checkbox" id="checkbox" ref="checkbox" defaultChecked={this.props.check}/>
+                        {this.props.checkLabel}
                     </label>
                 </div>
                 <div className="mx_Dialog_buttons">
                     <button onClick={this.onCancel}>
-                        Cancel
+                        { _t("Cancel") }
                     </button>
                     <button className="mx_Dialog_primary" onClick={this.onOk}>
                         {this.props.button}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 0402c242aa..87eb189ad0 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -184,6 +184,8 @@
     "Banned users": "Banned users",
     "Bans user with given id": "Bans user with given id",
     "Blacklisted": "Blacklisted",
+    "Block users on other matrix homeservers from joining this room": "Block users on other matrix homeservers from joining this room",
+    "This setting cannot be changed later!": "This setting cannot be changed later!",
     "Bug Report": "Bug Report",
     "Bulk Options": "Bulk Options",
     "Call Timeout": "Call Timeout",

From e9afcec5b21c5b9934399d2c5e214918e3149754 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 2 Aug 2017 13:42:24 +0100
Subject: [PATCH 003/123] fix m.federate=false warning in room settings

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/RoomSettings.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js
index d6a973f648..f3e2bd5b13 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -408,11 +408,12 @@ module.exports = React.createClass({
 
     _yankValueFromEvent: function(stateEventType, keyName, defaultValue) {
         // E.g.("m.room.name","name") would yank the "name" content key from "m.room.name"
-        var event = this.props.room.currentState.getStateEvents(stateEventType, '');
+        const event = this.props.room.currentState.getStateEvents(stateEventType, '');
         if (!event) {
             return defaultValue;
         }
-        return event.getContent()[keyName] || defaultValue;
+        const content = event.getContent();
+        return keyName in content ? content[keyName] : defaultValue;
     },
 
     _onHistoryRadioToggle: function(ev) {
@@ -704,7 +705,7 @@ module.exports = React.createClass({
         }
 
         var unfederatableSection;
-        if (this._yankValueFromEvent("m.room.create", "m.federate") === false) {
+        if (this._yankValueFromEvent("m.room.create", "m.federate", true) === false) {
              unfederatableSection = (
                 <div className="mx_RoomSettings_powerLevel">
                 { _t('This room is not accessible by remote Matrix servers') }.

From 6e39e72849c348b98d346d274145bf89fcc89c61 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 2 Aug 2017 14:00:24 +0100
Subject: [PATCH 004/123] fix m.federate always being false because value is a
 string. Y HTML...

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/MatrixChat.js                    | 7 ++-----
 .../views/dialogs/TextInputWithCheckboxDialog.js           | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 22119585d9..5f01b72c2b 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -801,12 +801,9 @@ module.exports = React.createClass({
             </span>,
             onFinished: (shouldCreate, name, noFederate) => {
                 if (shouldCreate) {
-                    const createOpts = {
-                        creation_content: {
-                            "m.federate": !noFederate,
-                        },
-                    };
+                    const createOpts = {};
                     if (name) createOpts.name = name;
+                    if (noFederate) createOpts.creation_content = {'m.federate': false};
                     createRoom({createOpts}).done();
                 }
             },
diff --git a/src/components/views/dialogs/TextInputWithCheckboxDialog.js b/src/components/views/dialogs/TextInputWithCheckboxDialog.js
index 613fab4cdb..6fd46ec209 100644
--- a/src/components/views/dialogs/TextInputWithCheckboxDialog.js
+++ b/src/components/views/dialogs/TextInputWithCheckboxDialog.js
@@ -56,7 +56,7 @@ export default React.createClass({
     },
 
     onOk: function() {
-        this.props.onFinished(true, this.refs.textinput.value, this.refs.checkbox.value);
+        this.props.onFinished(true, this.refs.textinput.value, this.refs.checkbox.checked);
     },
 
     onCancel: function() {

From ca5e26744fceda6c0fc9dfe6f9b48fdf131c47f8 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 17 Aug 2017 13:33:07 +0100
Subject: [PATCH 005/123] Make dialog more specific and hide options behind
 advanced spoiler

---
 src/components/structures/MatrixChat.js       | 15 +----
 ...hCheckboxDialog.js => CreateRoomDialog.js} | 66 +++++++------------
 src/i18n/strings/en_EN.json                   |  1 +
 3 files changed, 28 insertions(+), 54 deletions(-)
 rename src/components/views/dialogs/{TextInputWithCheckboxDialog.js => CreateRoomDialog.js} (50%)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 5f01b72c2b..6d95c99948 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -786,19 +786,8 @@ module.exports = React.createClass({
             dis.dispatch({action: 'view_set_mxid'});
             return;
         }
-        // Dialog shows inverse of m.federate (noFederate) strict false check to skip undefined check (default = true)
-        const defaultNoFederate = this.props.config.default_federate === false;
-        const TextInputWithCheckboxDialog = sdk.getComponent("dialogs.TextInputWithCheckboxDialog");
-        Modal.createDialog(TextInputWithCheckboxDialog, {
-            title: _t('Create Room'),
-            description: _t('Room name (optional)'),
-            button: _t('Create Room'),
-            check: defaultNoFederate,
-            checkLabel: <span>
-                {_t('Block users on other matrix homeservers from joining this room')}
-                <br/>
-                ({_t('This setting cannot be changed later!')})
-            </span>,
+        const CreateRoomDialog = sdk.getComponent('dialogs.CreateRoomDialog');
+        Modal.createDialog(CreateRoomDialog, {
             onFinished: (shouldCreate, name, noFederate) => {
                 if (shouldCreate) {
                     const createOpts = {};
diff --git a/src/components/views/dialogs/TextInputWithCheckboxDialog.js b/src/components/views/dialogs/CreateRoomDialog.js
similarity index 50%
rename from src/components/views/dialogs/TextInputWithCheckboxDialog.js
rename to src/components/views/dialogs/CreateRoomDialog.js
index 6fd46ec209..20eeb5b591 100644
--- a/src/components/views/dialogs/TextInputWithCheckboxDialog.js
+++ b/src/components/views/dialogs/CreateRoomDialog.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2017 Michael Telatynski <7t3chguy@gmail.com>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -16,43 +16,19 @@ limitations under the License.
 
 import React from 'react';
 import sdk from '../../../index';
+import SdkConfig from '../../../SdkConfig';
 import { _t } from '../../../languageHandler';
 
 export default React.createClass({
-    displayName: 'TextInputWithCheckboxDialog',
+    displayName: 'CreateRoomDialog',
     propTypes: {
-        title: React.PropTypes.string,
-        description: React.PropTypes.oneOfType([
-            React.PropTypes.element,
-            React.PropTypes.string,
-        ]),
-        value: React.PropTypes.string,
-        button: React.PropTypes.string,
-        focus: React.PropTypes.bool,
-        checkLabel: React.PropTypes.oneOfType([
-            React.PropTypes.element,
-            React.PropTypes.string,
-        ]),
-        check: React.PropTypes.bool,
         onFinished: React.PropTypes.func.isRequired,
     },
 
-    getDefaultProps: function() {
-        return {
-            title: "",
-            value: "",
-            description: "",
-            focus: true,
-            checkLabel: "",
-            check: false,
-        };
-    },
-
     componentDidMount: function() {
-        if (this.props.focus) {
-            // Set the cursor at the end of the text input
-            this.refs.textinput.value = this.props.value;
-        }
+        const config = SdkConfig.get();
+        // Dialog shows inverse of m.federate (noFederate) strict false check to skip undefined check (default = true)
+        this.defaultNoFederate = config.default_federate === false;
     },
 
     onOk: function() {
@@ -66,29 +42,37 @@ export default React.createClass({
     render: function() {
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
         return (
-            <BaseDialog className="mx_TextInputWithCheckboxDialog" onFinished={this.props.onFinished}
+            <BaseDialog className="mx_CreateRoomDialog" onFinished={this.props.onFinished}
                 onEnterPressed={this.onOk}
-                title={this.props.title}
+                title={_t('Create Room')}
             >
                 <div className="mx_Dialog_content">
-                    <div className="mx_TextInputWithCheckboxDialog_label">
-                        <label htmlFor="textinput"> {this.props.description} </label>
+                    <div className="mx_CreateRoomDialog_label">
+                        <label htmlFor="textinput"> {_t('Room name (optional)')} </label>
                     </div>
                     <div>
-                        <input id="textinput" ref="textinput" className="mx_TextInputWithCheckboxDialog_input" defaultValue={this.props.value} autoFocus={this.props.focus} size="64" onKeyDown={this.onKeyDown}/>
+                        <input id="textinput" ref="textinput" className="mx_CreateRoomDialog_input" autoFocus={true} size="64" onKeyDown={this.onKeyDown}/>
                     </div>
                     <br/>
-                    <label>
-                        <input type="checkbox" id="checkbox" ref="checkbox" defaultChecked={this.props.check}/>
-                        {this.props.checkLabel}
-                    </label>
+
+                    <details className="mx_CreateRoomDialog_details">
+                        <summary className="mx_CreateRoomDialog_details_summary">{ _t('Advanced options') }</summary>
+                        <div>
+                            <input type="checkbox" id="checkbox" ref="checkbox" defaultChecked={this.defaultNoFederate}/>
+                            <label htmlFor="checkbox">
+                                {_t('Block users on other matrix homeservers from joining this room')}
+                                <br/>
+                                ({_t('This setting cannot be changed later!')})
+                            </label>
+                        </div>
+                    </details>
                 </div>
                 <div className="mx_Dialog_buttons">
                     <button onClick={this.onCancel}>
-                        { _t("Cancel") }
+                        { _t('Cancel') }
                     </button>
                     <button className="mx_Dialog_primary" onClick={this.onOk}>
-                        {this.props.button}
+                        { _t('Create Room') }
                     </button>
                 </div>
             </BaseDialog>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 87eb189ad0..f7fb221072 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -146,6 +146,7 @@
     "Microphone": "Microphone",
     "Camera": "Camera",
     "Advanced": "Advanced",
+    "Advanced options": "Advanced options",
     "Algorithm": "Algorithm",
     "Hide removed messages": "Hide removed messages",
     "Always show message timestamps": "Always show message timestamps",

From ffda53269515aa78e9a776024bfcc287961609b7 Mon Sep 17 00:00:00 2001
From: Silke <silke@slxh.nl>
Date: Sat, 16 Sep 2017 07:54:58 +0000
Subject: [PATCH 006/123] Translated using Weblate (Dutch)

Currently translated at 100.0% (855 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
---
 src/i18n/strings/nl.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 3620c31816..fff3aaa4a5 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -855,5 +855,9 @@
     "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s-widget toegevoegd door %(senderName)s",
     "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s-widget verwijderd door %(senderName)s",
     "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Robot-check is momenteel niet beschikbaar op de desktop - gebruik in plaats daarvan een <a>webbrowser</a>",
-    "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s-widget aangepast door %(senderName)s"
+    "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s-widget aangepast door %(senderName)s",
+    "%(weekDayName)s, %(monthName)s %(day)s": "%(weekDayName)s %(day)s %(monthName)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s %(day)s %(monthName)s %(fullYear)s",
+    "Copied!": "Gekopieerd!",
+    "Failed to copy": "Kopiëren mislukt"
 }

From 93f404081b7e994777b0d31d50d78258c817c02c Mon Sep 17 00:00:00 2001
From: Jan Kudrik <jan@kudrik.cz>
Date: Sun, 17 Sep 2017 16:48:24 +0000
Subject: [PATCH 007/123] Translated using Weblate (Czech)

Currently translated at 44.4% (380 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
---
 src/i18n/strings/cs.json | 172 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 165 insertions(+), 7 deletions(-)

diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index 7951779e75..5e4846794a 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -13,7 +13,7 @@
     "Rooms": "Místnosti",
     "Scroll to unread messages": "Přejít k nepřečteným zprávám",
     "Search": "Hledání",
-    "Send a message (unencrypted)": "Poslat zprávu (nezašifrovaně)",
+    "Send a message (unencrypted)": "Poslat zprávu (nešifrovanou)",
     "Settings": "Nastavení",
     "Start Chat": "Začít chat",
     "This room": "Tato místnost",
@@ -51,12 +51,12 @@
     "Error": "Chyba",
     "Failed to join the room": "Vstup do místnosti se nezdařil",
     "Favourite": "V oblíbených",
-    "Mute": "Ztišit",
+    "Mute": "Ztlumit",
     "Continue": "Pokračovat",
     "Failed to change password. Is your password correct?": "Nepodařilo se změnit heslo. Je vaše heslo správné?",
     "Welcome page": "Uvítací stránka",
     "Operation failed": "Chyba operace",
-    "Please Register": "Prosím zaregistrujte se",
+    "Please Register": "Zaregistrujte se prosím",
     "Remove": "Odebrat",
     "unknown error code": "neznámý kód chyby",
     "Sunday": "Neděle",
@@ -129,8 +129,8 @@
     "Changes your display nickname": "Změní vaši zobrazovanou přezdívku",
     "Changes colour scheme of current room": "Změní barevné schéma aktuální místnosti",
     "Changing password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "V současnosti změna hesla resetuje všechny šifrovací klíče na všech zařízeních, což vám znepřístupní historii zašifrovaných chatů, pokud si nejprve nevyexportujete klíče svých místností a pak je do nich znova nevložíte. Toto bude v budoucnu lépe ošetřeno.",
-    "Clear Cache and Reload": "Vymazat vyrovnávací paměť a načíst znovu",
-    "Clear Cache": "Vymazat vyrovnávací paměť",
+    "Clear Cache and Reload": "Vymazat mezipaměť a načíst znovu",
+    "Clear Cache": "Vymazat mezipaměť",
     "<a>Click here</a> to join the discussion!": "<a>Kliknutím zde</a> se přidáte k diskuzi!",
     "Command error": "Chyba příkazu",
     "Commands": "Příkazy",
@@ -219,6 +219,164 @@
     "Failed to upload profile picture!": "Nahrání profilového obrázku se nezdařilo",
     "Failure to create room": "Vytvoření místnosti se nezdařilo",
     "Forget room": "Zapomenout místnost",
-    "Forgot your password?": "Zapomněl/a jste své heslo?",
-    "For security, this session has been signed out. Please sign in again.": "Z bezpečnostních důvodů bylo toto přihlášení ukončeno. Přihlašte se prosím znovu."
+    "Forgot your password?": "Zapomněli jste své heslo?",
+    "For security, this session has been signed out. Please sign in again.": "Z bezpečnostních důvodů bylo toto přihlášení ukončeno. Přihlašte se prosím znovu.",
+    "all room members, from the point they are invited": "všichni členové místnosti od chvíle jejich pozvání",
+    "all room members, from the point they joined": "všichni členové místnosti od chvíle jejich vstupu",
+    "%(names)s and one other are typing": "%(names)s a jeden další píší",
+    "%(names)s and %(lastPerson)s are typing": "%(names)s a %(lastPerson)s píší",
+    "and %(count)s others...|other": "a %(count)s další...",
+    "%(names)s and %(count)s others are typing": "%(names)s a %(count)s další píší",
+    "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s widget upravil/a %(senderName)s",
+    "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s widget odstranil/a %(senderName)s",
+    "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s widget přidal/a %(senderName)s",
+    "Automatically replace plain text Emoji": "Automaticky nahrazovat textové emodži",
+    "Failed to upload image": "Obrázek se nepodařilo nahrát",
+    "Failed to update group": "Aktualizace skupiny se nepodařila",
+    "Edit Group": "Upravit skupinu",
+    "Join an existing group": "Přidat se do existující skupiny",
+    "To join an existing group you'll have to know its group identifier; this will look something like <i>+example:matrix.org</i>.": "Pro přidání se do existující skupiny je nutno znát její identifikátor. Vypadá nějak takto: <i>+skupina:matrix.org</i>.",
+    "You are a member of these groups:": "Jste členem těchto skupin:",
+    "Room creation failed": "Místnost se nepodařilo vytvořit",
+    "%(senderName)s answered the call.": "%(senderName)s přijal/a hovor.",
+    "Click to mute audio": "Kliknutím ztlumíte zvuk",
+    "Failed to verify email address: make sure you clicked the link in the email": "E-mailovou adresu se nepodařilo ověřit. Přesvědčte se, že jste kliknul/a na zaslaný odkaz",
+    "Found a bug?": "Našli jste chybu?",
+    "Guest access is disabled on this Home Server.": "Na tomto domovském serveru je hostům vstup odepřen.",
+    "Guests can't set avatars. Please register.": "Hosté si nemohou nastavovat avatar. Zaregistrujte se prosím.",
+    "Guest users can't create new rooms. Please register to create room and start a chat.": "Hosté nemohou vytvářet nové místnosti. Abyste mohli místnosti vytvářet a chatovat v nich, nejprve se prosím zaregistrujte.",
+    "Guest users can't upload files. Please register to upload.": "Hosté nemohou nahrávat soubory. Abyste je mohli nahrávat, nejprve se prosím zaregistrujte.",
+    "Guests cannot join this room even if explicitly invited.": "Hosté nemohou vstoupit do této místnosti, i když jsou přímo pozváni.",
+    "had": "měl/a",
+    "Hide read receipts": "Skrýt potvrzení o přečtení",
+    "Homeserver is": "Domovský server je",
+    "Identity Server is": "Server identity je",
+    "I have verified my email address": "Ověřil/a jsem svoji e-mailovou adresu",
+    "Import": "Importovat",
+    "Import E2E room keys": "Importovat E2E klíče místností",
+    "Incoming call from %(name)s": "Příchozí hovor od %(name)s",
+    "Incoming video call from %(name)s": "Příchozí videohovor od %(name)s",
+    "Incoming voice call from %(name)s": "Příchozí hlasový hovor od %(name)s",
+    "Incorrect username and/or password.": "Nesprávné uživatelské jméno nebo heslo.",
+    "Incorrect verification code": "Nesprávný ověřovací kód",
+    "Interface Language": "Jazyk rozhraní",
+    "Invalid alias format": "Neplaný formát aliasu",
+    "Invalid address format": "Neplatný formát adresy",
+    "Invalid Email Address": "Neplatná e-mailová adresa",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s pozval/a %(targetName)s.",
+    "Invite new room members": "Pozvat do místnosti nové členy",
+    "Invites": "Pozvánky",
+    "Invites user with given id to current room": "Pozve do aktuální místnosti uživatele s daným id",
+    "'%(alias)s' is not a valid format for an address": "'%(alias)s' není platný formát adresy",
+    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' není platný formát aliasu",
+    "Join Room": "Vstoupit do místnosti",
+    "%(targetName)s joined the room.": "%(targetName)s vstoupil/a do místnosti.",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s vykopnul/a %(targetName)s.",
+    "Kick": "Vykopnout",
+    "Kicks user with given id": "Vykopne uživatele s daným id",
+    "Last seen": "Naposledy viděn/a",
+    "Leave room": "Odejít z místnosti",
+    "Level:": "Úroveň:",
+    "Local addresses for this room:": "Místní adresy této místnosti:",
+    "Logged in as:": "Přihlášen/a jako:",
+    "Login as guest": "Přihlášen/a jako host",
+    "matrix-react-sdk version:": "Verze matrix-react-sdk:",
+    "Members only": "Pouze pro členy",
+    "Mobile phone number": "Číslo mobilního telefonu",
+    "Mobile phone number (optional)": "Číslo mobilního telefonu (nepovinné)",
+    "Moderator": "Moderátor",
+    "my Matrix ID": "moje Matrix ID",
+    "Name": "Jméno",
+    "New address (e.g. #foo:%(localDomain)s)": "Nová adresa (např. #neco:%(localDomain)s)",
+    "New password": "Nové heslo",
+    "New passwords don't match": "Nová hesla se neshodují",
+    "New passwords must match each other.": "Nová hesla se musí shodovat.",
+    "not set": "nenastaveno",
+    "not specified": "neurčeno",
+    "(not supported by this browser)": "(nepodporováno tímto prohlížečem)",
+    "<not supported>": "<nepodporováno>",
+    "AM": "dop.",
+    "PM": "odp.",
+    "NOT verified": "Neověřeno",
+    "No display name": "Žádné zobrazované jméno",
+    "No more results": "Žádné další výsledky",
+    "No results": "Žádné výsledky",
+    "olm version:": "verze olm:",
+    "Once encryption is enabled for a room it cannot be turned off again (for now)": "Jakmile je jednou šifrování v místnosti zapnuto, nelze už vypnout (prozatím)",
+    "Only people who have been invited": "Pouze lidé, kteří byli pozváni",
+    "Otherwise, <a>click here</a> to send a bug report.": "V opačném případě <a>klikněte zde</a> a pošlete hlášení o chybě.",
+    "Password": "Heslo",
+    "Password:": "Heslo:",
+    "Passwords can't be empty": "Hesla nemohou být prázdná",
+    "Permissions": "Oprávnění",
+    "Phone": "Telefon",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s změnil/a úroveň moci o %(powerLevelDiffText)s.",
+    "Define the power level of a user": "Stanovte úroveň moci uživatele",
+    "Failed to change power level": "Nepodařilo se změnit úroveň moci",
+    "Power level must be positive integer.": "Úroveň moci musí být kladné celé číslo.",
+    "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (moc %(powerLevelNumber)s)",
+    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Tuto změnu nepůjde vrátit zpět, protože tomuto uživateli nastavujete stejnou úroveň moci, jakou máte vy.",
+    "And %(count)s more...": "A %(count)s další...",
+    "Alias (optional)": "Alias (nepovinný)",
+    "Room name (optional)": "Název místnosti (nepovinný)",
+    "Report it": "Nahlásit to",
+    "restore": "obnovit",
+    "Results from DuckDuckGo": "Výsledky z DuckDuckGo",
+    "Return to app": "Vrátit k aplikaci",
+    "Return to login screen": "Vrátit k přihlašovací obrazovce",
+    "Riot does not have permission to send you notifications - please check your browser settings": "Riot není oprávněn posílat vám upozornění – zkontrolujte prosím nastavení svého prohlížeče",
+    "Riot was not given permission to send notifications - please try again": "Riot nebyl oprávněn k posílání upozornění – zkuste to prosím znovu",
+    "riot-web version:": "verze riot-web:",
+    "Room %(roomId)s not visible": "Místnost %(roomId)s není viditelná",
+    "Room Colour": "Barva místnosti",
+    "Room contains unknown devices": "V místnosti jsou neznámá zařízení",
+    "%(roomName)s does not exist.": "%(roomName)s neexistuje.",
+    "%(roomName)s is not accessible at this time.": "Místnost %(roomName)s není v tuto chvíli dostupná.",
+    "Save": "Uložit",
+    "Scroll to bottom of page": "Přejít na konec stránky",
+    "Send an encrypted message": "Poslat šifrovanou zprávu",
+    "Send anyway": "Přesto poslat",
+    "Sender device information": "Informace o odesilatelově zařízení",
+    "Send Reset Email": "Poslat resetovací e-mail",
+    "sent an image": "poslat obrázek",
+    "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s poslal/a obrázek.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s poslal/a %(targetDisplayName)s pozvánku ke vstupu do místnosti.",
+    "sent a video": "poslat video",
+    "Server error": "Chyba serveru",
+    "Server may be unavailable or overloaded": "Server může být nedostupný nebo přetížený",
+    "Server may be unavailable, overloaded, or search timed out :(": "Server může být nedostupný, přetížený nebo vyhledávání vypršelo :(",
+    "Server may be unavailable, overloaded, or the file too big": "Server může být nedostupný, přetížený nebo soubor je příliš velký",
+    "Server may be unavailable, overloaded, or you hit a bug.": "Server může být nedostupný, přetížený nebo jste narazili na chybu.",
+    "Server unavailable, overloaded, or something else went wrong.": "Server je nedostupný, přetížený nebo se pokazilo něco jiného.",
+    "Session ID": "ID sezení",
+    "%(senderName)s set a profile picture.": "%(senderName)s si nastavil/a profilový obrázek.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s si změnil/a zobrazované jméno na %(displayName)s.",
+    "Set": "Nastavit",
+    "Sets the room topic": "Nastavuje téma místnosti",
+    "Show Apps": "Zobrazit aplikace",
+    "Show panel": "Zobrazit panel",
+    "Show timestamps in 12 hour format (e.g. 2:30pm)": "Zobrazovat časové značky v 12hodinovém formátu (např. 2:30 odp.)",
+    "Sign in": "Přihlásit",
+    "Sign out": "Odhlásit",
+    "Some of your messages have not been sent.": "Některé z vašich zpráv nebyly odeslány.",
+    "Someone": "Někdo",
+    "Start a chat": "Začít chat",
+    "Start authentication": "Začít ověření",
+    "Submit": "Odeslat",
+    "Success": "Úspěch",
+    "tag as %(tagName)s": "oštítkovat jako %(tagName)s",
+    "The main address for this room is": "Hlavní adresa této místnosti je",
+    "The phone number entered looks invalid": "Zadané telefonní číslo se zdá být neplatné",
+    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Zadaný podepisovací klíč se shoduje s klíčem obdrženým od uživatele %(userId)s ze zařízení %(deviceId)s. Zařízení je označeno jako ověřené.",
+    "This email address is already in use": "Tato e-mailová adresa je již používaná",
+    "This email address was not found": "Tato e-mailová adresa nebyla nalezena",
+    "%(actionVerb)s this person?": "%(actionVerb)s tuto osobu?",
+    "The file '%(fileName)s' exceeds this home server's size limit for uploads": "Soubor '%(fileName)s' překračuje maximální velikost povolenou na tomto domovském serveru",
+    "The file '%(fileName)s' failed to upload": "Soubor '%(fileName)s' se nepodařilo nahrát",
+    "This Home Server does not support login using email address.": "Tento domovský server nepodporuje přihlašování e-mailovou adresou.",
+    "There was a problem logging in.": "Při přihlašování se vyskytl problém.",
+    "This room has no local addresses": "Tato místnost nemá žádné místní adresy",
+    "This room is not recognised.": "Tato místnost nebyla rozpoznána.",
+    "These are experimental features that may break in unexpected ways": "Tyto funkce jsou experimentální a mohou se pokazit nečekanými způsoby",
+    "The visibility of existing history will be unchanged": "Viditelnost existující historie nebude změněna"
 }

From 3903f5a41368d2e87aa50734a9c7f60f1c204a33 Mon Sep 17 00:00:00 2001
From: ErCiccione <calcifer@cryptolab.net>
Date: Sun, 17 Sep 2017 15:45:49 +0000
Subject: [PATCH 008/123] Translated using Weblate (Italian)

Currently translated at 7.3% (63 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
---
 src/i18n/strings/it.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 67df5bc332..954fa1bd69 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -59,5 +59,7 @@
     "all room members": "Tutti i membri della stanza",
     "all room members, from the point they are invited": "Tutti i membri della stanza, dal punto in cui sono stati/e invitati/e",
     "all room members, from the point they joined": "tutti i membri della stanza, dal punto in cui si sono uniti",
-    "and": "e"
+    "and": "e",
+    "Add a widget": "Aggiungi un widget",
+    "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Un messaggio di testo è stato inviato a +%(msisdn)s. Inserisci il codice di verifica che contiene"
 }

From 1639e643285ec85d083111b92bda3aa66ebb5dc8 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Mon, 18 Sep 2017 01:10:23 +0000
Subject: [PATCH 009/123] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (855 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
---
 src/i18n/strings/zh_Hant.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 6196608d48..9fbbb95059 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -861,5 +861,7 @@
     "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "機器人檢查目前在桌面端不可用 ── 請使用<a>網路瀏覽器</a>",
     "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s 小工具已被 %(senderName)s 修改",
     "%(weekDayName)s, %(monthName)s %(day)s": "%(monthName)s%(day)s %(weekDayName)s",
-    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(fullYear)s %(monthName)s %(day)s %(weekDayName)s"
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(fullYear)s %(monthName)s %(day)s %(weekDayName)s",
+    "Copied!": "已複製！",
+    "Failed to copy": "複製失敗"
 }

From add9f6949790cacb354d8f58ef9ad37138af1614 Mon Sep 17 00:00:00 2001
From: Stefan Parviainen <pafcu@iki.fi>
Date: Mon, 18 Sep 2017 07:29:33 +0000
Subject: [PATCH 010/123] Translated using Weblate (Finnish)

Currently translated at 59.7% (511 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
---
 src/i18n/strings/fi.json | 164 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 163 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index 149464d009..5456a4d22f 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -349,5 +349,167 @@
     "Unrecognised room alias:": "Tuntematon huonealias:",
     "Unverified": "Varmentamaton",
     "Uploading %(filename)s and %(count)s others|zero": "Ladataan %(filename)s",
-    "Uploading %(filename)s and %(count)s others|one": "Ladataan %(filename)s ja %(count)s muuta"
+    "Uploading %(filename)s and %(count)s others|one": "Ladataan %(filename)s ja %(count)s muuta",
+    "Blacklisted": "Estetyt",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s muuti huoneen nimeksi %(roomName)s.’,,False,.%(senderDisplayName)s changed the room name to %(roomName)s.,,\n,%(senderDisplayName)s removed the room name.'",
+    "Drop here to tag %(section)s": "Pudota tähän tägätäksesi %(section)s",
+    "Enable automatic language detection for syntax highlighting": "Ota automaattinen kielentunnistus käyttöön koodin väritystä varten",
+    "Encrypted messages will not be visible on clients that do not yet implement encryption": "Salatut viestit eivät näy ohjelmissa joissa salaus ei ole vielä implementoitu",
+    "%(senderName)s ended the call.": "%(senderName)s lopetti puhelun.’,,False,.%(senderName)s ended the call.,,\n,End-to-end encryption information,Päästä päähän-salauksen tiedot,,False,.End-to-end encryption information,,\n,End-to-end encryption is in beta and may not be reliable,Päästä päähän salaus on vielä testausvaiheessa ja saattaa toimia epävarmasti,,False,.End-to-end encryption is in beta and may not be reliable,,\n,Enter Code,Syötä koodi,,False,.Enter Code,,\n,Enter passphrase,Syötä salasana,,False,.Enter passphrase,,\n,Error,Virhe,,False,.Error,,\n,Error decrypting attachment,Liitteen salauksen purku epäonnistui,,False,.Error decrypting attachment,,\n,Error: Problem communicating with the given homeserver.,Virhe: Ongelma yhteydenpidossa kotipalvelimeen,,False,.Error: Problem communicating with the given homeserver.,,\n,Event information,Tapahtumatiedot,,False,.Event information,,\n,Existing Call,Käynnissä oleva puhelu,,False,.Existing Call,,\n,Export,Vie,,False,.Export,,\n,Export E2E room keys,Vie huoneen päästä päähän-salauksen (E2E) avaimet ,,False,.Export E2E room keys,,\n,Failed to ban user,Porttikiellon antaminen epäonnistui,,False,.Failed to ban user,,\n,Failed to change password. Is your password correct?,Salasanan muuttaminen epäonnistui. Onko salasanasi oikein?,,False,.Failed to change password. Is your password correct?,,\n,Failed to change power level,,,False,.Failed to change power level,,\n,Failed to delete device,Laitten poistamine  epäonnistui,,False,.Failed to delete device,,\n,Failed to fetch avatar URL,Avatar URL:n haku epäonnistui,,False,.Failed to fetch avatar URL,,\n,Failed to forget room %(errCode)s,Huoneen unohtaminen epäonnistui %(errCode)s,,False,.Failed to forget room %(errCode)s,,\n,Failed to join room,Huoneeseen liittyminen epäonnistui,,False,.Failed to join room,,\n,Failed to join the room,Huoneeseen liittyminen epäonnistui,,False,.Failed to join the room,,\n,Failed to kick,Huoneesta poistaminen epäonnistui,,False,.Failed to kick,,\n,Failed to leave room,Huoneesta poistuminen epäonnistui,,False,.Failed to leave room,,\n,Failed to load timeline position,Aikajanapaikan lataaminen epäonnistui,,False,.Failed to load timeline position,,\n,Failed to lookup current room,Nykyisen huoneen löytäminen epäonnistui,,False,.Failed to lookup current room,,\n,Failed to mute user,Käyttäjän mykistäminen epäonnistui,,False,.Failed to mute user,,\n,Failed to register as guest:,Vieraana rekisteröityminen epäonnistui,,False,.Failed to register as guest:,,\n,Failed to reject invite,Kutsun hylkääminen epäonnistui,,False,.Failed to reject invite,,\n,Failed to reject invitation,Kutsun hylkääminen epäonnistui,,False,.Failed to reject invitation,,\n,Failed to save settings,Asetusten tallentaminen epäonnistui,,False,.Failed to save settings,,\n,Failed to send email,Sähköpostin lähettäminen epäonnistui,,False,.Failed to send email,,\n,Failed to send request.,Pyynnön lähettäminen epäonnistui,,False,.Failed to send request.,,\n,Failed to set avatar.,,,False,.Failed to set avatar.,,\n,Failed to set display name,Näyttönimen asettaminen epäonnistui,,False,.Failed to set display name,,\n,Failed to set up conference call,Konferenssipuhelun alustus epäonnistui,,False,.Failed to set up conference call,,\n,Failed to toggle moderator status,Moderaattoriasetuksen muuttaminen epäonnistui,,False,.Failed to toggle moderator status,,\n,Failed to unban,Porttikiellon poistaminen epäonnistui,,False,.Failed to unban,,\n,Failed to upload file,Tiedoston lataaminen epäonnistui,,False,.Failed to upload file,,\n,Failed to upload profile picture!,Profiilikuvan lataaminen epäonnistui,,False,.Failed to upload profile picture!,,\n,Failed to verify email address: make sure you clicked the link in the email,Varmenna sähköpostiosoitteesi: varmista että klikkasit sähköpostissa olevaa linkkiä,,False,.Failed to verify email address: make sure you clicked the link in the email,,\n,Failure to create room,Huoneen luominen epäonnistui,,False,.Failure to create room,,\n,Favourite,Suosikki,,False,.Favourite,,\n,favourite,suosikki,,False,.favourite,,\n,Favourites,Suosikit,,False,.Favourites,,\n,Fill screen,Täytä näyttö,,False,.Fill screen,,\n,Filter room members,Suodata huoneen jäsenet,,False,.Filter room members,,\n,Forget room,Unohda huone,,False,.Forget room,,\n,Forgot your password?,Unohditko salasanasi?,,False,.Forgot your password?,,\n,\"For security, this session has been signed out. Please sign in again.\",Turvallisuussyistä tämä istunto on vanhentunut. Ole hyvä ja kirjaudu uudestaan.,,False,\".For security, this session has been signed out. Please sign in again.\",,\n,\"For security, logging out will delete any end-to-end encryption keys from this browser. If you want to be able to decrypt your conversation history from future Riot sessions, please export your room keys for safe-keeping.\",Turvallusuussyistä uloskirjautuminen poistaa kaikki päästä päähän-salausavaimet tästä selaimesta. Jos haluat purkaa keskustelujen salaukset tulevaisuudessa pitää sinun viedä purkuavaimet ja pitää ne turvallisesti tallessa.,,False,\".For security, logging out will delete any end-to-end encryption keys from this browser. If you want to be able to decrypt your conversation history from future Riot sessions, please export your room keys for safe-keeping.\",,\n,Found a bug?,Löysitkö virheen?,,False,.Found a bug?,,\n,%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s'",
+    "Guest access is disabled on this Home Server.": "Vierailijat on estetty tällä kotipalvelimella.",
+    "Guest users can't create new rooms. Please register to create room and start a chat.": "Vierailijat eivät voi luoda huoneita. Ole hyvä ja rekisteröidy luodaksesi huoneen ja aloittaaksesi keskustelun",
+    "Guest users can't upload files. Please register to upload.": "Vierailijat eivät voi ladata tiedostoja. Ole hyvä ja rekisteröidy voidaksesi ladata tiedostoja.",
+    "Guests can't use labs features. Please register.": "\"Vierailijat eivät voi käyttää kokeellisia toimintoja. Ole hyvä ja rekisteröidy",
+    "Guests cannot join this room even if explicitly invited.": "Vierailijat eivät voi liittyä tähän huoneeseen vaikka heidät on explisiittisesti kutsuttu",
+    "Hangup": "Lopeta",
+    "Hide join/leave messages (invites/kicks/bans unaffected)": "Piilota liittymis-/poistumisviestit (ei koske kutsuja/poistamisia/porttikieltoja)",
+    "Historical": "Vanhat",
+    "Home": "Etusivu",
+    "Invalid file%(extra)s": "Virheellinen tiedosto%(extra)s",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s kutsui käyttäjän %(targetName)s.’,,False,.%(senderName)s invited %(targetName)s.,,\n,Invite new room members,Kutsu lisää jäseniä huoneeseen,,False,.Invite new room members,,\n,Invited,Kutsuttu,,False,.Invited,,\n,Invites,Kutsuu,,False,.Invites,,\n,Invites user with given id to current room,Kutsuu annetun käyttäjätunnisteen mukaisen käyttäjän huoneeseen,,False,.Invites user with given id to current room,,\n,%(alias)s' is not a valid format for an address",
+    "%(displayName)s is typing": "%(displayName)s kirjoittaa’,,False,.%(displayName)s is typing,,\n,Sign in with,Kirjaudu käyttäen,,False,.Sign in with,,\n,Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.,Liitty käyttäen <voiceText>ääntä</voiceText> tai <videoText>videota</videoText>,,False,.Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.,,\n,Join Room,Liity huoneeseen,,False,.Join Room,,\n,joined and left,liittyi ja poistui,,False,.joined and left,,\n,joined,liittyi,,False,.joined,,\n,%(targetName)s joined the room.'",
+    "%(senderName)s made future room history visible to": "%(senderName)s teki tulevista viesteistä näkyviä’,,False,.%(senderName)s made future room history visible to,,\n,Manage Integrations,Hallinoi integraatioita,,False,.Manage Integrations,,\n,Markdown is disabled,Markdown on pois päältä,,False,.Markdown is disabled,,\n,Markdown is enabled,Mardown on päällä,,False,.Markdown is enabled,,\n,matrix-react-sdk version:,Matrix-react-sdk versio:,,False,.matrix-react-sdk version:,,\n,Matrix Apps,Matrix ohjelmat,,False,.Matrix Apps,,\n,Members only,Vain jäsenet,,False,.Members only,,\n,Message not sent due to unknown devices being present,Viestiä ei lähetetty koska paikalla on tuntemattomia laitteita,,False,.Message not sent due to unknown devices being present,,\n,Missing room_id in request,room_id puuttuu kyselystä,,False,.Missing room_id in request,,\n,Missing user_id in request,user_id puuttuu kyselystä,,False,.Missing user_id in request,,\n,Mobile phone number,Matkapuhelinnumero,,False,.Mobile phone number,,\n,Mobile phone number (optional),Matkapuhelinnumero (valinnainen),,False,.Mobile phone number (optional),,\n,Moderator,Moderaattori,,False,.Moderator,,\n,Must be viewing a room,Pakko olla huoneessa,,False,.Must be viewing a room,,\n,Mute,Vaimenna,,False,.Mute,,\n,my Matrix ID,minun Matrix tunniste,,False,.my Matrix ID,,\n,Name,Nimi,,False,.Name,,\n,Never send encrypted messages to unverified devices from this device,Älä koskaa lähetä salattuja viestejä varmentamattomiin laitteisiin tältä laitteelta,,False,.Never send encrypted messages to unverified devices from this device,,\n,Never send encrypted messages to unverified devices in this room,Älä koskaa lähetä salattuja viestejä varmentamattomiin laitteisiin tässä huoneessa,,False,.Never send encrypted messages to unverified devices in this room,,\n,Never send encrypted messages to unverified devices in this room from this device,Älä koskaa lähetä salattuja viestejä varmentamattomiin laitteisiin tässä huoneessa tältä laitteelta,,False,.Never send encrypted messages to unverified devices in this room from this device,,\n,New address (e.g. #foo:%(localDomain)s),Uusi osoite (esim. #foo:%(localDomain)s),,False,.New address (e.g. #foo:%(localDomain)s),,\n,New Composer & Autocomplete,,,False,.New Composer & Autocomplete,,\n,New password,Uusi salasana,,False,.New password,,\n,New passwords dont match",
+    "none": "Ei mikään",
+    "No devices with registered encryption keys": "Ei laitteita joilla rekisteröityjä salausavaimia",
+    "No users have specific privileges in this room": "Kellään käyttäjällä ei ole erityisiä oikeuksia",
+    "%(senderName)s placed a %(callType)s call.": "%(senderName)s soitti %(callType)spuhelun’,,False,.%(senderName)s placed a %(callType)s call.,,\n,\"Please check your email and click on the link it contains. Once this is done, click continue.\",Ole hyvä ja tarkista sähköpostisi ja seuraa sen sisältämää linkkiä. Voit jatkaa tämän jälkeen.,,False,\".Please check your email and click on the link it contains. Once this is done, click continue.\",,\n,Please Register,Ole hyvä ja rekisteröidy,,False,.Please Register,,\n,Power level must be positive integer.,,,False,.Power level must be positive integer.,,\n,Press,,,False,.Press,,\n,Press <StartChatButton> to start a chat with someone,Paina <StartChatButton>,,False,.Press <StartChatButton> to start a chat with someone,,\n,Privacy warning,Yksityisyysvaroitus,,False,.Privacy warning,,\n,Private Chat,Yksityinen keskustelu,,False,.Private Chat,,\n,Privileged Users,,,False,.Privileged Users,,\n,Profile,Profiili,,False,.Profile,,\n,Public Chat,Julkinen keskustelu,,False,.Public Chat,,\n,Reason,Syy,,False,.Reason,,\n,Reason: %(reasonText)s,Syy: %(reasonText)s,,False,.Reason: %(reasonText)s,,\n,Revoke Moderator,Poista moderaattorioikeudet,,False,.Revoke Moderator,,\n,Revoke widget access,,,False,.Revoke widget access,,\n,Refer a friend to Riot:,Suosittele Riot ystävälle:,,False,.Refer a friend to Riot:,,\n,Register,Rekisteröi,,False,.Register,,\n,rejected,hylätty,,False,.rejected,,\n,%(targetName)s rejected the invitation.'",
+    "Remove %(threePid)s?": "Poista %(threePid)s?",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s pyysi VoIP konferenssia.’,,False,.%(senderName)s requested a VoIP conference.,,\n,Report it,Ilmoita siitä,,False,.Report it,,\n,\"Resetting password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.\",,,False,\".Resetting password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.\",,\n,restore,palauta,,False,.restore,,\n,Results from DuckDuckGo,DuckDuckGo:n tulokset,,False,.Results from DuckDuckGo,,\n,Return to app,Palaa ohjelmaan,,False,.Return to app,,\n,Return to login screen,Palaa kirjautumissivulle,,False,.Return to login screen,,\n,Riot does not have permission to send you notifications - please check your browser settings,Riotilla ei ole oikeuksia lähettää sinulle ilmoituksia. Ole hyvä ja tarkista selaimen asetukset,,False,.Riot does not have permission to send you notifications - please check your browser settings,,\n,Riot was not given permission to send notifications - please try again,Riotilla ei saannut oikeuksia lähettää ilmoituksia. Ole hyvä ja yritä uudelleen,,False,.Riot was not given permission to send notifications - please try again,,\n,riot-web version:,Riot-web versio:,,False,.riot-web version:,,\n,Room %(roomId)s not visible,Huone %(roomId)s ei ole näkyvissä,,False,.Room %(roomId)s not visible,,\n,Room Colour,Huoneen väri,,False,.Room Colour,,\n,Room contains unknown devices,Huone sisältää tuntemattomia laitteita,,False,.Room contains unknown devices,,\n,Room name (optional),Huoneen nimi (valinnainen),,False,.Room name (optional),,\n,%(roomName)s does not exist.'",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s asetti näyttönimekseen %(displayName)s.’,,False,.%(senderName)s set their display name to %(displayName)s.,,\n,Set,Aseta,,False,.Set,,\n,Settings,Asetukset,,False,.Settings,,\n,Sets the room topic,Asettaa huoneen aiheen,,False,.Sets the room topic,,\n,Show Apps,,,False,.Show Apps,,\n,Show panel,Näytä paneeli,,False,.Show panel,,\n,Show Text Formatting Toolbar,Näytä tekstinmuotoilupalkki,,False,.Show Text Formatting Toolbar,,\n,Show timestamps in 12 hour format (e.g. 2:30pm),Näytä aikaleimat 12h muodossa (esim. 2:30pm),,False,.Show timestamps in 12 hour format (e.g. 2:30pm),,\n,Signed Out,Uloskirjautunut,,False,.Signed Out,,\n,Sign in,Kirjaudu sisään,,False,.Sign in,,\n,Sign out,Kirjaudu ulos,,False,.Sign out,,\n,since the point in time of selecting this option,tämän asetuksen valitsemisesta,,False,.since the point in time of selecting this option,,\n,since they joined,liittymisestä lähtien,,False,.since they joined,,\n,since they were invited,kutsusta lähtien,,False,.since they were invited,,\n,Some of your messages have not been sent.,Jotkut viesteistäsi ei ole lähetetty,,False,.Some of your messages have not been sent.,,\n,Someone,Joku,,False,.Someone,,\n,\"Sorry, this homeserver is using a login which is not recognised \",Valitettavasti tämä kotipalvelin käyttää sisäänkirjautumista jota ei tunnistettu,,False,\".Sorry, this homeserver is using a login which is not recognised \",,\n,Start a chat,Aloita keskustelu,,False,.Start a chat,,\n,Start authentication,Aloita tunnistus,,False,.Start authentication,,\n,Start Chat,Aloita keskustelu,,False,.Start Chat,,\n,Submit,Lähetä,,False,.Submit,,\n,Success,Onnistuminen,,False,.Success,,\n,tag as %(tagName)s,lisää tägi %(tagName)s,,False,.tag as %(tagName)s,,\n,tag direct chat,tägää suora viestittely,,False,.tag direct chat,,\n,Tagged as: ,Tägit:,,False,.Tagged as: ,,\n,The default role for new room members is,Huoneen uusien jäsenten oletusrooli on,,False,.The default role for new room members is,,\n,The main address for this room is,Tämän huoneen pääosoite on,,False,.The main address for this room is,,\n,The maximum permitted number of widgets have already been added to this room.,,,False,.The maximum permitted number of widgets have already been added to this room.,,\n,The phone number entered looks invalid,Syötetty puhelinnumero näyttää virheelliseltä,,False,.The phone number entered looks invalid,,\n,The signing key you provided matches the signing key you received from %(userId)ss device %(deviceId)s. Device marked as verified.",
+    "This action cannot be performed by a guest user. Please register to be able to do this.": "Vierailija ei voi suorittaa tätä toimintoa. Ole hyvä ja rekisteröidy suorittaaksesi toiminnon.",
+    "The file '%(fileName)s' exceeds this home server's size limit for uploads": "Tiedosto ‘%(fileName)s’ ylittää tämän kotipalvelimen maksimitiedostokoon",
+    "The file '%(fileName)s' failed to upload": "Tiedoston ‘%(fileName)s’ lataaminen epäonnistui",
+    "This Home Server does not support login using email address.": "Kotipalvelin ei tue kirjatumista sähköpostiosoitteen avulla.",
+    "This invitation was sent to an email address which is not associated with this account:": "Kutsu lähetettiin sähköpostiosoitteeseen jota ei ole liitetty tähän tiliin:",
+    "This room is not recognised.": "Huonetta ei tunnistettu",
+    "These are experimental features that may break in unexpected ways": "Nämä ovat kokeellisia ominaisuuksia jotka saattavat toimia ennakoimattomilla tavoilla",
+    "This doesn't appear to be a valid email address": "Olemassa olevan historian näkyvyys ei muutu",
+    "This is a preview of this room. Room interactions have been disabled": "Tämä on huoneen ennakokatselu. Vuorovaikutus ei ole mahdollista",
+    "This phone number is already in use": "Puhelinnumero on jo käytössä",
+    "times": "kertaa",
+    "To link to a room it must have <a>an address</a>.": "Linkittääksesi tähän huoneseen sillä on oltava <a>osoite</a>.",
+    "Turn Markdown off": "Ota Markdown pois käytöstä",
+    "Turn Markdown on": "Ota Markdown käyttöön",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s otti päästä päähän-salauksen käyttöön (algoritmi %(algorithm)s).’,,False,.%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).,,\n,Unable to add email address,Sähköpostiosoitteen lisääminen epäonnistui,,False,.Unable to add email address,,\n,Unable to create widget.,,,False,.Unable to create widget.,,\n,Unable to remove contact information,Yhteystietojen poistaminen epäonnistui,,False,.Unable to remove contact information,,\n,Unable to restore previous session,Edellisen istunnon palauttaminen epäonnistui,,False,.Unable to restore previous session,,\n,Unable to verify email address.,Sähköpostin varmentaminen epäonnistui.,,False,.Unable to verify email address.,,\n,Unban,Poista porttikielto,,False,.Unban,,\n,Unbans user with given id,Poistaa porttikiellon annetun ID:n omaavalta käyttäjältä,,False,.Unbans user with given id,,\n,%(senderName)s unbanned %(targetName)s.'",
+    "Username invalid: %(errMessage)s": "Virheellinen käyttäjänimi: %(errMessage)s",
+    "Users": "Käyttäjät",
+    "User": "Käyttäjä",
+    "Verification": "Varmennus",
+    "verified": "varmennettu",
+    "Verified": "Varmennettu",
+    "Verified key": "Varmennusavain",
+    "Video call": "Videopuhelu",
+    "Voice call": "Äänipuhelu",
+    "VoIP conference finished.": "VoIP konferenssi loppui.",
+    "VoIP conference started.": "VoIP konferenssi alkoi",
+    "VoIP is unsupported": "VoIP ei ole tuettu",
+    "(no answer)": "(ei vastausta)",
+    "(unknown failure: %(reason)s)": "(tuntematon virhe: %(reason)s)",
+    "(warning: cannot be disabled again!)": "(varoitus: ei voida ottaa pois käytöstä enää!)",
+    "Warning!": "Varoitus!",
+    "Who can access this room?": "Keillä on pääsy tähän huoneeseen?",
+    "Who can read history?": "Kuka pystyy lukemaan historian?",
+    "Who would you like to add to this room?": "Kenet sinä haluaisit lisätä tähän huoneeseen?",
+    "Who would you like to communicate with?": "Kenen kanssa haluaisit kommunikoida?",
+    "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "Haluatko <acceptText>hyväksyä</acceptText> vai <declineText>hylätä</declineText> kutsun?",
+    "You already have existing direct chats with this user:": "Sinulla on jo keskusteluja käynnissä tämän käyttäjän kanssa:",
+    "You are already in a call.": "Sinulla on jo puhelu käynnissä.",
+    "You are not in this room.": "Sinä et ole tässä huoneessa.",
+    "You do not have permission to do that in this room.": "Sinulla ei ole oikeutta tehdä tuota tässä huoneessa.",
+    "You are trying to access %(roomName)s.": "Yrität liittyä huoneeseen %(roomName)s",
+    "You cannot place a call with yourself.": "Et voi soittaa itsellesi.",
+    "You cannot place VoIP calls in this browser.": "Et voi soittaa VoIP puheluita tällä selaimella.",
+    "You do not have permission to post to this room": "Sinulla ei ole oikeutta kirjoittaa tässä huoneessa",
+    "You have been banned from %(roomName)s by %(userName)s.": "Käyttäjä %(userName)s on antanut sinulle porttikiellon huoneeseen %(roomName)s",
+    "You have been invited to join this room by %(inviterName)s": "Käyttäjä %(userName)s on kutsunut sinut tähän huoneeseen",
+    "You have been kicked from %(roomName)s by %(userName)s.": "Käyttäjä %(userName)s on poistanut sinut huoneesta %(roomName)s.",
+    "You have <a>disabled</a> URL previews by default.": "Olet oletusarvoisesti ottanut URL esikatselut <a>pois käytöstä</a>.",
+    "You have <a>enabled</a> URL previews by default.": "Olet oletusarvoisesti ottanut URL esikatselut <a>käyttöön</a>.",
+    "You have entered an invalid contact. Try using their Matrix ID or email address.": "Olet syöttänyt virheellisen kontaktin. Yritä käyttää heidän Matrixtunnistetta tai sähköpostiosoitetta.",
+    "You have no visible notifications": "Sinulla ei ole näkyviä ilmoituksia.",
+    "You must <a>register</a> to use this functionality": "Sinun pitää <a>rekisteröityä</a> käyttääksesi tätä toiminnallisuutta",
+    "You need to be able to invite users to do that.": "Sinun pitää pystyä kutsua käyttäjiä voidaksesi tehdä tuon.",
+    "You need to be logged in.": "Sinun pitää olla kirjautunut.",
+    "You need to enter a user name.": "Sinun pitää syöttää käyttäjänimi.",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Sinun sähköpostiosoitteesi ei vaikuta olevan liitetty mihinkään Matrixtunnisteeseen tällä kotipalvelimella.",
+    "Your password has been reset": "Salasanasi on palautettu",
+    "You should not yet trust it to secure data": "Sinun ei vielä kannata luottaa siihen turvataksesi dataa.",
+    "Your home server does not support device management.": "Kotipalvelimesi ei tue laitteiden hallintaa.",
+    "Sun": "Su",
+    "Mon": "Ma",
+    "Tue": "Ti",
+    "Wed": "Ke",
+    "Thu": "To",
+    "Fri": "Pe",
+    "Sat": "La",
+    "Set a display name:": "Aseta näyttönimi:",
+    "Set a Display Name": "Aseta näyttönimi:",
+    "This server does not support authentication with a phone number.": "Tämä palvelin ei tue autentikointia puhelinnumeron avulla.",
+    "Missing password.": "Salasana puuttuu.",
+    "Passwords don't match.": "Salasanat eivät täsmää.",
+    "Password too short (min %(MIN_PASSWORD_LENGTH)s).": "Salasana on liian lyhyt (minimi %(MIN_PASSWORD_LENGTH)s).",
+    "This doesn't look like a valid email address.": "Tämä ei näytä oikealta sähköpostiosoitteelta.",
+    "This doesn't look like a valid phone number.": "Tämä ei näytä oikealta puhelinnumerolta.",
+    "An unknown error occurred.": "Tuntematon virhe.",
+    "I already have an account": "Minulla on jo tili",
+    "An error occurred: %(error_string)s": "Virhe: %(error_string)s",
+    "Topic": "Aihe",
+    "Make this room private": "Tee tästä huoneesta yksityinen",
+    "Share message history with new users": "Jaa viestihistoria uusille käyttäjille",
+    "Encrypt room": "Salaa huone",
+    "There are no visible files in this room": "Tässä huoneessa ei tiedostoja näkyvissä",
+    "Room": "Huone",
+    "Copied!": "Kopioitu!",
+    "Failed to copy": "Kopiointi epäonnistui",
+    "Connectivity to the server has been lost.": "Yhteys palvelimeen menetettiin.",
+    "Sent messages will be stored until your connection has returned.": "Lähetetyt viestit tallennetaan kunnes yhteys on taas muodostettu.",
+    "Auto-complete": "Automaattitäydennys",
+    "<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.": "<a>Uudelleenlähetä kaikki</a> tai <a>hylkää kaikki</a> nyt. Voit myös valita yksittäisiä viestejä uudelleenlähetettäväksi tai hylättäväksi.",
+    "(~%(count)s results)|one": "(~%(count)s tulos)",
+    "(~%(count)s results)|other": "(~%(count)s tulosta)",
+    "or": "tai",
+    "Active call": "Aktiivinen puhelu",
+    "bold": "lihavoitu",
+    "italic": "kursiivi",
+    "strike": "ylivedetty",
+    "underline": "alleviivattu",
+    "code": "koodi",
+    "quote": "sitaatti",
+    "bullet": "lista",
+    "numbullet": "numeroitu lista",
+    "%(severalUsers)sjoined %(repeats)s times": "%(severalUsers)sliittyivät %(repeats)s kertaa’,,False,.%(severalUsers)sjoined %(repeats)s times,,\n,%(oneUser)sjoined %(repeats)s times'",
+    "%(oneUser)srejected their invitation %(repeats)s times": "%(oneUser)shylkäsi kutsunsa %(repeats)s kertaa’,,False,.%(oneUser)srejected their invitation %(repeats)s times,,\n,%(severalUsers)srejected their invitations'",
+    "Please select the destination room for this message": "Ole hyvä ja valitse vastaanottava huone tälle viestille",
+    "New Password": "Uusi salasana",
+    "Start automatically after system login": "Käynnistä automaattisesti käyttöjärjestelmään kirjautumisen jälkeen",
+    "Desktop specific": "Työpöytäkäytön asetukset",
+    "Analytics": "Analytiikka",
+    "Opt out of analytics": "Ota analytiikka pois käytöstä",
+    "Options": "Valinnat",
+    "Riot collects anonymous analytics to allow us to improve the application.": "Riot kerää anonyymisti tilastoja jotta voimme parantaa ohjelmistoa",
+    "Passphrases must match": "Salasanojen on täsmättävä",
+    "Passphrase must not be empty": "Salasana ei saa olla tyhjä",
+    "Export room keys": "Vie huoneen avaimet",
+    "Confirm passphrase": "Varmista salasana",
+    "Import room keys": "Tuo huoneen avaimet",
+    "File to import": "Tiedosto",
+    "You must join the room to see its files": "Sinun pitää liittyä huoneeseen voidaksesi nähdä sen sisältämät tiedostot",
+    "Reject all %(invitedRooms)s invites": "Hylkää kaikki %(invitedRooms)s kutsut",
+    "Start new chat": "Aloita uusi keskustelu",
+    "Guest users can't invite users. Please register.": "Vierailijat eivät voi lähettää kutsuja. Ole hyvä ja rekisteröidy.",
+    "Failed to invite": "Kutsu epäonnistui",
+    "Failed to invite user": "Käyttäjän kutsuminen epäonnistui",
+    "Failed to invite the following users to the %(roomName)s room:": "Seuraavian käyttäjien kutsuminen huoneeseen %(roomName)s epäonnistui:",
+    "Confirm Removal": "Varmista poistaminen",
+    "Unknown error": "Tuntematon virhe",
+    "Incorrect password": "Virheellinen salasana",
+    "This action is irreversible.": "Tätä toimintoa ei voi perua.",
+    "Device name": "Laitenimi",
+    "Device Name": "Laitenimi",
+    "Device key": "Laiteavain",
+    "In future this verification process will be more sophisticated.": "Tulevaisuudessa tämä varmennusprosessi tulee olemaan hienostuneempi.",
+    "Verify device": "Varmenna laite",
+    "I verify that the keys match": "Totean että avaimet vastaavat toisiaan.",
+    "Unable to restore session": "Istunnon palautus epäonnistui",
+    "Continue anyway": "Jatka kuitenkin"
 }

From ff503fce3b0ecb4bcd691084dd91c2381b565318 Mon Sep 17 00:00:00 2001
From: Stefan Parviainen <pafcu@iki.fi>
Date: Mon, 18 Sep 2017 09:53:17 +0000
Subject: [PATCH 011/123] Translated using Weblate (Finnish)

Currently translated at 59.7% (511 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
---
 src/i18n/strings/fi.json | 70 ++++++++++++++++++++--------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index 5456a4d22f..204d02a106 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -113,8 +113,8 @@
     "Click to unmute audio": "Paina poistaaksesi äänimykistyksen",
     "Command error": "Komentovirhe",
     "Commands": "Komennot",
-    "Conference call failed.": "Konferenssipuhelu epäonnistui",
-    "Conference calling is in development and may not be reliable.": "Konferenssipuhelut ovat vielä kehityksen alla ja saattavat toimia epäluotettavasti",
+    "Conference call failed.": "Konferenssipuhelu epäonnistui.",
+    "Conference calling is in development and may not be reliable.": "Konferenssipuhelut ovat vielä kehityksen alla ja saattavat toimia epäluotettavasti.",
     "Conference calls are not supported in encrypted rooms": "Konferenssipuhelut eivät ole mahdollisia salatuissa huoneissa",
     "Conference calls are not supported in this client": "Tämä asiakasohjelma ei tue konferenssipuheluja",
     "Confirm password": "Varmista salasana",
@@ -138,7 +138,7 @@
     "Device already verified!": "Laite on jo varmennettu!",
     "Device ID": "Laitetunniste",
     "Device ID:": "Laitetunniste:",
-    "device id: ": "laitetunniste:",
+    "device id: ": "laitetunniste: ",
     "Device key:": "Laiteavain:",
     "Devices": "Laitteet",
     "Direct chats": "Suorat viestittelyt",
@@ -170,7 +170,7 @@
     "Error decrypting attachment": "Liitteen salauksen purku epäonnistui",
     "Event information": "Tapahtumatiedot",
     "Export": "Vie",
-    "Export E2E room keys": "Vie huoneen päästä päähän-salauksen (E2E) avaimet ",
+    "Export E2E room keys": "Vie huoneen päästä päähän-salauksen (E2E) avaimet",
     "Failed to ban user": "Porttikiellon antaminen epäonnistui",
     "Failed to delete device": "Laitten poistamine  epäonnistui",
     "Failed to fetch avatar URL": "Avatar URL:n haku epäonnistui",
@@ -179,12 +179,12 @@
     "Failed to leave room": "Huoneesta poistuminen epäonnistui",
     "Failed to load timeline position": "Aikajanapaikan lataaminen epäonnistui",
     "Failed to mute user": "Käyttäjän mykistäminen epäonnistui",
-    "Failed to register as guest:": "Vieraana rekisteröityminen epäonnistui",
+    "Failed to register as guest:": "Vieraana rekisteröityminen epäonnistui:",
     "Failed to reject invite": "Kutsun hylkääminen epäonnistui",
     "Failed to reject invitation": "Kutsun hylkääminen epäonnistui",
     "Failed to save settings": "Asetusten tallentaminen epäonnistui",
     "Failed to send email": "Sähköpostin lähettäminen epäonnistui",
-    "Failed to send request.": "Pyynnön lähettäminen epäonnistui",
+    "Failed to send request.": "Pyynnön lähettäminen epäonnistui.",
     "Failed to set display name": "Näyttönimen asettaminen epäonnistui",
     "Failed to set up conference call": "Konferenssipuhelun alustus epäonnistui",
     "Failed to toggle moderator status": "Moderaattoriasetuksen muuttaminen epäonnistui",
@@ -214,7 +214,7 @@
     "Incoming call from %(name)s": "Saapuva puhelu käyttäjältä %(name)s",
     "Incoming video call from %(name)s": "Saapuva videopuhelu käyttäjältä %(name)s",
     "Incoming voice call from %(name)s": "Saapuva äänipuhelu käyttäjältä %(name)s",
-    "Incorrect username and/or password.": "Virheellinen käyttäjänimi ja/tai salasana",
+    "Incorrect username and/or password.": "Virheellinen käyttäjänimi ja/tai salasana.",
     "Incorrect verification code": "Virheellinen varmennuskoodi",
     "Integrations Error": "Integraatiovirhe",
     "Interface Language": "Käyttöliittymän kieli",
@@ -230,7 +230,7 @@
     "joined and left": "liittyi ja poistui",
     "joined": "liittyi",
     "Joins room with given alias": "Liittyy huoneeseen jolla on annettu alias",
-    "Jump to first unread message.": "Hyppää ensimmäiseen lukemattomaan viestiin",
+    "Jump to first unread message.": "Hyppää ensimmäiseen lukemattomaan viestiin.",
     "Kick": "Poista huoneesta",
     "Kicks user with given id": "Poistaa käyttäjätunnisteen mukaisen käyttäjän huoneesta",
     "Labs": "Laboratorio",
@@ -258,7 +258,7 @@
     "Name": "Nimi",
     "New password": "Uusi salasana",
     "New passwords don't match": "Uudet salasanat eivät täsmää",
-    "New passwords must match each other.": "Uusien salasanojen on vastattava toisiaan",
+    "New passwords must match each other.": "Uusien salasanojen on vastattava toisiaan.",
     "not set": "ei asetettu",
     "not specified": "ei määritetty",
     "(not supported by this browser)": "(ei tuettu tässä selaimessa)",
@@ -320,7 +320,7 @@
     "Sign out": "Kirjaudu ulos",
     "since they joined": "liittymisestä lähtien",
     "since they were invited": "kutsusta lähtien",
-    "Some of your messages have not been sent.": "Jotkut viesteistäsi ei ole lähetetty",
+    "Some of your messages have not been sent.": "Jotkut viesteistäsi ei ole lähetetty.",
     "Someone": "Joku",
     "Start a chat": "Aloita keskustelu",
     "Start Chat": "Aloita keskustelu",
@@ -341,7 +341,7 @@
     "unknown caller": "tuntematon soittaja",
     "unknown device": "tuntematon laite",
     "Unknown room %(roomId)s": "Tuntematon huone %(roomId)s",
-    "Unknown (user, device) pair:": "Tuntematon (käyttäjä,laite) -pari.",
+    "Unknown (user, device) pair:": "Tuntematon (käyttäjä,laite) -pari:",
     "unknown": "tuntematon",
     "Unmute": "Poista mykistys",
     "Unnamed Room": "Nimeämätön huone",
@@ -351,37 +351,37 @@
     "Uploading %(filename)s and %(count)s others|zero": "Ladataan %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Ladataan %(filename)s ja %(count)s muuta",
     "Blacklisted": "Estetyt",
-    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s muuti huoneen nimeksi %(roomName)s.’,,False,.%(senderDisplayName)s changed the room name to %(roomName)s.,,\n,%(senderDisplayName)s removed the room name.'",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s muuti huoneen nimeksi %(roomName)s.",
     "Drop here to tag %(section)s": "Pudota tähän tägätäksesi %(section)s",
     "Enable automatic language detection for syntax highlighting": "Ota automaattinen kielentunnistus käyttöön koodin väritystä varten",
     "Encrypted messages will not be visible on clients that do not yet implement encryption": "Salatut viestit eivät näy ohjelmissa joissa salaus ei ole vielä implementoitu",
-    "%(senderName)s ended the call.": "%(senderName)s lopetti puhelun.’,,False,.%(senderName)s ended the call.,,\n,End-to-end encryption information,Päästä päähän-salauksen tiedot,,False,.End-to-end encryption information,,\n,End-to-end encryption is in beta and may not be reliable,Päästä päähän salaus on vielä testausvaiheessa ja saattaa toimia epävarmasti,,False,.End-to-end encryption is in beta and may not be reliable,,\n,Enter Code,Syötä koodi,,False,.Enter Code,,\n,Enter passphrase,Syötä salasana,,False,.Enter passphrase,,\n,Error,Virhe,,False,.Error,,\n,Error decrypting attachment,Liitteen salauksen purku epäonnistui,,False,.Error decrypting attachment,,\n,Error: Problem communicating with the given homeserver.,Virhe: Ongelma yhteydenpidossa kotipalvelimeen,,False,.Error: Problem communicating with the given homeserver.,,\n,Event information,Tapahtumatiedot,,False,.Event information,,\n,Existing Call,Käynnissä oleva puhelu,,False,.Existing Call,,\n,Export,Vie,,False,.Export,,\n,Export E2E room keys,Vie huoneen päästä päähän-salauksen (E2E) avaimet ,,False,.Export E2E room keys,,\n,Failed to ban user,Porttikiellon antaminen epäonnistui,,False,.Failed to ban user,,\n,Failed to change password. Is your password correct?,Salasanan muuttaminen epäonnistui. Onko salasanasi oikein?,,False,.Failed to change password. Is your password correct?,,\n,Failed to change power level,,,False,.Failed to change power level,,\n,Failed to delete device,Laitten poistamine  epäonnistui,,False,.Failed to delete device,,\n,Failed to fetch avatar URL,Avatar URL:n haku epäonnistui,,False,.Failed to fetch avatar URL,,\n,Failed to forget room %(errCode)s,Huoneen unohtaminen epäonnistui %(errCode)s,,False,.Failed to forget room %(errCode)s,,\n,Failed to join room,Huoneeseen liittyminen epäonnistui,,False,.Failed to join room,,\n,Failed to join the room,Huoneeseen liittyminen epäonnistui,,False,.Failed to join the room,,\n,Failed to kick,Huoneesta poistaminen epäonnistui,,False,.Failed to kick,,\n,Failed to leave room,Huoneesta poistuminen epäonnistui,,False,.Failed to leave room,,\n,Failed to load timeline position,Aikajanapaikan lataaminen epäonnistui,,False,.Failed to load timeline position,,\n,Failed to lookup current room,Nykyisen huoneen löytäminen epäonnistui,,False,.Failed to lookup current room,,\n,Failed to mute user,Käyttäjän mykistäminen epäonnistui,,False,.Failed to mute user,,\n,Failed to register as guest:,Vieraana rekisteröityminen epäonnistui,,False,.Failed to register as guest:,,\n,Failed to reject invite,Kutsun hylkääminen epäonnistui,,False,.Failed to reject invite,,\n,Failed to reject invitation,Kutsun hylkääminen epäonnistui,,False,.Failed to reject invitation,,\n,Failed to save settings,Asetusten tallentaminen epäonnistui,,False,.Failed to save settings,,\n,Failed to send email,Sähköpostin lähettäminen epäonnistui,,False,.Failed to send email,,\n,Failed to send request.,Pyynnön lähettäminen epäonnistui,,False,.Failed to send request.,,\n,Failed to set avatar.,,,False,.Failed to set avatar.,,\n,Failed to set display name,Näyttönimen asettaminen epäonnistui,,False,.Failed to set display name,,\n,Failed to set up conference call,Konferenssipuhelun alustus epäonnistui,,False,.Failed to set up conference call,,\n,Failed to toggle moderator status,Moderaattoriasetuksen muuttaminen epäonnistui,,False,.Failed to toggle moderator status,,\n,Failed to unban,Porttikiellon poistaminen epäonnistui,,False,.Failed to unban,,\n,Failed to upload file,Tiedoston lataaminen epäonnistui,,False,.Failed to upload file,,\n,Failed to upload profile picture!,Profiilikuvan lataaminen epäonnistui,,False,.Failed to upload profile picture!,,\n,Failed to verify email address: make sure you clicked the link in the email,Varmenna sähköpostiosoitteesi: varmista että klikkasit sähköpostissa olevaa linkkiä,,False,.Failed to verify email address: make sure you clicked the link in the email,,\n,Failure to create room,Huoneen luominen epäonnistui,,False,.Failure to create room,,\n,Favourite,Suosikki,,False,.Favourite,,\n,favourite,suosikki,,False,.favourite,,\n,Favourites,Suosikit,,False,.Favourites,,\n,Fill screen,Täytä näyttö,,False,.Fill screen,,\n,Filter room members,Suodata huoneen jäsenet,,False,.Filter room members,,\n,Forget room,Unohda huone,,False,.Forget room,,\n,Forgot your password?,Unohditko salasanasi?,,False,.Forgot your password?,,\n,\"For security, this session has been signed out. Please sign in again.\",Turvallisuussyistä tämä istunto on vanhentunut. Ole hyvä ja kirjaudu uudestaan.,,False,\".For security, this session has been signed out. Please sign in again.\",,\n,\"For security, logging out will delete any end-to-end encryption keys from this browser. If you want to be able to decrypt your conversation history from future Riot sessions, please export your room keys for safe-keeping.\",Turvallusuussyistä uloskirjautuminen poistaa kaikki päästä päähän-salausavaimet tästä selaimesta. Jos haluat purkaa keskustelujen salaukset tulevaisuudessa pitää sinun viedä purkuavaimet ja pitää ne turvallisesti tallessa.,,False,\".For security, logging out will delete any end-to-end encryption keys from this browser. If you want to be able to decrypt your conversation history from future Riot sessions, please export your room keys for safe-keeping.\",,\n,Found a bug?,Löysitkö virheen?,,False,.Found a bug?,,\n,%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s'",
+    "%(senderName)s ended the call.": "%(senderName)s lopetti puhelun.",
     "Guest access is disabled on this Home Server.": "Vierailijat on estetty tällä kotipalvelimella.",
-    "Guest users can't create new rooms. Please register to create room and start a chat.": "Vierailijat eivät voi luoda huoneita. Ole hyvä ja rekisteröidy luodaksesi huoneen ja aloittaaksesi keskustelun",
+    "Guest users can't create new rooms. Please register to create room and start a chat.": "Vierailijat eivät voi luoda huoneita. Ole hyvä ja rekisteröidy luodaksesi huoneen ja aloittaaksesi keskustelun.",
     "Guest users can't upload files. Please register to upload.": "Vierailijat eivät voi ladata tiedostoja. Ole hyvä ja rekisteröidy voidaksesi ladata tiedostoja.",
-    "Guests can't use labs features. Please register.": "\"Vierailijat eivät voi käyttää kokeellisia toimintoja. Ole hyvä ja rekisteröidy",
-    "Guests cannot join this room even if explicitly invited.": "Vierailijat eivät voi liittyä tähän huoneeseen vaikka heidät on explisiittisesti kutsuttu",
+    "Guests can't use labs features. Please register.": "Vierailijat eivät voi käyttää kokeellisia toimintoja. Ole hyvä ja rekisteröidy.",
+    "Guests cannot join this room even if explicitly invited.": "Vierailijat eivät voi liittyä tähän huoneeseen vaikka heidät on eksplisiittisesti kutsuttu.",
     "Hangup": "Lopeta",
     "Hide join/leave messages (invites/kicks/bans unaffected)": "Piilota liittymis-/poistumisviestit (ei koske kutsuja/poistamisia/porttikieltoja)",
     "Historical": "Vanhat",
     "Home": "Etusivu",
     "Invalid file%(extra)s": "Virheellinen tiedosto%(extra)s",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s kutsui käyttäjän %(targetName)s.’,,False,.%(senderName)s invited %(targetName)s.,,\n,Invite new room members,Kutsu lisää jäseniä huoneeseen,,False,.Invite new room members,,\n,Invited,Kutsuttu,,False,.Invited,,\n,Invites,Kutsuu,,False,.Invites,,\n,Invites user with given id to current room,Kutsuu annetun käyttäjätunnisteen mukaisen käyttäjän huoneeseen,,False,.Invites user with given id to current room,,\n,%(alias)s' is not a valid format for an address",
-    "%(displayName)s is typing": "%(displayName)s kirjoittaa’,,False,.%(displayName)s is typing,,\n,Sign in with,Kirjaudu käyttäen,,False,.Sign in with,,\n,Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.,Liitty käyttäen <voiceText>ääntä</voiceText> tai <videoText>videota</videoText>,,False,.Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.,,\n,Join Room,Liity huoneeseen,,False,.Join Room,,\n,joined and left,liittyi ja poistui,,False,.joined and left,,\n,joined,liittyi,,False,.joined,,\n,%(targetName)s joined the room.'",
-    "%(senderName)s made future room history visible to": "%(senderName)s teki tulevista viesteistä näkyviä’,,False,.%(senderName)s made future room history visible to,,\n,Manage Integrations,Hallinoi integraatioita,,False,.Manage Integrations,,\n,Markdown is disabled,Markdown on pois päältä,,False,.Markdown is disabled,,\n,Markdown is enabled,Mardown on päällä,,False,.Markdown is enabled,,\n,matrix-react-sdk version:,Matrix-react-sdk versio:,,False,.matrix-react-sdk version:,,\n,Matrix Apps,Matrix ohjelmat,,False,.Matrix Apps,,\n,Members only,Vain jäsenet,,False,.Members only,,\n,Message not sent due to unknown devices being present,Viestiä ei lähetetty koska paikalla on tuntemattomia laitteita,,False,.Message not sent due to unknown devices being present,,\n,Missing room_id in request,room_id puuttuu kyselystä,,False,.Missing room_id in request,,\n,Missing user_id in request,user_id puuttuu kyselystä,,False,.Missing user_id in request,,\n,Mobile phone number,Matkapuhelinnumero,,False,.Mobile phone number,,\n,Mobile phone number (optional),Matkapuhelinnumero (valinnainen),,False,.Mobile phone number (optional),,\n,Moderator,Moderaattori,,False,.Moderator,,\n,Must be viewing a room,Pakko olla huoneessa,,False,.Must be viewing a room,,\n,Mute,Vaimenna,,False,.Mute,,\n,my Matrix ID,minun Matrix tunniste,,False,.my Matrix ID,,\n,Name,Nimi,,False,.Name,,\n,Never send encrypted messages to unverified devices from this device,Älä koskaa lähetä salattuja viestejä varmentamattomiin laitteisiin tältä laitteelta,,False,.Never send encrypted messages to unverified devices from this device,,\n,Never send encrypted messages to unverified devices in this room,Älä koskaa lähetä salattuja viestejä varmentamattomiin laitteisiin tässä huoneessa,,False,.Never send encrypted messages to unverified devices in this room,,\n,Never send encrypted messages to unverified devices in this room from this device,Älä koskaa lähetä salattuja viestejä varmentamattomiin laitteisiin tässä huoneessa tältä laitteelta,,False,.Never send encrypted messages to unverified devices in this room from this device,,\n,New address (e.g. #foo:%(localDomain)s),Uusi osoite (esim. #foo:%(localDomain)s),,False,.New address (e.g. #foo:%(localDomain)s),,\n,New Composer & Autocomplete,,,False,.New Composer & Autocomplete,,\n,New password,Uusi salasana,,False,.New password,,\n,New passwords dont match",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s kutsui käyttäjän %(targetName)s.",
+    "%(displayName)s is typing": "%(displayName)s kirjoittaa",
+    "%(senderName)s made future room history visible to": "%(senderName)s teki tulevista viesteistä näkyviä",
     "none": "Ei mikään",
     "No devices with registered encryption keys": "Ei laitteita joilla rekisteröityjä salausavaimia",
     "No users have specific privileges in this room": "Kellään käyttäjällä ei ole erityisiä oikeuksia",
-    "%(senderName)s placed a %(callType)s call.": "%(senderName)s soitti %(callType)spuhelun’,,False,.%(senderName)s placed a %(callType)s call.,,\n,\"Please check your email and click on the link it contains. Once this is done, click continue.\",Ole hyvä ja tarkista sähköpostisi ja seuraa sen sisältämää linkkiä. Voit jatkaa tämän jälkeen.,,False,\".Please check your email and click on the link it contains. Once this is done, click continue.\",,\n,Please Register,Ole hyvä ja rekisteröidy,,False,.Please Register,,\n,Power level must be positive integer.,,,False,.Power level must be positive integer.,,\n,Press,,,False,.Press,,\n,Press <StartChatButton> to start a chat with someone,Paina <StartChatButton>,,False,.Press <StartChatButton> to start a chat with someone,,\n,Privacy warning,Yksityisyysvaroitus,,False,.Privacy warning,,\n,Private Chat,Yksityinen keskustelu,,False,.Private Chat,,\n,Privileged Users,,,False,.Privileged Users,,\n,Profile,Profiili,,False,.Profile,,\n,Public Chat,Julkinen keskustelu,,False,.Public Chat,,\n,Reason,Syy,,False,.Reason,,\n,Reason: %(reasonText)s,Syy: %(reasonText)s,,False,.Reason: %(reasonText)s,,\n,Revoke Moderator,Poista moderaattorioikeudet,,False,.Revoke Moderator,,\n,Revoke widget access,,,False,.Revoke widget access,,\n,Refer a friend to Riot:,Suosittele Riot ystävälle:,,False,.Refer a friend to Riot:,,\n,Register,Rekisteröi,,False,.Register,,\n,rejected,hylätty,,False,.rejected,,\n,%(targetName)s rejected the invitation.'",
+    "%(senderName)s placed a %(callType)s call.": "%(senderName)s soitti %(callType)spuhelun.",
     "Remove %(threePid)s?": "Poista %(threePid)s?",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s pyysi VoIP konferenssia.’,,False,.%(senderName)s requested a VoIP conference.,,\n,Report it,Ilmoita siitä,,False,.Report it,,\n,\"Resetting password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.\",,,False,\".Resetting password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.\",,\n,restore,palauta,,False,.restore,,\n,Results from DuckDuckGo,DuckDuckGo:n tulokset,,False,.Results from DuckDuckGo,,\n,Return to app,Palaa ohjelmaan,,False,.Return to app,,\n,Return to login screen,Palaa kirjautumissivulle,,False,.Return to login screen,,\n,Riot does not have permission to send you notifications - please check your browser settings,Riotilla ei ole oikeuksia lähettää sinulle ilmoituksia. Ole hyvä ja tarkista selaimen asetukset,,False,.Riot does not have permission to send you notifications - please check your browser settings,,\n,Riot was not given permission to send notifications - please try again,Riotilla ei saannut oikeuksia lähettää ilmoituksia. Ole hyvä ja yritä uudelleen,,False,.Riot was not given permission to send notifications - please try again,,\n,riot-web version:,Riot-web versio:,,False,.riot-web version:,,\n,Room %(roomId)s not visible,Huone %(roomId)s ei ole näkyvissä,,False,.Room %(roomId)s not visible,,\n,Room Colour,Huoneen väri,,False,.Room Colour,,\n,Room contains unknown devices,Huone sisältää tuntemattomia laitteita,,False,.Room contains unknown devices,,\n,Room name (optional),Huoneen nimi (valinnainen),,False,.Room name (optional),,\n,%(roomName)s does not exist.'",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s asetti näyttönimekseen %(displayName)s.’,,False,.%(senderName)s set their display name to %(displayName)s.,,\n,Set,Aseta,,False,.Set,,\n,Settings,Asetukset,,False,.Settings,,\n,Sets the room topic,Asettaa huoneen aiheen,,False,.Sets the room topic,,\n,Show Apps,,,False,.Show Apps,,\n,Show panel,Näytä paneeli,,False,.Show panel,,\n,Show Text Formatting Toolbar,Näytä tekstinmuotoilupalkki,,False,.Show Text Formatting Toolbar,,\n,Show timestamps in 12 hour format (e.g. 2:30pm),Näytä aikaleimat 12h muodossa (esim. 2:30pm),,False,.Show timestamps in 12 hour format (e.g. 2:30pm),,\n,Signed Out,Uloskirjautunut,,False,.Signed Out,,\n,Sign in,Kirjaudu sisään,,False,.Sign in,,\n,Sign out,Kirjaudu ulos,,False,.Sign out,,\n,since the point in time of selecting this option,tämän asetuksen valitsemisesta,,False,.since the point in time of selecting this option,,\n,since they joined,liittymisestä lähtien,,False,.since they joined,,\n,since they were invited,kutsusta lähtien,,False,.since they were invited,,\n,Some of your messages have not been sent.,Jotkut viesteistäsi ei ole lähetetty,,False,.Some of your messages have not been sent.,,\n,Someone,Joku,,False,.Someone,,\n,\"Sorry, this homeserver is using a login which is not recognised \",Valitettavasti tämä kotipalvelin käyttää sisäänkirjautumista jota ei tunnistettu,,False,\".Sorry, this homeserver is using a login which is not recognised \",,\n,Start a chat,Aloita keskustelu,,False,.Start a chat,,\n,Start authentication,Aloita tunnistus,,False,.Start authentication,,\n,Start Chat,Aloita keskustelu,,False,.Start Chat,,\n,Submit,Lähetä,,False,.Submit,,\n,Success,Onnistuminen,,False,.Success,,\n,tag as %(tagName)s,lisää tägi %(tagName)s,,False,.tag as %(tagName)s,,\n,tag direct chat,tägää suora viestittely,,False,.tag direct chat,,\n,Tagged as: ,Tägit:,,False,.Tagged as: ,,\n,The default role for new room members is,Huoneen uusien jäsenten oletusrooli on,,False,.The default role for new room members is,,\n,The main address for this room is,Tämän huoneen pääosoite on,,False,.The main address for this room is,,\n,The maximum permitted number of widgets have already been added to this room.,,,False,.The maximum permitted number of widgets have already been added to this room.,,\n,The phone number entered looks invalid,Syötetty puhelinnumero näyttää virheelliseltä,,False,.The phone number entered looks invalid,,\n,The signing key you provided matches the signing key you received from %(userId)ss device %(deviceId)s. Device marked as verified.",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s pyysi VoIP konferenssia.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s asetti näyttönimekseen %(displayName)s.",
     "This action cannot be performed by a guest user. Please register to be able to do this.": "Vierailija ei voi suorittaa tätä toimintoa. Ole hyvä ja rekisteröidy suorittaaksesi toiminnon.",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "Tiedosto ‘%(fileName)s’ ylittää tämän kotipalvelimen maksimitiedostokoon",
     "The file '%(fileName)s' failed to upload": "Tiedoston ‘%(fileName)s’ lataaminen epäonnistui",
     "This Home Server does not support login using email address.": "Kotipalvelin ei tue kirjatumista sähköpostiosoitteen avulla.",
     "This invitation was sent to an email address which is not associated with this account:": "Kutsu lähetettiin sähköpostiosoitteeseen jota ei ole liitetty tähän tiliin:",
-    "This room is not recognised.": "Huonetta ei tunnistettu",
+    "This room is not recognised.": "Huonetta ei tunnistettu.",
     "These are experimental features that may break in unexpected ways": "Nämä ovat kokeellisia ominaisuuksia jotka saattavat toimia ennakoimattomilla tavoilla",
     "This doesn't appear to be a valid email address": "Olemassa olevan historian näkyvyys ei muutu",
     "This is a preview of this room. Room interactions have been disabled": "Tämä on huoneen ennakokatselu. Vuorovaikutus ei ole mahdollista",
@@ -390,7 +390,7 @@
     "To link to a room it must have <a>an address</a>.": "Linkittääksesi tähän huoneseen sillä on oltava <a>osoite</a>.",
     "Turn Markdown off": "Ota Markdown pois käytöstä",
     "Turn Markdown on": "Ota Markdown käyttöön",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s otti päästä päähän-salauksen käyttöön (algoritmi %(algorithm)s).’,,False,.%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).,,\n,Unable to add email address,Sähköpostiosoitteen lisääminen epäonnistui,,False,.Unable to add email address,,\n,Unable to create widget.,,,False,.Unable to create widget.,,\n,Unable to remove contact information,Yhteystietojen poistaminen epäonnistui,,False,.Unable to remove contact information,,\n,Unable to restore previous session,Edellisen istunnon palauttaminen epäonnistui,,False,.Unable to restore previous session,,\n,Unable to verify email address.,Sähköpostin varmentaminen epäonnistui.,,False,.Unable to verify email address.,,\n,Unban,Poista porttikielto,,False,.Unban,,\n,Unbans user with given id,Poistaa porttikiellon annetun ID:n omaavalta käyttäjältä,,False,.Unbans user with given id,,\n,%(senderName)s unbanned %(targetName)s.'",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s otti päästä päähän-salauksen käyttöön (algoritmi %(algorithm)s).",
     "Username invalid: %(errMessage)s": "Virheellinen käyttäjänimi: %(errMessage)s",
     "Users": "Käyttäjät",
     "User": "Käyttäjä",
@@ -401,7 +401,7 @@
     "Video call": "Videopuhelu",
     "Voice call": "Äänipuhelu",
     "VoIP conference finished.": "VoIP konferenssi loppui.",
-    "VoIP conference started.": "VoIP konferenssi alkoi",
+    "VoIP conference started.": "VoIP konferenssi alkoi.",
     "VoIP is unsupported": "VoIP ei ole tuettu",
     "(no answer)": "(ei vastausta)",
     "(unknown failure: %(reason)s)": "(tuntematon virhe: %(reason)s)",
@@ -416,24 +416,24 @@
     "You are already in a call.": "Sinulla on jo puhelu käynnissä.",
     "You are not in this room.": "Sinä et ole tässä huoneessa.",
     "You do not have permission to do that in this room.": "Sinulla ei ole oikeutta tehdä tuota tässä huoneessa.",
-    "You are trying to access %(roomName)s.": "Yrität liittyä huoneeseen %(roomName)s",
+    "You are trying to access %(roomName)s.": "Yrität liittyä huoneeseen %(roomName)s.",
     "You cannot place a call with yourself.": "Et voi soittaa itsellesi.",
     "You cannot place VoIP calls in this browser.": "Et voi soittaa VoIP puheluita tällä selaimella.",
     "You do not have permission to post to this room": "Sinulla ei ole oikeutta kirjoittaa tässä huoneessa",
-    "You have been banned from %(roomName)s by %(userName)s.": "Käyttäjä %(userName)s on antanut sinulle porttikiellon huoneeseen %(roomName)s",
-    "You have been invited to join this room by %(inviterName)s": "Käyttäjä %(userName)s on kutsunut sinut tähän huoneeseen",
+    "You have been banned from %(roomName)s by %(userName)s.": "Käyttäjä %(userName)s on antanut sinulle porttikiellon huoneeseen %(roomName)s.",
+    "You have been invited to join this room by %(inviterName)s": "Käyttäjä %(inviterName)s on kutsunut sinut tähän huoneeseen",
     "You have been kicked from %(roomName)s by %(userName)s.": "Käyttäjä %(userName)s on poistanut sinut huoneesta %(roomName)s.",
     "You have <a>disabled</a> URL previews by default.": "Olet oletusarvoisesti ottanut URL esikatselut <a>pois käytöstä</a>.",
     "You have <a>enabled</a> URL previews by default.": "Olet oletusarvoisesti ottanut URL esikatselut <a>käyttöön</a>.",
     "You have entered an invalid contact. Try using their Matrix ID or email address.": "Olet syöttänyt virheellisen kontaktin. Yritä käyttää heidän Matrixtunnistetta tai sähköpostiosoitetta.",
-    "You have no visible notifications": "Sinulla ei ole näkyviä ilmoituksia.",
+    "You have no visible notifications": "Sinulla ei ole näkyviä ilmoituksia",
     "You must <a>register</a> to use this functionality": "Sinun pitää <a>rekisteröityä</a> käyttääksesi tätä toiminnallisuutta",
     "You need to be able to invite users to do that.": "Sinun pitää pystyä kutsua käyttäjiä voidaksesi tehdä tuon.",
     "You need to be logged in.": "Sinun pitää olla kirjautunut.",
     "You need to enter a user name.": "Sinun pitää syöttää käyttäjänimi.",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Sinun sähköpostiosoitteesi ei vaikuta olevan liitetty mihinkään Matrixtunnisteeseen tällä kotipalvelimella.",
     "Your password has been reset": "Salasanasi on palautettu",
-    "You should not yet trust it to secure data": "Sinun ei vielä kannata luottaa siihen turvataksesi dataa.",
+    "You should not yet trust it to secure data": "Sinun ei vielä kannata luottaa siihen turvataksesi dataa",
     "Your home server does not support device management.": "Kotipalvelimesi ei tue laitteiden hallintaa.",
     "Sun": "Su",
     "Mon": "Ma",
@@ -443,7 +443,7 @@
     "Fri": "Pe",
     "Sat": "La",
     "Set a display name:": "Aseta näyttönimi:",
-    "Set a Display Name": "Aseta näyttönimi:",
+    "Set a Display Name": "Aseta näyttönimi",
     "This server does not support authentication with a phone number.": "Tämä palvelin ei tue autentikointia puhelinnumeron avulla.",
     "Missing password.": "Salasana puuttuu.",
     "Passwords don't match.": "Salasanat eivät täsmää.",
@@ -477,8 +477,8 @@
     "quote": "sitaatti",
     "bullet": "lista",
     "numbullet": "numeroitu lista",
-    "%(severalUsers)sjoined %(repeats)s times": "%(severalUsers)sliittyivät %(repeats)s kertaa’,,False,.%(severalUsers)sjoined %(repeats)s times,,\n,%(oneUser)sjoined %(repeats)s times'",
-    "%(oneUser)srejected their invitation %(repeats)s times": "%(oneUser)shylkäsi kutsunsa %(repeats)s kertaa’,,False,.%(oneUser)srejected their invitation %(repeats)s times,,\n,%(severalUsers)srejected their invitations'",
+    "%(severalUsers)sjoined %(repeats)s times": "%(severalUsers)sliittyivät %(repeats)s kertaa",
+    "%(oneUser)srejected their invitation %(repeats)s times": "%(oneUser)shylkäsi kutsunsa %(repeats)s kertaa",
     "Please select the destination room for this message": "Ole hyvä ja valitse vastaanottava huone tälle viestille",
     "New Password": "Uusi salasana",
     "Start automatically after system login": "Käynnistä automaattisesti käyttöjärjestelmään kirjautumisen jälkeen",
@@ -486,7 +486,7 @@
     "Analytics": "Analytiikka",
     "Opt out of analytics": "Ota analytiikka pois käytöstä",
     "Options": "Valinnat",
-    "Riot collects anonymous analytics to allow us to improve the application.": "Riot kerää anonyymisti tilastoja jotta voimme parantaa ohjelmistoa",
+    "Riot collects anonymous analytics to allow us to improve the application.": "Riot kerää anonyymisti tilastoja jotta voimme parantaa ohjelmistoa.",
     "Passphrases must match": "Salasanojen on täsmättävä",
     "Passphrase must not be empty": "Salasana ei saa olla tyhjä",
     "Export room keys": "Vie huoneen avaimet",
@@ -509,7 +509,7 @@
     "Device key": "Laiteavain",
     "In future this verification process will be more sophisticated.": "Tulevaisuudessa tämä varmennusprosessi tulee olemaan hienostuneempi.",
     "Verify device": "Varmenna laite",
-    "I verify that the keys match": "Totean että avaimet vastaavat toisiaan.",
+    "I verify that the keys match": "Totean että avaimet vastaavat toisiaan",
     "Unable to restore session": "Istunnon palautus epäonnistui",
     "Continue anyway": "Jatka kuitenkin"
 }

From 35cdea44bdfe73479f7b1a66959e6d78ab3e7ed7 Mon Sep 17 00:00:00 2001
From: Max Sandholm <max@sandholm.org>
Date: Mon, 18 Sep 2017 08:01:03 +0000
Subject: [PATCH 012/123] Translated using Weblate (Swedish)

Currently translated at 52.6% (450 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
---
 src/i18n/strings/sv.json | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 298c0c4d86..c684f4c5ab 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -430,5 +430,28 @@
     "Enable automatic language detection for syntax highlighting": "Aktivera automatisk språkdetektering för syntaxmarkering",
     "Hide Apps": "Dölj Appar",
     "Hide avatar and display name changes": "Dölj avatar och visningsnamns ändringar",
-    "Integrations Error": "Integrationsfel"
+    "Integrations Error": "Integrationsfel",
+    "Publish this room to the public in %(domain)s's room directory?": "Publicera rummet i den offentliga rumskatalogen på %(domain)s?",
+    "Matrix Apps": "Matrix-appar",
+    "AM": "a.m.",
+    "PM": "p.m.",
+    "NOTE: Apps are not end-to-end encrypted": "OBS: Apparna är inte end-to-end-krypterade",
+    "Revoke widget access": "Upphäv widget-åtkomst",
+    "Show Apps": "Visa appar",
+    "Submit": "Lämna",
+    "tag as %(tagName)s": "tagga som %(tagName)s",
+    "tag direct chat": "tagga som direkt-chatt",
+    "Tagged as: ": "Taggad som: ",
+    "The default role for new room members is": "Standardrollen för nya medlemmar är",
+    "The main address for this room is": "Huvudadressen för det här rummet är",
+    "The maximum permitted number of widgets have already been added to this room.": "Den största tillåtna mängden widgetar har redan tillsats till rummet.",
+    "The phone number entered looks invalid": "Telefonnumret ser felaktigt ut",
+    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Signeringsnyckeln du angav matchar signeringsnyckeln som mottogs från enheten %(deviceId)s som tillhör %(userId)s. Enheten är markerad som verifierad.",
+    "This action cannot be performed by a guest user. Please register to be able to do this.": "Den här handlingen kan inte utföras av en gästanvändare. Registrera dig för att kunna göra det här.",
+    "This email address is already in use": "Den här epostadressen är redan i bruk",
+    "This email address was not found": "Den här epostadressen fanns inte",
+    "%(actionVerb)s this person?": "%(actionVerb)s den här personen?",
+    "The email address linked to your account must be entered.": "Epostadressen som är kopplad till ditt konto måste anges.",
+    "The file '%(fileName)s' exceeds this home server's size limit for uploads": "Filen '%(fileName)s' överskrider serverns största tillåtna filstorlek",
+    "The file '%(fileName)s' failed to upload": "Filen '%(fileName)s' kunde inte laddas upp"
 }

From 0c8a31d9e9cbaf3817b345aa4e2a476f42bf92c9 Mon Sep 17 00:00:00 2001
From: Stefan Parviainen <pafcu@iki.fi>
Date: Mon, 18 Sep 2017 18:27:44 +0000
Subject: [PATCH 013/123] Translated using Weblate (Finnish)

Currently translated at 73.2% (626 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
---
 src/i18n/strings/fi.json | 117 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 116 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index 204d02a106..3da1fef551 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -511,5 +511,120 @@
     "Verify device": "Varmenna laite",
     "I verify that the keys match": "Totean että avaimet vastaavat toisiaan",
     "Unable to restore session": "Istunnon palautus epäonnistui",
-    "Continue anyway": "Jatka kuitenkin"
+    "Continue anyway": "Jatka kuitenkin",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s poisti huoneen nimen.",
+    "Changes to who can read history will only apply to future messages in this room": "Muutokset koskien ketkä voivat lukea historian koskevat vain uusia viestejä",
+    "<a>Click here</a> to join the discussion!": "<a>Paina tästä</a> liittyäksesi keskusteluun",
+    "%(count)s new messages|one": "%(count)s uusi viesti",
+    "%(count)s new messages|other": "%(count)s uutta viestiä",
+    "Curve25519 identity key": "Curve25519 tunnistusavain",
+    "Decrypt %(text)s": "Pura %(text)s",
+    "Devices will not yet be able to decrypt history from before they joined the room": "Laitteet eivät vielä pysty purkamaan viestejä ajalta ennen kun ne liittyivät huoneseen",
+    "Disable inline URL previews by default": "Ota oletusarvoisesti pois käytöstä URL esikatselut",
+    "Displays action": "Näyttää toiminnan",
+    "Don't send typing notifications": "Älä lähetä kirjoitusilmoituksia",
+    "End-to-end encryption is in beta and may not be reliable": "Päästä päähän salaus on vielä testausvaiheessa ja saattaa toimia epävarmasti",
+    "Error: Problem communicating with the given homeserver.": "Virhe: Ongelma yhteydenpidossa kotipalvelimeen",
+    "Existing Call": "Käynnissä oleva puhelu",
+    "Failed to lookup current room": "Nykyisen huoneen löytäminen epäonnistui",
+    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Liitty käyttäen <voiceText>ääntä</voiceText> tai <videoText>videota</videoText>",
+    "%(targetName)s joined the room.": "%(targetName)s liittyi huoneeseen.",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s poisti käyttäjän %(targetName)s huoneesta.",
+    "%(targetName)s left the room.": "%(targetName)s poistui huoneesta.",
+    "Publish this room to the public in %(domain)s's room directory?": "Julkaise tämä huone domainin %(domain)s huoneluettelossa?",
+    "Missing room_id in request": "room_id puuttuu kyselystä",
+    "Missing user_id in request": "user_id puuttuu kyselystä",
+    "Must be viewing a room": "Pakko olla huoneessa",
+    "Never send encrypted messages to unverified devices from this device": "Älä koskaa lähetä salattuja viestejä varmentamattomiin laitteisiin tältä laitteelta",
+    "Never send encrypted messages to unverified devices in this room": "Älä koskaa lähetä salattuja viestejä varmentamattomiin laitteisiin tässä huoneessa",
+    "Never send encrypted messages to unverified devices in this room from this device": "Älä koskaa lähetä salattuja viestejä varmentamattomiin laitteisiin tässä huoneessa tältä laitteelta",
+    "New address (e.g. #foo:%(localDomain)s)": "Uusi osoite (esim. #foo:%(localDomain)s)",
+    "Press <StartChatButton> to start a chat with someone": "Paina <StartChatButton>",
+    "Revoke Moderator": "Poista moderaattorioikeudet",
+    "Refer a friend to Riot:": "Suosittele Riot ystävälle:",
+    "%(targetName)s rejected the invitation.": "%(targetName)s hylkäsi kutsun.",
+    "Remote addresses for this room:": "Tämän huoneen etäosoitteet:",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s poisti näyttönimensä (%(oldDisplayName)s).",
+    "Report it": "Ilmoita siitä",
+    "restore": "palauta",
+    "Return to app": "Palaa ohjelmaan",
+    "Riot does not have permission to send you notifications - please check your browser settings": "Riotilla ei ole oikeuksia lähettää sinulle ilmoituksia. Ole hyvä ja tarkista selaimen asetukset",
+    "Riot was not given permission to send notifications - please try again": "Riotilla ei saannut oikeuksia lähettää ilmoituksia. Ole hyvä ja yritä uudelleen",
+    "Room %(roomId)s not visible": "Huone %(roomId)s ei ole näkyvissä",
+    "%(roomName)s does not exist.": "%(roomName)s ei ole olemassa.",
+    "%(roomName)s is not accessible at this time.": "%(roomName)s ei ole saatavilla tällä hetkellä.",
+    "Seen by %(userName)s at %(dateTime)s": "Käyttäjän %(userName)s näkemä %(dateTime)s",
+    "Send Reset Email": "Lähetä salasanan palautusviesti",
+    "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s lähetti kuvan.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s lähetti kutsun käyttäjälle %(targetDisplayName)s liittyäkseen huoneeseen.",
+    "Server may be unavailable or overloaded": "Palvelin saattaa olla saavuttamattomissa tai ylikuormitettu",
+    "Show Text Formatting Toolbar": "Näytä tekstinmuotoilupalkki",
+    "Show timestamps in 12 hour format (e.g. 2:30pm)": "Näytä aikaleimat 12h muodossa (esim. 2:30pm)",
+    "Signed Out": "Uloskirjautunut",
+    "since the point in time of selecting this option": "tämän asetuksen valitsemisesta",
+    "Start authentication": "Aloita tunnistus",
+    "Success": "Onnistuminen",
+    "tag as %(tagName)s": "lisää tägi %(tagName)s",
+    "tag direct chat": "tägää suora viestittely",
+    "Tagged as: ": "Tägit:",
+    "The default role for new room members is": "Huoneen uusien jäsenten oletusrooli on",
+    "The main address for this room is": "Tämän huoneen pääosoite on",
+    "The phone number entered looks invalid": "Syötetty puhelinnumero näyttää virheelliseltä",
+    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Syöttämäsi allekirjoitusavain vastaa käyttäjältä %(userId)s saamaasi allekirjoitusavainta. Laite on merkitty varmennetuksi.'",
+    "Unable to add email address": "Sähköpostiosoitteen lisääminen epäonnistui",
+    "Unable to remove contact information": "Yhteystietojen poistaminen epäonnistui",
+    "Unable to restore previous session": "Edellisen istunnon palauttaminen epäonnistui",
+    "Unable to verify email address.": "Sähköpostin varmentaminen epäonnistui.",
+    "Unbans user with given id": "Poistaa porttikiellon annetun ID:n omaavalta käyttäjältä",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s poisti porttikiellon käyttäjältä %(targetName)s.",
+    "Unable to capture screen": "Ruudun kaappaus epäonnistui",
+    "Unable to enable Notifications": "Ilmoitusten käyttöönotto epäonnistui",
+    "Unable to load device list": "Laitelistan lataaminen epäonnistui",
+    "Uploading %(filename)s and %(count)s others|other": "Ladataan %(filename)s ja %(count)s muuta",
+    "uploaded a file": "lattaa tiedosto",
+    "Upload Failed": "Lataus epäonnistui",
+    "Upload Files": "Lataa tiedostoja",
+    "Upload file": "Lataa tiedosto",
+    "Upload new:": "Lataa uusi:",
+    "Usage": "Käyttö",
+    "Use compact timeline layout": "Käytä kompaktia aikajanaa",
+    "Use with caution": "Käytä varoen",
+    "User ID": "Käyttäjätunniste",
+    "User Interface": "Käyttöliittymä",
+    "%(user)s is a": "%(user)s on",
+    "User name": "Käyttäjänimi",
+    "%(oneUser)sjoined %(repeats)s times": "%(oneUser)sliittyi %(repeat)s kertaa",
+    "%(severalUsers)sjoined": "%(severalUsers)sliittyivät",
+    "%(oneUser)sjoined": "%(oneUser)sliittyi",
+    "%(severalUsers)sleft %(repeats)s times": "%(severalUsers)spoistuivat %(repeat)s kertaa",
+    "%(oneUser)sleft %(repeats)s times": "%(oneUser)spoistui %(repeat)s kertaa",
+    "%(severalUsers)sleft": "%(severalUsers)sspoistuivat",
+    "%(oneUser)sleft": "%(oneUser)spoistui",
+    "%(severalUsers)sjoined and left %(repeats)s times": "%(severalUsers)sliittyivät ja poistuivat %(repeats)s kertaa",
+    "%(oneUser)sjoined and left %(repeats)s times": "%(oneUser)sliittyi ja poistui %(repeat)s kertaa",
+    "%(severalUsers)sjoined and left": "%(severalUsers)sliittyivät ja poistuivat",
+    "%(oneUser)sjoined and left": "%(oneUser)sliittyi ja poistui",
+    "%(severalUsers)sleft and rejoined %(repeats)s times": "%(oneUser)spoistui ja liittyi uudelleen %(repeats)s kertaa",
+    "%(oneUser)sleft and rejoined %(repeats)s times": "%(severalUsers)spoistuivat ja liittyivät uudelleen %(repeats)s kertaa",
+    "%(severalUsers)sleft and rejoined": "%(severalUsers)spoistuivat ja liittyivät uudelleen",
+    "%(oneUser)sleft and rejoined": "%(oneUser)spoistui ja liittyi uudelleen",
+    "%(severalUsers)srejected their invitations %(repeats)s times": "%(severalUsers)shylkäsivät kutsunsa %(repeats)s kertaa'",
+    "%(severalUsers)srejected their invitations": "%(severalUsers)hylkäsivät kutsunsa",
+    "%(oneUser)srejected their invitation": "%(oneUser)shylkäsi kutsunsa",
+    "%(severalUsers)shad their invitations withdrawn %(repeats)s times": "%(severalUsers)skutsut vedettiin takaisin %(repeats)s kertaa",
+    "%(oneUser)shad their invitation withdrawn %(repeats)s times": "%(oneUser)skutsu vedettiin takaisin %(repeats)s kertaa",
+    "%(severalUsers)shad their invitations withdrawn": "%(severalUsers)skutsut vedettiin takaisin",
+    "%(oneUser)shad their invitation withdrawn": "%(oneUser)skutsu vedettiin takaisin",
+    "were invited %(repeats)s times": "kutsuttiin %(repeats)s kertaa",
+    "was invited %(repeats)s times": "kutsuttiin %(repeats)s kertaa",
+    "were invited": "kutsuttiin",
+    "was invited": "kutsuttiin",
+    "were kicked %(repeats)s times": "poistettiin huoneesta %(repeats)s kertaa",
+    "was kicked %(repeats)s times": "poistettiin huoneesta %(repeats)s kertaa",
+    "were kicked": "poistettiin huoneesta",
+    "was kicked": "poistettiin huoneesta",
+    "%(severalUsers)schanged their name %(repeats)s times": "%(severalUsers)smuuttivat nimensä %(repeats)s kertaa",
+    "%(oneUser)schanged their name %(repeats)s times": "%(oneUser)smuutti nimensä %(repeats)s kertaa",
+    "%(severalUsers)schanged their name": "%(severalUsers)smuuttivat nimensä",
+    "%(oneUser)schanged their name": "%(oneUser)smuutti nimensä"
 }

From 3e7e7987ba4d60ab8f950364427f819048d2544e Mon Sep 17 00:00:00 2001
From: Stefan Parviainen <pafcu@iki.fi>
Date: Tue, 19 Sep 2017 07:31:51 +0000
Subject: [PATCH 014/123] Translated using Weblate (Finnish)

Currently translated at 88.1% (754 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
---
 src/i18n/strings/fi.json | 152 +++++++++++++++++++++++++++++++++++----
 1 file changed, 140 insertions(+), 12 deletions(-)

diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index 3da1fef551..072a634b08 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -524,10 +524,10 @@
     "Displays action": "Näyttää toiminnan",
     "Don't send typing notifications": "Älä lähetä kirjoitusilmoituksia",
     "End-to-end encryption is in beta and may not be reliable": "Päästä päähän salaus on vielä testausvaiheessa ja saattaa toimia epävarmasti",
-    "Error: Problem communicating with the given homeserver.": "Virhe: Ongelma yhteydenpidossa kotipalvelimeen",
+    "Error: Problem communicating with the given homeserver.": "Virhe: Ongelma yhteydenpidossa kotipalvelimeen.",
     "Existing Call": "Käynnissä oleva puhelu",
     "Failed to lookup current room": "Nykyisen huoneen löytäminen epäonnistui",
-    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Liitty käyttäen <voiceText>ääntä</voiceText> tai <videoText>videota</videoText>",
+    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Liity käyttäen <voiceText>ääntä</voiceText> tai <videoText>videota</videoText>.",
     "%(targetName)s joined the room.": "%(targetName)s liittyi huoneeseen.",
     "%(senderName)s kicked %(targetName)s.": "%(senderName)s poisti käyttäjän %(targetName)s huoneesta.",
     "%(targetName)s left the room.": "%(targetName)s poistui huoneesta.",
@@ -566,11 +566,11 @@
     "Success": "Onnistuminen",
     "tag as %(tagName)s": "lisää tägi %(tagName)s",
     "tag direct chat": "tägää suora viestittely",
-    "Tagged as: ": "Tägit:",
+    "Tagged as: ": "Tägit: ",
     "The default role for new room members is": "Huoneen uusien jäsenten oletusrooli on",
     "The main address for this room is": "Tämän huoneen pääosoite on",
     "The phone number entered looks invalid": "Syötetty puhelinnumero näyttää virheelliseltä",
-    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Syöttämäsi allekirjoitusavain vastaa käyttäjältä %(userId)s saamaasi allekirjoitusavainta. Laite on merkitty varmennetuksi.'",
+    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Syöttämäsi allekirjoitusavain vastaa käyttäjän %(userId)s laitteelta %(deviceId)s saamaasi allekirjoitusavainta. Laite on merkitty varmennetuksi.",
     "Unable to add email address": "Sähköpostiosoitteen lisääminen epäonnistui",
     "Unable to remove contact information": "Yhteystietojen poistaminen epäonnistui",
     "Unable to restore previous session": "Edellisen istunnon palauttaminen epäonnistui",
@@ -593,23 +593,23 @@
     "User Interface": "Käyttöliittymä",
     "%(user)s is a": "%(user)s on",
     "User name": "Käyttäjänimi",
-    "%(oneUser)sjoined %(repeats)s times": "%(oneUser)sliittyi %(repeat)s kertaa",
+    "%(oneUser)sjoined %(repeats)s times": "%(oneUser)sliittyi %(repeats)s kertaa",
     "%(severalUsers)sjoined": "%(severalUsers)sliittyivät",
     "%(oneUser)sjoined": "%(oneUser)sliittyi",
-    "%(severalUsers)sleft %(repeats)s times": "%(severalUsers)spoistuivat %(repeat)s kertaa",
-    "%(oneUser)sleft %(repeats)s times": "%(oneUser)spoistui %(repeat)s kertaa",
+    "%(severalUsers)sleft %(repeats)s times": "%(severalUsers)spoistuivat %(repeats)s kertaa",
+    "%(oneUser)sleft %(repeats)s times": "%(oneUser)spoistui %(repeats)s kertaa",
     "%(severalUsers)sleft": "%(severalUsers)sspoistuivat",
     "%(oneUser)sleft": "%(oneUser)spoistui",
     "%(severalUsers)sjoined and left %(repeats)s times": "%(severalUsers)sliittyivät ja poistuivat %(repeats)s kertaa",
-    "%(oneUser)sjoined and left %(repeats)s times": "%(oneUser)sliittyi ja poistui %(repeat)s kertaa",
+    "%(oneUser)sjoined and left %(repeats)s times": "%(oneUser)sliittyi ja poistui %(repeats)s kertaa",
     "%(severalUsers)sjoined and left": "%(severalUsers)sliittyivät ja poistuivat",
     "%(oneUser)sjoined and left": "%(oneUser)sliittyi ja poistui",
-    "%(severalUsers)sleft and rejoined %(repeats)s times": "%(oneUser)spoistui ja liittyi uudelleen %(repeats)s kertaa",
-    "%(oneUser)sleft and rejoined %(repeats)s times": "%(severalUsers)spoistuivat ja liittyivät uudelleen %(repeats)s kertaa",
+    "%(severalUsers)sleft and rejoined %(repeats)s times": "%(severalUsers)spoistuivat ja liittyivät uudelleen %(repeats)s kertaa",
+    "%(oneUser)sleft and rejoined %(repeats)s times": "%(oneUser)spoistui ja liittyi uudelleen %(repeats)s kertaa",
     "%(severalUsers)sleft and rejoined": "%(severalUsers)spoistuivat ja liittyivät uudelleen",
     "%(oneUser)sleft and rejoined": "%(oneUser)spoistui ja liittyi uudelleen",
     "%(severalUsers)srejected their invitations %(repeats)s times": "%(severalUsers)shylkäsivät kutsunsa %(repeats)s kertaa'",
-    "%(severalUsers)srejected their invitations": "%(severalUsers)hylkäsivät kutsunsa",
+    "%(severalUsers)srejected their invitations": "%(severalUsers)shylkäsivät kutsunsa",
     "%(oneUser)srejected their invitation": "%(oneUser)shylkäsi kutsunsa",
     "%(severalUsers)shad their invitations withdrawn %(repeats)s times": "%(severalUsers)skutsut vedettiin takaisin %(repeats)s kertaa",
     "%(oneUser)shad their invitation withdrawn %(repeats)s times": "%(oneUser)skutsu vedettiin takaisin %(repeats)s kertaa",
@@ -626,5 +626,133 @@
     "%(severalUsers)schanged their name %(repeats)s times": "%(severalUsers)smuuttivat nimensä %(repeats)s kertaa",
     "%(oneUser)schanged their name %(repeats)s times": "%(oneUser)smuutti nimensä %(repeats)s kertaa",
     "%(severalUsers)schanged their name": "%(severalUsers)smuuttivat nimensä",
-    "%(oneUser)schanged their name": "%(oneUser)smuutti nimensä"
+    "%(oneUser)schanged their name": "%(oneUser)smuutti nimensä",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s asetti aiheeksi \"%(topic)s\".",
+    "Changing password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Salasanan muuttaminen uudelleenalustaa myös päästä päähän-salausavaimet kaikilla laitteilla, jolloin vanhojen viestien lukeminen ei ole enään mahdollista, ellet ensin vie huoneavaimet ja tuo ne takaisin jälkeenpäin. Tämä tulee muuttumaan tulevaisuudessa.",
+    "Define the power level of a user": "Määritä käyttäjän oikeustaso",
+    "Failed to change power level": "Oikeustason muuttaminen epäonnistui",
+    "'%(alias)s' is not a valid format for an address": "'%(alias)s' ei ole oikean muotoinen osoitteelle",
+    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' ei ole oikean muotoinen aliakselle",
+    "Once you've followed the link it contains, click below": "Klikkaa alla kun olet seuruannut sen sisältämää linkkiä",
+    "Otherwise, <a>click here</a> to send a bug report.": "Paina muutoin <a>tästä</a> lähettääksesi virheraportin.",
+    "Please check your email and click on the link it contains. Once this is done, click continue.": "Ole hyvä ja tarkista sähköpostisi ja seuraa sen sisältämää linkkiä. Kun olet valmis, paina jatka.",
+    "Power level must be positive integer.": "Oikeustason pitää olla positiivinen kokonaisluku.",
+    "Press": "Paina",
+    "Resetting password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Salasanan uudelleenalustus uudelleenalustaa myös päästä päähän-salausavaimet kaikilla laitteilla, jolloin vanhojen viestien lukeminen ei ole enään mahdollista, ellet ensin vie huoneavaimet ja tuo ne takaisin jälkeenpäin. Tämä tulee muuttumaan tulevaisuudessa.",
+    "Server may be unavailable, overloaded, or search timed out :(": "Palvelin saattaa olla saavuttamattomissa, ylikuormitettu tai haku kesti liian kauan :(",
+    "Server may be unavailable, overloaded, or the file too big": "Palvelin saattaa olla saavuttamattomissa, ylikuormitettu, tai tiedosto on liian suuri",
+    "Server may be unavailable, overloaded, or you hit a bug.": "Palvelin saattaa olla saavuttamattomissa, ylikuormitettu tai olet törmännyt virheeseen.",
+    "Server unavailable, overloaded, or something else went wrong.": "Palvelin on saavuttamattomissa, ylikuormitettu tai jokin muu meni vikaan.",
+    "Sorry, this homeserver is using a login which is not recognised ": "Valitettavasti tämä palvelin käyttää kirjautumista joka ei ole tuettu ",
+    "The email address linked to your account must be entered.": "Sinun pitää syöttää tiliisi liitetty sähköpostiosoite.",
+    "The visibility of existing history will be unchanged": "Olemassaolevan viestihistorian näkyvyys ei muutu",
+    "To get started, please pick a username!": "Valitse käyttäjänimi aloittaaksesi!",
+    "To use it, just wait for autocomplete results to load and tab through them.": "Käyttääksesi sitä odota vain automaattitäydennyksiä ja selaa niiden läpi.",
+    "To reset your password, enter the email address linked to your account": "Syötä tiliisi liitetty sähköpostiosoite uudelleenalustaaksesi salasanasi",
+    "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Aikajanan tietty hetki yritettiin ladata, mutta sinulla ei ole oikeutta nähdä kyseistä viestiä.",
+    "Tried to load a specific point in this room's timeline, but was unable to find it.": "Aikajanan tietty hetki yritettiin ladata, mutta se ei löytynyt.",
+    "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "Ei ole mahdollista varmistaa että sähköposti johon tämä kutsu lähetettiin vastaa sinun tiliisi liittettyä osoitetta.",
+    "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (oikeustaso %(powerLevelNumber)s)",
+    "Verification Pending": "Varmennus on vireillä",
+    "(could not connect media)": "(mediaa ei voitu yhdistää)",
+    "WARNING: Device already verified, but keys do NOT MATCH!": "VAROITUS: Laite on jo varmennettu mutta avaimet eivät vastaa toisiaan!",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "VAROITUS: AVAIMEN VARMENNUS EPÄONNISTUI! Käyttäjän %(userId)s ja laitteen %(deviceId)s allekirjoitusavain on \"%(fprint)s\" joka ei vastaa annettua avainta \"%(fingerprint)s\". Tämä saattaa tarkoittaa että viestintäsi siepataan!",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s veti takaisin käyttäjän %(targetName)s kutsun.",
+    "You're not in any rooms yet! Press <CreateRoomButton> to make a room or <RoomDirectoryButton> to browse the directory": "Et ole vielä missään huoneessa! Paina <CreateRoomButton> luodaksesi huoneen tai <RoomDirectoryButton> selatakseski hakemistoa",
+    "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device": "Sinut on kirjattu ulos kaikista laitteista etkä enää saa Push-ilmoituksia. Jotta saisit jälleen ilmoituksia pitää sinun jälleen kirjautua sisään jokaisella laitteella",
+    "You may wish to login with a different account, or add this email to this account.": "Haluat ehkä kirjautua toiseen tiliin tai lisätä tämä sähköpostiosoite tähän tiliin.",
+    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Salasanan muuttaminen onnistui. Et saa enää push-ilmoituksia muilla laitteilla kunnes olet uudelleen kirjautunut sisään niillä",
+    "You seem to be in a call, are you sure you want to quit?": "Sinulla näyttää olevan puhelu kesken. Haluatko varmasti lopettaa?",
+    "You seem to be uploading files, are you sure you want to quit?": "Näytät lataavan tiedostoja. Oletko varma että haluat lopettaa?",
+    "Jan": "tammikuu",
+    "Feb": "helmikuu",
+    "Mar": "maaliskuu",
+    "Apr": "huhtikuu",
+    "May": "toukokuu",
+    "Jun": "kesäkuu",
+    "Jul": "heinäkuu",
+    "Aug": "elokuu",
+    "Sep": "syyskuu",
+    "Oct": "lokakuu",
+    "Nov": "marraskuu",
+    "Dec": "jolukuu",
+    "User names may only contain letters, numbers, dots, hyphens and underscores.": "Käyttäjänimet voivat sisältää vain kirjaimia, numeroita, pisteitä, viivoja ja alaviivoja.",
+    "To continue, please enter your password.": "Ole hyvä ja syötä salasanasi jatkaaksesi.",
+    "Verifies a user, device, and pubkey tuple": "Varmentaa käyttäjän, laitteen ja julkisen avaimen kolmikon",
+    "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" sisältä laitteita joita et ole nähnyt aikaisemmin.",
+    "Unknown devices": "Tuntemattomia laitteita",
+    "Unknown Address": "Tuntematon osoite",
+    "Unverify": "Kumoa varmennus",
+    "Verify...": "Varmenna...",
+    "ex. @bob:example.com": "esim. @bob:example.com",
+    "Add User": "Lisää käyttäjä",
+    "This Home Server would like to make sure you are not a robot": "Tämä kotipalvelin haluaa varmistaa että et ole robotti",
+    "A text message has been sent to": "Tekstiviesti on lähetetty numeroon",
+    "Please enter the code it contains:": "Ole hyvä ja syötä sen sisältämä koodi:",
+    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Jos et syötä sähköpostiosoitetta et voi uudelleenalustaa salasanasi myöhemmin. Oletko varma?",
+    "Default server": "Oletuspalvelin",
+    "Home server URL": "Kotipalvelimen URL",
+    "Identity server URL": "Identiteettipalvelimen URL",
+    "What does this mean?": "Mitä tämä tarkoittaa?",
+    "Error decrypting audio": "Äänen salauksen purku epäonnistui",
+    "Error decrypting image": "Kuvan salauksen purku epäonnistui",
+    "Image '%(Body)s' cannot be displayed.": "Kuva '%(Body)s' ei voida näyttää.",
+    "This image cannot be displayed.": "Tätä kuvaa ei voida näyttää.",
+    "Error decrypting video": "Videon salauksen purku epäonnistui",
+    "Add an Integration": "Lisää integraatio",
+    "Removed or unknown message type": "Poistettu tai tuntematon viestityyppi",
+    "URL Previews": "URL esikatselut",
+    "Drop file here to upload": "Pudota tiedosto tähän ladataksesi sen palvelimelle",
+    " (unsupported)": " (ei tuettu)",
+    "Updates": "Päivitykset",
+    "Check for update": "Tarkista päivitykset",
+    "Start chatting": "Aloita keskustelu",
+    "Start Chatting": "Aloita keskustelu",
+    "Click on the button below to start chatting!": "Paina nappia alla aloittaaksesi keskustelu!",
+    "Username available": "Käyttäjänimi saatavissa",
+    "Username not available": "Käyttäjänimi ei ole saatavissa",
+    "Something went wrong!": "Jokin meni vikaan!",
+    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Tämä on tilisi <span></span> -kotipalvelimella, tai voit valita <a>toisen palvelimen</a>.",
+    "If you already have a Matrix account you can <a>log in</a> instead.": "Jos sinulla on jo Matrix-tili voit <a>kirjautua</a>.",
+    "Your browser does not support the required cryptography extensions": "Selaimesi ei tue vaadittuja kryptografisia laajennuksia",
+    "Not a valid Riot keyfile": "Virheellinen Riot avaintiedosto",
+    "Authentication check failed: incorrect password?": "Autentikointi epäonnistui: virheellinen salasana?",
+    "Do you want to set an email address?": "Haluatko asettaa sähköpostiosoitteen?",
+    "This will allow you to reset your password and receive notifications.": "Tämä sallii sinun uudelleenalustaa salasanasi ja vastaanottaa ilmoituksia.",
+    "To return to your account in future you need to set a password": "Päästäksesi uudestaan tiliisi myöhemmin sinun täytyy asettaa salasana",
+    "Skip": "Hyppää yli",
+    "Start verification": "Aloita varmennus",
+    "Share without verifying": "Jaa ilman varmennusta",
+    "Ignore request": "Jätä pyyntö huomioimatta",
+    "You added a new device '%(displayName)s', which is requesting encryption keys.": "Lisäsit laitteen '%(displayName)s' joka pyytää salausavaimia.",
+    "Your unverified device '%(displayName)s' is requesting encryption keys.": "Sinun varmentamaton laitteesi '%(displayName)s' pyytää salausavaimia.",
+    "Encryption key request": "Salausavainpyyntö",
+    "This Home server does not support groups": "Kotipalvelin ei tue ryhmiä",
+    "Loading device info...": "Ladataan laitetiedot...",
+    "Groups": "Ryhmät",
+    "Create a new group": "Luo uusi ryhmä",
+    "Create Group": "Luo ryhmä",
+    "Group Name": "Ryhmän nimi",
+    "Example": "Esimerkki",
+    "Create": "Luo",
+    "Group ID": "Ryhmän tunniste",
+    "+example:%(domain)s": "+esimerkki:%(domain)s",
+    "Group IDs must be of the form +localpart:%(domain)s": "Ryhmätunnisteiden pitää olla muotoa +paikallinen:%(domain)s",
+    "Room creation failed": "Huoneen luonti epäonnistui",
+    "You are a member of these groups:": "Olet seuraavien ryhmien jäsen:",
+    "Join an existing group": "Liity olemassaolevaan ryhmään",
+    "Edit Group": "Muokkaa ryhmää",
+    "Failed to upload image": "Kuvan lataaminen epäonnistui",
+    "Failed to update group": "Ryhmän päivitys epäonnistui",
+    "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Robottitarkistus ei tällä hetkellä toimi työpöytäversiossa. Ole hyvä ja käytä <a>nettiselainta</a>",
+    "Add a widget": "Lisää sovelma",
+    "Cannot add any more widgets": "Lisää sovelmia ei voida enää lisätä",
+    "Delete widget": "Poista sovelma",
+    "Do you want to load widget from URL:": "Haluatko ladata sovelman URL-osoitteesta:",
+    "The maximum permitted number of widgets have already been added to this room.": "Maksimimäärä sovelmia on jo lisätty tähän huoneeseen.",
+    "Unable to create widget.": "Sovelman luominen epäonnistui.",
+    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Et voi kumota tätä toimintoa koska olet antamassa käyttäjälle saman oikeustason kuin sinullakin on.",
+    "This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.": "Tämä prosessi mahdollistaa salatuissa huoneissa vastaanottamasi viestien salausavainten vieminen tiedostoon.  Voit sitten myöhemmin tuoda ne toiseen Matrix-asiakasohjelmaan niin että myös se ohjema voi purkaa viestit.",
+    "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "Tämän tiedoston avulla kuka tahansa pystyy purkamaan kaikki salatut viestit jotka sinä voit nähdä, joten sinun täytyy säilyttää se turvallisesti. Helpottaaksesi tätä sinun pitäisi syötää salasana alla jonka avulla tiedosto salataan. Käyttäen samaa salasanaa voit myöhemmin tuoda tiedot ohjelmaan.",
+    "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Tämä prosessi mahdollistaa aiemmin tallennettujen salausavainten tuominen toiseen Matrix-asiakasohjelmaan. Tämän jälkeen voit purkaa kaikki salatut viestit jotka toinen asiakasohjelma pystyisi purkamaan."
 }

From 6352e5cca655f73f9cb8812cf2178bb31d326101 Mon Sep 17 00:00:00 2001
From: carlos-am <marques.carlos@hotmail.com>
Date: Tue, 19 Sep 2017 13:54:03 +0000
Subject: [PATCH 015/123] Translated using Weblate (Portuguese)

Currently translated at 91.6% (784 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt/
---
 src/i18n/strings/pt.json | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index 75b690cb26..fe74fedf13 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -842,5 +842,18 @@
     "Start chat": "Iniciar conversa",
     "You already have existing direct chats with this user:": "Você já tem conversas pessoais com esta pessoa:",
     "Accept": "Aceitar",
-    "%(roomName)s is not accessible at this time.": "%(roomName)s não está acessível neste momento."
+    "%(roomName)s is not accessible at this time.": "%(roomName)s não está acessível neste momento.",
+    "Add a widget": "Adicionar widget",
+    "Allow": "Permitir",
+    "Cannot add any more widgets": "Não é possível adicionar mais widgets",
+    "Changes colour scheme of current room": "Altera o esquema de cores da sala atual",
+    "Delete widget": "Apagar widget",
+    "Define the power level of a user": "Definir o nível de privilégios de um utilizador",
+    "Do you want to load widget from URL:": "Deseja carregar o widget a partir do URL:",
+    "Edit": "Editar",
+    "Enable automatic language detection for syntax highlighting": "Ativar deteção automática da linguagem para o destaque da sintaxe",
+    "Hide Apps": "Ocultar apps",
+    "Hide join/leave messages (invites/kicks/bans unaffected)": "Ocultar mensagens de entrada/saída (não afeta convites/expulsões/proibições)",
+    "Hide avatar and display name changes": "Ocultar mudanças de avatar e de nome público",
+    "Integrations Error": "Erro de integrações"
 }

From 4d127db358665dfa32cb43936881b3125ea6b3bd Mon Sep 17 00:00:00 2001
From: carlos-am <marques.carlos@hotmail.com>
Date: Tue, 19 Sep 2017 14:01:37 +0000
Subject: [PATCH 016/123] Translated using Weblate (Portuguese)

Currently translated at 92.7% (793 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt/
---
 src/i18n/strings/pt.json | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index fe74fedf13..68886c2e85 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -855,5 +855,14 @@
     "Hide Apps": "Ocultar apps",
     "Hide join/leave messages (invites/kicks/bans unaffected)": "Ocultar mensagens de entrada/saída (não afeta convites/expulsões/proibições)",
     "Hide avatar and display name changes": "Ocultar mudanças de avatar e de nome público",
-    "Integrations Error": "Erro de integrações"
+    "Integrations Error": "Erro de integrações",
+    "Publish this room to the public in %(domain)s's room directory?": "Publicar esta sala ao público no diretório de salas de %(domain)s's?",
+    "Matrix Apps": "Apps Matrix",
+    "AM": "AM",
+    "PM": "PM",
+    "NOTE: Apps are not end-to-end encrypted": "NOTA: As apps não são cifradas ponta-a-ponta",
+    "Press <StartChatButton> to start a chat with someone": "Clique <StartChatButton> para iniciar uma conversa com alguém",
+    "Revoke widget access": "Revogar o acesso do wiget",
+    "Sets the room topic": "Define o assunto da sala",
+    "Show Apps": "Mostrar apps"
 }

From d221b20721f078ac6a64a8198796de05541403e1 Mon Sep 17 00:00:00 2001
From: carlos-am <marques.carlos@hotmail.com>
Date: Tue, 19 Sep 2017 14:59:57 +0000
Subject: [PATCH 017/123] Translated using Weblate (Portuguese)

Currently translated at 99.1% (848 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt/
---
 src/i18n/strings/pt.json | 58 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 56 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index 68886c2e85..6f8572a0c7 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -539,7 +539,7 @@
     "quote": "citação",
     "bullet": "marcador de lista",
     "numbullet": "marcador de numeração",
-    "%(severalUsers)sjoined %(repeats)s times": "%(severalUsers)singressaram %(repeats)s vezes",
+    "%(severalUsers)sjoined %(repeats)s times": "%(severalUsers)s entraram %(repeats)s vezes",
     "%(oneUser)sjoined %(repeats)s times": "%(oneUser)singressou %(repeats)s vezes",
     "%(severalUsers)sjoined": "%(severalUsers)singressaram",
     "%(oneUser)sjoined": "%(oneUser)singressou",
@@ -864,5 +864,59 @@
     "Press <StartChatButton> to start a chat with someone": "Clique <StartChatButton> para iniciar uma conversa com alguém",
     "Revoke widget access": "Revogar o acesso do wiget",
     "Sets the room topic": "Define o assunto da sala",
-    "Show Apps": "Mostrar apps"
+    "Show Apps": "Mostrar apps",
+    "The maximum permitted number of widgets have already been added to this room.": "O número máximo de widgets permitido já foi adicionado a esta sala.",
+    "To get started, please pick a username!": "Para começar, escolha um nome de utilizador!",
+    "Unable to create widget.": "Não foi possível criar o widget.",
+    "Unbans user with given id": "Retira ban ao utilizador através do seu id",
+    "(could not connect media)": "(não foi possível conectar-se ao media)",
+    "(no answer)": "(sem resposta)",
+    "(unknown failure: %(reason)s)": "(falha desconhecida: %(reason)s)",
+    "You are not in this room.": "Não se encontra nesta sala.",
+    "You do not have permission to do that in this room.": "Não tem permissão para fazer isso nesta sala.",
+    "You're not in any rooms yet! Press <CreateRoomButton> to make a room or <RoomDirectoryButton> to browse the directory": "Ainda não se encontra em nenhuma sala! Clique em <CreateRoomButton> para criar uma sala ou em <RoomDirectoryButton> para navegar o diretório de salas",
+    "%(weekDayName)s, %(monthName)s %(day)s": "%(weekDayName)s, %(day)s de %(monthName)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s de %(monthName)s de %(fullYear)s",
+    "Copied!": "Copiado!",
+    "Failed to copy": "Falha ao copiar",
+    "Verifies a user, device, and pubkey tuple": "Verifica um utilizador, o dispositivo e o tuplo da chave pública",
+    "Updates": "Atualizações",
+    "Check for update": "Procurar atualizações",
+    "Your browser does not support the required cryptography extensions": "O seu browser não suporta as extensões de criptografia necessárias",
+    "Not a valid Riot keyfile": "Não é um ficheiro de chaves Riot válido",
+    "Authentication check failed: incorrect password?": "Erro de autenticação: palavra-passe incorreta?",
+    "Disable Peer-to-Peer for 1:1 calls": "Desativar ponto-a-ponto para chamadas 1:1",
+    "Do you want to set an email address?": "Deseja definir um endereço de e-mail?",
+    "This will allow you to reset your password and receive notifications.": "Isto irá permitir-lhe redefinir a sua palavra-passe e receber notificações.",
+    "To return to your account in future you need to set a password": "Para voltar à sua conta no futuro necessita de definir uma palavra-passe",
+    "Skip": "Saltar",
+    "Start verification": "Iniciar verificação",
+    "Share without verifying": "Partilhar sem verificar",
+    "Ignore request": "Ignorar pedido",
+    "You added a new device '%(displayName)s', which is requesting encryption keys.": "Adicionou um novo dispositivo '%(displayName)s', que está a pedir chaves de encriptação.",
+    "Your unverified device '%(displayName)s' is requesting encryption keys.": "O seu dispositivo não verificado '%(displayName)s' está a pedir chaves de encriptação.",
+    "Encryption key request": "Pedido de chave de encriptação",
+    "Autocomplete Delay (ms):": "Atraso de preenchimento automático (ms):",
+    "This Home server does not support groups": "Este servidor (home server) não suporta grupos",
+    "Loading device info...": "A carregar as informações do dispositivo...",
+    "Groups": "Grupos",
+    "Create a new group": "Criar um novo grupo",
+    "Create Group": "Criar grupo",
+    "Group Name": "Nome do grupo",
+    "Example": "Exemplo",
+    "Create": "Criar",
+    "Group ID": "ID do grupo",
+    "+example:%(domain)s": "+exemplo:%(domain)s",
+    "Group IDs must be of the form +localpart:%(domain)s": "IDs de grupo têm que ser no formato +localpart:%(domain)s",
+    "It is currently only possible to create groups on your own home server: use a group ID ending with %(domain)s": "Atualmente apenas é possível criar grupos no seu próprio servidor (home server): utilize um ID de grupo que termine com %(domain)s",
+    "Room creation failed": "Criação de sala falhou",
+    "You are a member of these groups:": "É um membro destes grupos:",
+    "Create a group to represent your community! Define a set of rooms and your own custom homepage to mark out your space in the Matrix universe.": "Crie um grupo para representar a sua comunidade! Defina um conjunto de salas e a sua própria página inicial personalizada para marcar o seu espaço no universo Matrix.",
+    "Join an existing group": "Juntar-se a um grupo existente",
+    "To join an existing group you'll have to know its group identifier; this will look something like <i>+example:matrix.org</i>.": "Para juntar-se a um grupo existente necessita de saber a identificação do grupo; isto será algo como <i>+exemplo:matrix.org</i>.",
+    "Featured Rooms:": "Salas em destaque:",
+    "Error whilst fetching joined groups": "Erro ao obter os seus grupos",
+    "Featured Users:": "Utilizadores em destaque:",
+    "Edit Group": "Editar grupo",
+    "Automatically replace plain text Emoji": "Substituir Emoji em texto automaticamente"
 }

From 077d4aafe225ebe689ab0c9f58bb813bf20a0d40 Mon Sep 17 00:00:00 2001
From: carlos-am <marques.carlos@hotmail.com>
Date: Tue, 19 Sep 2017 15:04:12 +0000
Subject: [PATCH 018/123] Translated using Weblate (Portuguese)

Currently translated at 100.0% (855 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt/
---
 src/i18n/strings/pt.json | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index 6f8572a0c7..a20474a62d 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -918,5 +918,12 @@
     "Error whilst fetching joined groups": "Erro ao obter os seus grupos",
     "Featured Users:": "Utilizadores em destaque:",
     "Edit Group": "Editar grupo",
-    "Automatically replace plain text Emoji": "Substituir Emoji em texto automaticamente"
+    "Automatically replace plain text Emoji": "Substituir Emoji em texto automaticamente",
+    "Failed to upload image": "Falha ao carregar imagem",
+    "Failed to update group": "Falha ao atualizar grupo",
+    "Hide avatars in user and room mentions": "Ocultar avatares nas menções de utilizadores e salas",
+    "%(widgetName)s widget added by %(senderName)s": "Widget %(widgetName)s adicionado por %(senderName)s",
+    "%(widgetName)s widget removed by %(senderName)s": "Widget %(widgetName)s removido por %(senderName)s",
+    "%(widgetName)s widget modified by %(senderName)s": "Widget %(widgetName)s modificado por %(senderName)s",
+    "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "A verificação através de robot está atualmente indisponível na versão desktop - utilize um <a>navegador web</a>"
 }

From b676d1818e775b1a2142fa3b576da2c302cc6d62 Mon Sep 17 00:00:00 2001
From: carlos-am <marques.carlos@hotmail.com>
Date: Tue, 19 Sep 2017 15:26:15 +0000
Subject: [PATCH 019/123] Translated using Weblate (Portuguese)

Currently translated at 100.0% (855 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt/
---
 src/i18n/strings/pt.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index a20474a62d..c650a024a8 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -81,7 +81,7 @@
     "Error": "Erro",
     "Event information": "Informação do evento",
     "Export E2E room keys": "Exportar chaves ponta-a-ponta da sala",
-    "Failed to change password. Is your password correct?": "Não foi possível modificar a senha. A senha informada está correta?",
+    "Failed to change password. Is your password correct?": "Falha ao alterar a palavra-passe. A sua palavra-passe está correta?",
     "Failed to forget room": "Não foi possível esquecer a sala",
     "Failed to leave room": "Falha ao tentar deixar a sala",
     "Failed to reject invitation": "Falha ao tentar rejeitar convite",

From 29be5878dd875716285fc9eb0ea965a334a7ea88 Mon Sep 17 00:00:00 2001
From: Carlos <marques.carlos@hotmail.com>
Date: Tue, 19 Sep 2017 15:47:04 +0000
Subject: [PATCH 020/123] Translated using Weblate (Portuguese)

Currently translated at 100.0% (855 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt/
---
 src/i18n/strings/pt.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index c650a024a8..7edd67b0a9 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -165,7 +165,7 @@
     "Privacy warning": "Alerta sobre privacidade",
     "Privileged Users": "Usuárias/os privilegiadas/os",
     "Profile": "Perfil",
-    "Refer a friend to Riot:": "Indicar um amigo para participar",
+    "Refer a friend to Riot:": "Recomendar Riot a um amigo:",
     "rejected": "recusou",
     "rejected the invitation.": "rejeitou o convite.",
     "Reject invitation": "Rejeitar convite",

From 94a30c0889cab92fd5cb11e9d0bed42249f4cad0 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Tue, 19 Sep 2017 18:49:08 +0000
Subject: [PATCH 021/123] Translated using Weblate (Hungarian)

Currently translated at 100.0% (855 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
---
 src/i18n/strings/hu.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 3dcef42c58..36cbe4cb2b 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -853,5 +853,9 @@
     "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s kisalkalmazást %(senderName)s hozzáadta",
     "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s kisalkalmazást %(senderName)s eltávolította",
     "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Robot ellenőrzés az asztali verzióban nem érhető el - használd a <a>web böngészőt</a>",
-    "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s kisalkalmazást %(senderName)s módosította"
+    "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s kisalkalmazást %(senderName)s módosította",
+    "%(weekDayName)s, %(monthName)s %(day)s": "%(weekDayName)s, %(monthName)s %(day)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(fullYear)s %(monthName)s %(day)s",
+    "Copied!": "Lemásolva!",
+    "Failed to copy": "Sikertelen másolás"
 }

From 5f73fa5a770024061ebab6e06a1e685bab755e8a Mon Sep 17 00:00:00 2001
From: Walter <studinsky@gmail.com>
Date: Thu, 21 Sep 2017 12:29:38 +0000
Subject: [PATCH 022/123] Translated using Weblate (Russian)

Currently translated at 100.0% (855 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
---
 src/i18n/strings/ru.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 914fd49798..34d3e287a4 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -366,7 +366,7 @@
     "Command error": "Ошибка команды",
     "Confirm password": "Подтвердите пароль",
     "Current password": "Текущий пароль",
-    "Email": "Электронная почта",
+    "Email": "Эл. почта",
     "Failed to kick": "Не удалось выгнать",
     "Failed to load timeline position": "Не удалось загрузить метку из хронологии",
     "Failed to mute user": "Не удалось заглушить пользователя",

From 2bc2d30a0e181f9297725a4566b6781b70bfde63 Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Thu, 21 Sep 2017 13:21:28 +0000
Subject: [PATCH 023/123] Translated using Weblate (Russian)

Currently translated at 100.0% (855 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
---
 src/i18n/strings/ru.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 34d3e287a4..914fd49798 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -366,7 +366,7 @@
     "Command error": "Ошибка команды",
     "Confirm password": "Подтвердите пароль",
     "Current password": "Текущий пароль",
-    "Email": "Эл. почта",
+    "Email": "Электронная почта",
     "Failed to kick": "Не удалось выгнать",
     "Failed to load timeline position": "Не удалось загрузить метку из хронологии",
     "Failed to mute user": "Не удалось заглушить пользователя",

From 4802b2abc141970765028cda307378b97681adc6 Mon Sep 17 00:00:00 2001
From: Walter <studinsky@gmail.com>
Date: Fri, 22 Sep 2017 06:27:01 +0000
Subject: [PATCH 024/123] Translated using Weblate (Russian)

Currently translated at 100.0% (855 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
---
 src/i18n/strings/ru.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 914fd49798..b65eebe929 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -96,7 +96,7 @@
     "Homeserver is": "Домашний сервер это",
     "Identity Server is": "Сервер идентификации это",
     "I have verified my email address": "Я подтвердил свой адрес электронной почты",
-    "Import E2E room keys": "Импортировать ключи сквозного шифрования комнаты",
+    "Import E2E room keys": "Импорт ключей сквозного шифрования комнаты",
     "Invalid Email Address": "Недопустимый адрес электронной почты",
     "invited": "invited",
     "Invite new room members": "Пригласить новых участников в комнату",

From f37efcb3c4c8e482010e067683f8f663f9c343b1 Mon Sep 17 00:00:00 2001
From: Bamstam <am-em-am@posteo.de>
Date: Fri, 22 Sep 2017 07:56:54 +0000
Subject: [PATCH 025/123] Translated using Weblate (German)

Currently translated at 100.0% (855 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
---
 src/i18n/strings/de_DE.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 48dd7602df..9dadc7d632 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -595,7 +595,7 @@
     "Report it": "Melden",
     "riot-web version:": "Version von riot-web:",
     "Scroll to bottom of page": "Zum Ende der Seite springen",
-    "Show timestamps in 12 hour format (e.g. 2:30pm)": "Zeitstempel im 12-Stunden-Format anzeigen (z. B. 2:30pm)",
+    "Show timestamps in 12 hour format (e.g. 2:30pm)": "Zeitstempel im 12-Stunden-Format anzeigen (z. B. 2:30 p. m.)",
     "to tag as %(tagName)s": "um als \"%(tagName)s\" zu markieren",
     "Email address": "E-Mail-Adresse",
     "Error decrypting attachment": "Fehler beim Entschlüsseln des Anhangs",
@@ -877,8 +877,8 @@
     "Edit": "Bearbeiten",
     "Enable automatic language detection for syntax highlighting": "Automatische Spracherkennung für die Syntax-Hervorhebung aktivieren",
     "Hide Apps": "Apps verbergen",
-    "Hide join/leave messages (invites/kicks/bans unaffected)": "Verberge Beitritt-/Verlassen-Meldungen (außer Einladungen/Kicks/Bans)",
-    "Hide avatar and display name changes": "Verberge Avatar- und Anzeigenamen-Änderungen",
+    "Hide join/leave messages (invites/kicks/bans unaffected)": "Betreten-/Verlassen-Benachrichtigungen verbergen (gilt nicht für Einladungen/Kicks/Bans)",
+    "Hide avatar and display name changes": "Profilbild- und Anzeigenamen-Änderungen verbergen",
     "Matrix Apps": "Matrix-Apps",
     "Revoke widget access": "Ziehe Widget-Zugriff zurück",
     "Sets the room topic": "Setzt das Raum-Thema",
@@ -889,7 +889,7 @@
     "You are not in this room.": "Du bist nicht in diesem Raum.",
     "You do not have permission to do that in this room.": "Du hast keine Berechtigung, dies in diesem Raum zu tun.",
     "Verifies a user, device, and pubkey tuple": "Verifiziert ein Tupel aus Nutzer, Gerät und öffentlichem Schlüssel",
-    "Autocomplete Delay (ms):": "Verzögerung zur Autovervollständigung (ms):",
+    "Autocomplete Delay (ms):": "Verzögerung bei Autovervollständigung (ms):",
     "This Home server does not support groups": "Dieser Heimserver unterstützt keine Gruppen",
     "Loading device info...": "Lädt Geräte-Info...",
     "Groups": "Gruppen",
@@ -914,7 +914,7 @@
     "Automatically replace plain text Emoji": "Klartext-Emoji automatisch ersetzen",
     "Failed to upload image": "Bild-Hochladen fehlgeschlagen",
     "Failed to update group": "Aktualisieren der Gruppe fehlgeschlagen",
-    "Hide avatars in user and room mentions": "Verberge Profilbilder in Benutzer- und Raum-Erwähnungen",
+    "Hide avatars in user and room mentions": "Profilbilder in Benutzer- und Raum-Erwähnungen verbergen",
     "AM": "a. m.",
     "PM": "p. m.",
     "The maximum permitted number of widgets have already been added to this room.": "Die maximal erlaubte Anzahl an hinzufügbaren Widgets für diesen Raum wurde erreicht.",

From e7d68395251335e4a93ddc05aa39e3d4277eaebd Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Fri, 22 Sep 2017 07:53:45 +0000
Subject: [PATCH 026/123] Translated using Weblate (Russian)

Currently translated at 100.0% (855 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
---
 src/i18n/strings/ru.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index b65eebe929..48a070f066 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -96,7 +96,7 @@
     "Homeserver is": "Домашний сервер это",
     "Identity Server is": "Сервер идентификации это",
     "I have verified my email address": "Я подтвердил свой адрес электронной почты",
-    "Import E2E room keys": "Импорт ключей сквозного шифрования комнаты",
+    "Import E2E room keys": "Импорт ключей сквозного шифрования",
     "Invalid Email Address": "Недопустимый адрес электронной почты",
     "invited": "invited",
     "Invite new room members": "Пригласить новых участников в комнату",

From 40688b1a2b5a609f86eae2a4ea888ae96382f96a Mon Sep 17 00:00:00 2001
From: Walter <studinsky@gmail.com>
Date: Fri, 22 Sep 2017 14:01:08 +0000
Subject: [PATCH 027/123] Translated using Weblate (Ukrainian)

Currently translated at 12.0% (103 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
---
 src/i18n/strings/uk.json | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json
index ed11668ddd..8f9c18356a 100644
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -78,5 +78,28 @@
     "%(names)s and one other are typing": "%(names)s та інші пишуть",
     "%(names)s and %(count)s others are typing": "%(names)s та %(count)s інших пишуть",
     "An email has been sent to": "Лист було надіслано",
-    "A new password must be entered.": "Має бути введений новий пароль."
+    "A new password must be entered.": "Має бути введений новий пароль.",
+    "Add a widget": "Добавити віджет",
+    "Allow": "Принюти",
+    "%(senderName)s answered the call.": "%(senderName)s відповіла на дзвінок.",
+    "anyone": "Будь-який",
+    "An error has occurred.": "Трапилась помилка.",
+    "Anyone": "Кожний",
+    "Anyone who knows the room's link, apart from guests": "Кожний, хто знає посилання на кімнату, окрім гостей",
+    "Anyone who knows the room's link, including guests": "Кожний, хто знає посилання на кімнату, включно гостей",
+    "Are you sure?": "Ви впевнені?",
+    "Are you sure you want to leave the room '%(roomName)s'?": "Ви впевнені, що хочете покинути '%(roomName)s'?",
+    "Are you sure you want to reject the invitation?": "Ви впевнені, що ви хочете відхилити запрошення?",
+    "Are you sure you want to upload the following files?": "Ви впевнені, що ви хочете відправити наступний файл?",
+    "Attachment": "Прикріплення",
+    "Autoplay GIFs and videos": "Автовідтворення GIF і відео",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s заблокував(ла) %(targetName)s.",
+    "Ban": "Заблокувати",
+    "Banned users": "Заблоковані користувачі",
+    "Bans user with given id": "Блокує користувача з заданим ID",
+    "Blacklisted": "В чорному списку",
+    "Bug Report": "Звіт про помилку",
+    "Bulk Options": "Групові параметри",
+    "Call Timeout": "Час очікування виклика",
+    "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Не вдається підключитись до домашнього серверу - перевірте підключення, переконайтесь, що ваш <a>SSL-сертифікат домашнього сервера</a> є довіреним і що розширення браузера не блокує запити."
 }

From d4929b558edec1a473ae2c4e431bd74cd1f2e7fd Mon Sep 17 00:00:00 2001
From: Stefan Parviainen <pafcu@iki.fi>
Date: Fri, 22 Sep 2017 21:43:27 +0200
Subject: [PATCH 028/123] Add dummy translation function to mark translatable
 strings

Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
---
 src/autocomplete/CommandProvider.js           | 34 ++++++++---------
 src/components/structures/UserSettings.js     | 38 +++++++++----------
 src/components/views/elements/AppTile.js      |  6 +--
 .../views/rooms/MessageComposerInput.js       | 18 ++++-----
 src/languageHandler.js                        |  6 +++
 5 files changed, 54 insertions(+), 48 deletions(-)

diff --git a/src/autocomplete/CommandProvider.js b/src/autocomplete/CommandProvider.js
index 011ad0a7dc..42347d3955 100644
--- a/src/autocomplete/CommandProvider.js
+++ b/src/autocomplete/CommandProvider.js
@@ -16,7 +16,7 @@ limitations under the License.
 */
 
 import React from 'react';
-import { _t } from '../languageHandler';
+import { _t, _td } from '../languageHandler';
 import AutocompleteProvider from './AutocompleteProvider';
 import FuzzyMatcher from './FuzzyMatcher';
 import {TextualCompletion} from './Components';
@@ -27,82 +27,82 @@ const COMMANDS = [
     {
         command: '/me',
         args: '<message>',
-        description: 'Displays action',
+        description: _td('Displays action'),
     },
     {
         command: '/ban',
         args: '<user-id> [reason]',
-        description: 'Bans user with given id',
+        description: _td('Bans user with given id'),
     },
     {
         command: '/unban',
         args: '<user-id>',
-        description: 'Unbans user with given id',
+        description: _td('Unbans user with given id'),
     },
     {
         command: '/op',
         args: '<user-id> [<power-level>]',
-        description: 'Define the power level of a user',
+        description: _td('Define the power level of a user'),
     },
     {
         command: '/deop',
         args: '<user-id>',
-        description: 'Deops user with given id',
+        description: _td('Deops user with given id'),
     },
     {
         command: '/invite',
         args: '<user-id>',
-        description: 'Invites user with given id to current room',
+        description: _td('Invites user with given id to current room'),
     },
     {
         command: '/join',
         args: '<room-alias>',
-        description: 'Joins room with given alias',
+        description: _td('Joins room with given alias'),
     },
     {
         command: '/part',
         args: '[<room-alias>]',
-        description: 'Leave room',
+        description: _td('Leave room'),
     },
     {
         command: '/topic',
         args: '<topic>',
-        description: 'Sets the room topic',
+        description: _td('Sets the room topic'),
     },
     {
         command: '/kick',
         args: '<user-id> [reason]',
-        description: 'Kicks user with given id',
+        description: _td('Kicks user with given id'),
     },
     {
         command: '/nick',
         args: '<display-name>',
-        description: 'Changes your display nickname',
+        description: _td('Changes your display nickname'),
     },
     {
         command: '/ddg',
         args: '<query>',
-        description: 'Searches DuckDuckGo for results',
+        description: _td('Searches DuckDuckGo for results'),
     },
     {
         command: '/tint',
         args: '<color1> [<color2>]',
-        description: 'Changes colour scheme of current room',
+        description: _td('Changes colour scheme of current room'),
     },
     {
         command: '/verify',
         args: '<user-id> <device-id> <device-signing-key>',
-        description: 'Verifies a user, device, and pubkey tuple',
+        description: _td('Verifies a user, device, and pubkey tuple'),
     },
     {
         command: '/ignore',
         args: '<user-id>',
-        description: 'Ignores a user, hiding their messages from you',
+        description: _td('Ignores a user, hiding their messages from you'),
     },
     {
         command: '/unignore',
         args: '<user-id>',
-        description: 'Stops ignoring a user, showing their messages going forward',
+        description: _td('Stops ignoring a user, showing their messages going forward'),
     },
     // Omitting `/markdown` as it only seems to apply to OldComposer
 ];
diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index d2f27b63e1..572ee79a69 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -32,7 +32,7 @@ const AddThreepid = require('../../AddThreepid');
 const SdkConfig = require('../../SdkConfig');
 import Analytics from '../../Analytics';
 import AccessibleButton from '../views/elements/AccessibleButton';
-import { _t } from '../../languageHandler';
+import { _t, _td } from '../../languageHandler';
 import * as languageHandler from '../../languageHandler';
 import * as FormattingUtils from '../../utils/FormattingUtils';
 
@@ -63,55 +63,55 @@ const gHVersionLabel = function(repo, token='') {
 const SETTINGS_LABELS = [
     {
         id: 'autoplayGifsAndVideos',
-        label: 'Autoplay GIFs and videos',
+        label: _td('Autoplay GIFs and videos'),
     },
     {
         id: 'hideReadReceipts',
-        label: 'Hide read receipts',
+        label: _td('Hide read receipts'),
     },
     {
         id: 'dontSendTypingNotifications',
-        label: "Don't send typing notifications",
+        label: _td("Don't send typing notifications"),
     },
     {
         id: 'alwaysShowTimestamps',
-        label: 'Always show message timestamps',
+        label: _td('Always show message timestamps'),
     },
     {
         id: 'showTwelveHourTimestamps',
-        label: 'Show timestamps in 12 hour format (e.g. 2:30pm)',
+        label: _td('Show timestamps in 12 hour format (e.g. 2:30pm)'),
     },
     {
         id: 'hideJoinLeaves',
-        label: 'Hide join/leave messages (invites/kicks/bans unaffected)',
+        label: _td('Hide join/leave messages (invites/kicks/bans unaffected)'),
     },
     {
         id: 'hideAvatarDisplaynameChanges',
-        label: 'Hide avatar and display name changes',
+        label: _td('Hide avatar and display name changes'),
     },
     {
         id: 'useCompactLayout',
-        label: 'Use compact timeline layout',
+        label: _td('Use compact timeline layout'),
     },
     {
         id: 'hideRedactions',
-        label: 'Hide removed messages',
+        label: _td('Hide removed messages'),
     },
     {
         id: 'enableSyntaxHighlightLanguageDetection',
-        label: 'Enable automatic language detection for syntax highlighting',
+        label: _td('Enable automatic language detection for syntax highlighting'),
     },
     {
         id: 'MessageComposerInput.autoReplaceEmoji',
-        label: 'Automatically replace plain text Emoji',
+        label: _td('Automatically replace plain text Emoji'),
     },
     {
         id: 'MessageComposerInput.dontSuggestEmoji',
-        label: 'Disable Emoji suggestions while typing',
+        label: _td('Disable Emoji suggestions while typing'),
     },
     {
         id: 'Pill.shouldHidePillAvatar',
-        label: 'Hide avatars in user and room mentions',
+        label: _td('Hide avatars in user and room mentions'),
     },
 /*
     {
@@ -124,7 +124,7 @@ const SETTINGS_LABELS = [
 const ANALYTICS_SETTINGS_LABELS = [
     {
         id: 'analyticsOptOut',
-        label: 'Opt out of analytics',
+        label: _td('Opt out of analytics'),
         fn: function(checked) {
             Analytics[checked ? 'disable' : 'enable']();
         },
@@ -134,7 +134,7 @@ const ANALYTICS_SETTINGS_LABELS = [
 const WEBRTC_SETTINGS_LABELS = [
     {
         id: 'webRtcForceTURN',
-        label: 'Disable Peer-to-Peer for 1:1 calls',
+        label: _td('Disable Peer-to-Peer for 1:1 calls'),
     },
 ];
 
@@ -143,7 +143,7 @@ const WEBRTC_SETTINGS_LABELS = [
 const CRYPTO_SETTINGS_LABELS = [
     {
         id: 'blacklistUnverifiedDevices',
-        label: 'Never send encrypted messages to unverified devices from this device',
+        label: _td('Never send encrypted messages to unverified devices from this device'),
         fn: function(checked) {
             MatrixClientPeg.get().setGlobalBlacklistUnverifiedDevices(checked);
         },
@@ -166,12 +166,12 @@ const CRYPTO_SETTINGS_LABELS = [
 const THEMES = [
     {
         id: 'theme',
-        label: 'Light theme',
+        label: _td('Light theme'),
         value: 'light',
     },
     {
         id: 'theme',
-        label: 'Dark theme',
+        label: _td('Dark theme'),
         value: 'dark',
     },
 ];
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 7436f84f69..1d7e4bd217 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -22,7 +22,7 @@ import MatrixClientPeg from '../../../MatrixClientPeg';
 import ScalarAuthClient from '../../../ScalarAuthClient';
 import SdkConfig from '../../../SdkConfig';
 import Modal from '../../../Modal';
-import { _t } from '../../../languageHandler';
+import { _t, _td } from '../../../languageHandler';
 import sdk from '../../../index';
 import AppPermission from './AppPermission';
 import AppWarning from './AppWarning';
@@ -170,9 +170,9 @@ export default React.createClass({
     // These strings are translated at the point that they are inserted in to the DOM, in the render method
     _deleteWidgetLabel() {
         if (this._canUserModify()) {
-            return 'Delete widget';
+            return _td('Delete widget');
         }
-        return 'Revoke widget access';
+        return _td('Revoke widget access');
     },
 
     /* TODO -- Store permission in account data so that it is persisted across multiple devices */
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 37602a94ca..39666c94a4 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -30,7 +30,7 @@ import SlashCommands from '../../../SlashCommands';
 import KeyCode from '../../../KeyCode';
 import Modal from '../../../Modal';
 import sdk from '../../../index';
-import { _t } from '../../../languageHandler';
+import { _t, _td } from '../../../languageHandler';
 import Analytics from '../../../Analytics';
 
 import dis from '../../../dispatcher';
@@ -1032,10 +1032,10 @@ export default class MessageComposerInput extends React.Component {
      buttons. */
     getSelectionInfo(editorState: EditorState) {
         const styleName = {
-            BOLD: 'bold',
-            ITALIC: 'italic',
-            STRIKETHROUGH: 'strike',
-            UNDERLINE: 'underline',
+            BOLD: _td('bold'),
+            ITALIC: _td('italic'),
+            STRIKETHROUGH: _td('strike'),
+            UNDERLINE: _td('underline'),
         };
 
         const originalStyle = editorState.getCurrentInlineStyle().toArray();
@@ -1044,10 +1044,10 @@ export default class MessageComposerInput extends React.Component {
             .filter((styleName) => !!styleName);
 
         const blockName = {
-            'code-block': 'code',
-            'blockquote': 'quote',
-            'unordered-list-item': 'bullet',
-            'ordered-list-item': 'numbullet',
+            'code-block': _td('code'),
+            'blockquote': _td('quote'),
+            'unordered-list-item': _td('bullet'),
+            'ordered-list-item': _td('numbullet'),
         };
         const originalBlockType = editorState.getCurrentContent()
             .getBlockForKey(editorState.getSelection().getStartKey())
diff --git a/src/languageHandler.js b/src/languageHandler.js
index 4455d58b04..12242a2e15 100644
--- a/src/languageHandler.js
+++ b/src/languageHandler.js
@@ -29,6 +29,12 @@ counterpart.setSeparator('|');
 // Fall back to English
 counterpart.setFallbackLocale('en');
 
+// Function which only purpose is to mark that a string is translatable
+// Does not actually do anything. It's helpful for automatic extraction of translatable strings
+export function _td(s) {
+    return s;
+}
+
 // The translation function. This is just a simple wrapper to counterpart,
 // but exists mostly because we must use the same counterpart instance
 // between modules (ie. here (react-sdk) and the app (riot-web), and if we

From cc441f42f9594f3e59b58ece05ccfaa2b99e4422 Mon Sep 17 00:00:00 2001
From: Stefan Parviainen <pafcu@iki.fi>
Date: Sat, 23 Sep 2017 09:02:51 +0200
Subject: [PATCH 029/123] Some more translatable strings

Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
---
 src/components/views/dialogs/KeyShareDialog.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/views/dialogs/KeyShareDialog.js b/src/components/views/dialogs/KeyShareDialog.js
index aed8e6a5af..c44e856382 100644
--- a/src/components/views/dialogs/KeyShareDialog.js
+++ b/src/components/views/dialogs/KeyShareDialog.js
@@ -18,7 +18,7 @@ import Modal from '../../../Modal';
 import React from 'react';
 import sdk from '../../../index';
 
-import { _t } from '../../../languageHandler';
+import { _t, _td } from '../../../languageHandler';
 
 /**
  * Dialog which asks the user whether they want to share their keys with
@@ -116,11 +116,11 @@ export default React.createClass({
 
         let text;
         if (this.state.wasNewDevice) {
-            text = "You added a new device '%(displayName)s', which is"
-                + " requesting encryption keys.";
+            text = _td("You added a new device '%(displayName)s', which is"
+                + " requesting encryption keys.");
         } else {
-            text = "Your unverified device '%(displayName)s' is requesting"
-                + " encryption keys.";
+            text = _td("Your unverified device '%(displayName)s' is requesting"
+                + " encryption keys.");
         }
         text = _t(text, {displayName: displayName});
 

From 198dc7ea5cd02c86ae63ba3ffce08213e9596bca Mon Sep 17 00:00:00 2001
From: Jan Kudrik <jan@kudrik.cz>
Date: Sat, 23 Sep 2017 15:39:09 +0000
Subject: [PATCH 030/123] Translated using Weblate (Czech)

Currently translated at 47.6% (407 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
---
 src/i18n/strings/cs.json | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index 5e4846794a..31a52593b0 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -378,5 +378,32 @@
     "This room has no local addresses": "Tato místnost nemá žádné místní adresy",
     "This room is not recognised.": "Tato místnost nebyla rozpoznána.",
     "These are experimental features that may break in unexpected ways": "Tyto funkce jsou experimentální a mohou se pokazit nečekanými způsoby",
-    "The visibility of existing history will be unchanged": "Viditelnost existující historie nebude změněna"
+    "The visibility of existing history will be unchanged": "Viditelnost existující historie nebude změněna",
+    "VoIP is unsupported": "VoIP není podporován",
+    "Warning!": "Pozor!",
+    "Who can access this room?": "Kdo má přístup k této místnosti?",
+    "Who can read history?": "Kdo může číst historii?",
+    "Who would you like to add to this room?": "Koho byste chtěli přidat do této místnosti?",
+    "Who would you like to communicate with?": "S kým byste chtěli komunikovat?",
+    "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "Chtěli byste tuto pozvánku <acceptText>přijmout</acceptText> nebo <declineText>odmítnout</declineText>?",
+    "You are not in this room.": "Nejste v této místnosti.",
+    "You do not have permission to do that in this room.": "V této místnosti nemáte na toto právo.",
+    "You're not in any rooms yet! Press <CreateRoomButton> to make a room or <RoomDirectoryButton> to browse the directory": "Ještě nejste v žádné místnosti! Zmáčkněte <CreateRoomButton> pro vytvoření místnosti nebo <RoomDirectoryButton> pro prohlížení adresáře",
+    "You are trying to access %(roomName)s.": "Snažíte se přistoupit k %(roomName)s.",
+    "You cannot place a call with yourself.": "Nemůžete volat sami sobě.",
+    "You cannot place VoIP calls in this browser.": "V tomto prohlížeči nelze vytáčet VoIP hovory.",
+    "You do not have permission to post to this room": "Na přispívání do této místnosti nemáte právo",
+    "You have been banned from %(roomName)s by %(userName)s.": "%(userName)s vás vykázal/a z místnosti %(roomName)s.",
+    "You have been kicked from %(roomName)s by %(userName)s.": "%(userName)s vás vykopnul/a z místnosti %(roomName)s.",
+    "You have entered an invalid contact. Try using their Matrix ID or email address.": "Zadali jste neplatný kontakt. Zkuste jejich Matrix ID nebo e-mailovou adresu.",
+    "you must be a": "musíte být",
+    "You need to enter a user name.": "Musíte zadat uživatelské jméno.",
+    "Your password has been reset": "Vaše heslo bylo resetováno",
+    "Your home server does not support device management.": "Váš domovský server nepodporuje správu zařízení.",
+    "Online": "Online",
+    "Offline": "Offline",
+    "Updates": "Aktualizace",
+    "Check for update": "Zkontrolovat aktualizace",
+    "Start chatting": "Začít chatovat",
+    "Start Chatting": "Začít chatovat"
 }

From 14bce1119c15feefee5813c8f4cd50ded7f76526 Mon Sep 17 00:00:00 2001
From: Stefan Parviainen <pafcu@iki.fi>
Date: Sat, 23 Sep 2017 21:36:10 +0200
Subject: [PATCH 031/123] Make theme names translatable

Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
---
 src/components/structures/UserSettings.js | 2 +-
 src/i18n/strings/en_EN.json               | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 572ee79a69..5e7658f056 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -793,7 +793,7 @@ module.exports = React.createClass({
                    onChange={ onChange }
             />
             <label htmlFor={ setting.id + "_" + setting.value }>
-                { setting.label }
+                { _t(setting.label) }
             </label>
         </div>;
     },
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index a0945d7f50..8b53f17d8c 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -879,5 +879,7 @@
     "Failed to remove the room from the summary of %(groupId)s": "Failed to remove the room from the summary of %(groupId)s",
     "The room '%(roomName)' could not be removed from the summary.": "The room '%(roomName)' could not be removed from the summary.",
     "Failed to remove a user from the summary of %(groupId)s": "Failed to remove a user from the summary of %(groupId)s",
-    "The user '%(displayName)s' could not be removed from the summary.": "The user '%(displayName)s' could not be removed from the summary."
+    "The user '%(displayName)s' could not be removed from the summary.": "The user '%(displayName)s' could not be removed from the summary.",
+    "Light theme": "Light theme",
+    "Dark theme": "Dark theme"
 }

From dbae5a66e3a3b1b83bd08304c408a3939b11ed59 Mon Sep 17 00:00:00 2001
From: Stefan Parviainen <pafcu@iki.fi>
Date: Sun, 24 Sep 2017 09:43:52 +0200
Subject: [PATCH 032/123] Use translation in img alt text

Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
---
 src/components/views/room_settings/AliasSettings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index f37bd4271a..ea3bad390f 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -299,7 +299,7 @@ module.exports = React.createClass({
                                 blurToCancel={ false }
                                 onValueChanged={ self.onAliasAdded } />
                             <div className="mx_RoomSettings_addAlias mx_filterFlipColor">
-                                 <img src="img/plus.svg" width="14" height="14" alt="Add"
+                                 <img src="img/plus.svg" width="14" height="14" alt={ _t("Add") }
                                       onClick={ self.onAliasAdded.bind(self, undefined) }/>
                             </div>
                         </div> : ""

From 2b5b7080572940fed75960b76ede1725e7cb6b35 Mon Sep 17 00:00:00 2001
From: Stefan Parviainen <pafcu@iki.fi>
Date: Sun, 24 Sep 2017 10:14:04 +0200
Subject: [PATCH 033/123] Translate unknown presence label

Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
---
 src/components/views/rooms/PresenceLabel.js | 2 +-
 src/i18n/strings/en_EN.json                 | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/PresenceLabel.js b/src/components/views/rooms/PresenceLabel.js
index 47a723f5cd..87b218e2e2 100644
--- a/src/components/views/rooms/PresenceLabel.js
+++ b/src/components/views/rooms/PresenceLabel.js
@@ -70,7 +70,7 @@ module.exports = React.createClass({
         if (presence === "online") return _t("Online");
         if (presence === "unavailable") return _t("Idle"); // XXX: is this actually right?
         if (presence === "offline") return _t("Offline");
-        return "Unknown";
+        return _t("Unknown");
     },
 
     render: function() {
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 8b53f17d8c..f3e4b93e9c 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -881,5 +881,6 @@
     "Failed to remove a user from the summary of %(groupId)s": "Failed to remove a user from the summary of %(groupId)s",
     "The user '%(displayName)s' could not be removed from the summary.": "The user '%(displayName)s' could not be removed from the summary.",
     "Light theme": "Light theme",
-    "Dark theme": "Dark theme"
+    "Dark theme": "Dark theme",
+    "Unknown": "Unknown"
 }

From b9584cd421eeb37a0b69c28161a180e10bdbb6ab Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Sat, 23 Sep 2017 19:10:38 +0000
Subject: [PATCH 034/123] Translated using Weblate (French)

Currently translated at 98.8% (845 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
---
 src/i18n/strings/fr.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 80e76a17ac..5459672f9e 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -600,7 +600,7 @@
     "Unknown Address": "Adresse inconnue",
     "Unblacklist": "Réhabiliter",
     "Blacklist": "Blacklister",
-    "Unverify": "Non-vérifié",
+    "Unverify": "Révoquer",
     "Verify...": "Vérifier...",
     "ex. @bob:example.com": "ex. @bob:exemple.com",
     "Add User": "Ajouter l'utilisateur",

From 38f884f28506f5b65d74e87e2e527d45981fb05f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Sun, 24 Sep 2017 23:36:51 +0000
Subject: [PATCH 035/123] Translated using Weblate (French)

Currently translated at 99.8% (854 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
---
 src/i18n/strings/fr.json | 691 ++++++++++++++++++++-------------------
 1 file changed, 350 insertions(+), 341 deletions(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 5459672f9e..bf83f394d5 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1,41 +1,41 @@
 {
     "anyone": "n'importe qui",
     "Direct Chat": "Discussion directe",
-    "Direct chats": "Conversations directes",
-    "Disable inline URL previews by default": "Désactiver l’aperçu des URLs",
+    "Direct chats": "Discussions directes",
+    "Disable inline URL previews by default": "Désactiver l’aperçu des liens",
     "Disinvite": "Désinviter",
-    "Display name": "Nom d'affichage",
+    "Display name": "Nom affiché",
     "Displays action": "Affiche l'action",
     "Don't send typing notifications": "Ne pas envoyer les notifications de saisie",
     "Download %(text)s": "Télécharger %(text)s",
     "Drop here %(toAction)s": "Déposer ici %(toAction)s",
-    "Drop here to tag %(section)s": "Déposer ici pour marquer comme %(section)s",
+    "Drop here to tag %(section)s": "Déposer ici pour étiqueter comme %(section)s",
     "Ed25519 fingerprint": "Empreinte Ed25519",
     "Email Address": "Adresse e-mail",
     "Email, name or matrix ID": "E-mail, nom ou identifiant Matrix",
-    "Emoji": "Emoticône",
+    "Emoji": "Émoticône",
     "Enable encryption": "Activer le chiffrement",
     "Encrypted messages will not be visible on clients that do not yet implement encryption": "Les messages chiffrés ne seront pas visibles dans les clients qui n’implémentent pas encore le chiffrement",
     "Encrypted room": "Salon chiffré",
     "%(senderName)s ended the call.": "%(senderName)s a terminé l’appel.",
-    "End-to-end encryption information": "Information sur le chiffrement de bout-en-bout",
-    "End-to-end encryption is in beta and may not be reliable": "Le chiffrement de bout-en-bout est en bêta et risque de ne pas être fiable",
-    "Enter Code": "Entrer le code",
+    "End-to-end encryption information": "Informations sur le chiffrement de bout en bout",
+    "End-to-end encryption is in beta and may not be reliable": "Le chiffrement de bout en bout est en bêta et risque de ne pas être fiable",
+    "Enter Code": "Saisir le code",
     "Error": "Erreur",
-    "Event information": "Information de l'événement",
+    "Event information": "Informations de l'événement",
     "Existing Call": "Appel en cours",
-    "Export E2E room keys": "Exporter les clés de chiffrement du salon",
-    "Failed to ban user": "Échec lors du bannissement de l'utilisateur",
+    "Export E2E room keys": "Exporter les clés de chiffrement de salon",
+    "Failed to ban user": "Échec du bannissement de l'utilisateur",
     "Failed to change password. Is your password correct?": "Échec du changement de mot de passe. Votre mot de passe est-il correct ?",
-    "Failed to change power level": "Échec du changement de niveau d'autorité",
+    "Failed to change power level": "Échec du changement de rang",
     "Failed to delete device": "Échec de la suppression de l'appareil",
-    "Failed to forget room %(errCode)s": "Échec lors de l'oubli du salon %(errCode)s",
+    "Failed to forget room %(errCode)s": "Échec de l'oubli du salon %(errCode)s",
     "Please Register": "Veuillez vous inscrire",
     "Remove": "Supprimer",
     "was banned": "a été banni(e)",
     "was invited": "a été invité(e)",
-    "was kicked": "a été expulsé(e)",
-    "was unbanned": "a été amnistié(e)",
+    "was kicked": "a été exclu(e)",
+    "was unbanned": "a vu son bannissement révoqué",
     "Monday": "Lundi",
     "Tuesday": "Mardi",
     "Wednesday": "Mercredi",
@@ -51,56 +51,56 @@
     "Notifications": "Notifications",
     "Settings": "Paramètres",
     "Failed to join the room": "Échec de l'adhésion au salon",
-    "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Un message texte a été envoyé à +%(msisdn)s. Merci d'entrer le code de vérification qu'il contient",
+    "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Un SMS a été envoyé à +%(msisdn)s. Merci de saisir le code de vérification qu'il contient",
     "accept": "Accepter",
     "%(targetName)s accepted an invitation.": "%(targetName)s a accepté une invitation.",
     "Account": "Compte",
     "Add email address": "Ajouter une adresse e-mail",
-    "Add phone number": "Ajouter un numéro",
-    "Admin": "Admin",
+    "Add phone number": "Ajouter un numéro de téléphone",
+    "Admin": "Administrateur",
     "Advanced": "Avancé",
     "Algorithm": "Algorithme",
     "all room members": "tous les membres du salon",
     "all room members, from the point they are invited": "tous les membres du salon, depuis le moment où ils ont été invités",
-    "all room members, from the point they joined": "tous les membres du salon, depuis le moment où ils ont rejoint",
+    "all room members, from the point they joined": "tous les membres du salon, depuis le moment où ils l'ont rejoint",
     "an address": "une adresse",
     "and": "et",
     "%(items)s and %(remaining)s others": "%(items)s et %(remaining)s autres",
     "%(items)s and one other": "%(items)s et un autre",
     "%(items)s and %(lastItem)s": "%(items)s et %(lastItem)s",
-    "%(names)s and %(lastPerson)s are typing": "%(names)s et %(lastPerson)s sont en train d'écrire",
-    "%(names)s and one other are typing": "%(names)s et un autre sont en train d'écrire",
-    "%(names)s and %(count)s others are typing": "%(names)s et %(count)s d'autres sont en train d'écrire",
+    "%(names)s and %(lastPerson)s are typing": "%(names)s et %(lastPerson)s écrivent",
+    "%(names)s and one other are typing": "%(names)s et un autre écrivent",
+    "%(names)s and %(count)s others are typing": "%(names)s et %(count)s autres écrivent",
     "and %(count)s others...|other": "et %(count)s autres...",
     "and %(count)s others...|one": "et un autre...",
     "An email has been sent to": "Un e-mail a été envoyé à",
-    "A new password must be entered.": "Un nouveau mot de passe doit être entré.",
+    "A new password must be entered.": "Un nouveau mot de passe doit être saisi.",
     "Anyone who knows the room's link, apart from guests": "Tout ceux qui connaissent le lien du salon, à part les visiteurs",
     "Anyone who knows the room's link, including guests": "Tout ceux qui connaissent le lien du salon, y compris les visiteurs",
-    "Are you sure?": "Êtes-vous sûr ?",
-    "Are you sure you want to reject the invitation?": "Êtes-vous sûr de vouloir rejeter l'invitation ?",
-    "Are you sure you want to upload the following files?": "Êtes-vous sûr de vouloir télécharger les fichiers suivants ?",
+    "Are you sure?": "Êtes-vous sûr(e) ?",
+    "Are you sure you want to reject the invitation?": "Voulez-vous vraiment rejeter l'invitation ?",
+    "Are you sure you want to upload the following files?": "Voulez-vous vraiment envoyer les fichiers suivants ?",
     "Attachment": "Pièce jointe",
-    "Autoplay GIFs and videos": "Jouer automatiquement les GIFs et vidéos",
+    "Autoplay GIFs and videos": "Jouer automatiquement les GIFs et les vidéos",
     "%(senderName)s banned %(targetName)s.": "%(senderName)s a banni %(targetName)s.",
     "Ban": "Bannir",
     "Banned users": "Utilisateurs bannis",
-    "Bans user with given id": "Bannit l'utilisateur avec un identifiant donné",
+    "Bans user with given id": "Bannit l'utilisateur à partir de son identifiant",
     "Blacklisted": "Sur liste noire",
     "Bug Report": "Rapport d'erreur",
     "Call Timeout": "Délai d’appel expiré",
     "Can't connect to homeserver - please check your connectivity and ensure your <a>homeserver's SSL certificate</a> is trusted.": "Connexion au Home Server impossible - merci de vérifier votre connectivité et que le <a>certificat SSL de votre Home Server</a> est de confiance.",
-    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Impossible de se connecter au homeserver en HTTP si l'URL dans la barre de votre explorateur est en HTTPS. Utilisez HTTPS ou <a>activez le support des scripts non-vérifiés</a>.",
-    "Can't load user settings": "Impossible de charger les paramètres utilisateur",
+    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Impossible de se connecter au serveur d'accueil en HTTP si l'URL dans la barre de votre explorateur est en HTTPS. Utilisez HTTPS ou <a>activez le support des scripts non-vérifiés</a>.",
+    "Can't load user settings": "Impossible de charger les paramètres de l'utilisateur",
     "Change Password": "Changer le mot de passe",
-    "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s a changé son nom d’affichage de  %(oldDisplayName)s en %(displayName)s.",
-    "%(senderName)s changed their profile picture.": "%(senderName)s a changé sa photo de profil.",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s a changé le niveau de pouvoir de %(powerLevelDiffText)s.",
+    "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s a changé son nom affiché de %(oldDisplayName)s en %(displayName)s.",
+    "%(senderName)s changed their profile picture.": "%(senderName)s a changé son image de profil.",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s a changé le rang de %(powerLevelDiffText)s.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s a changé le nom du salon en %(roomName)s.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s a changé le sujet du salon en \"%(topic)s\".",
-    "Changes to who can read history will only apply to future messages in this room": "Les changements de visibilité de l’historique de ce salon ne s’appliquent qu’aux messages futurs",
-    "Changes your display nickname": "Change votre nom d'affichage",
-    "Claimed Ed25519 fingerprint key": "Clé empreinte Ed25519 revendiquée",
+    "Changes to who can read history will only apply to future messages in this room": "Les changements de visibilité de l’historique de ce salon ne s’appliquent qu’aux futurs messages",
+    "Changes your display nickname": "Change votre nom affiché",
+    "Claimed Ed25519 fingerprint key": "Clé de l'empreinte Ed25519 revendiquée",
     "Clear Cache and Reload": "Vider le cache et rafraîchir",
     "Clear Cache": "Vider le cache",
     "Click here": "Cliquer ici",
@@ -112,10 +112,10 @@
     "Click to unmute audio": "Cliquer pour rétablir le son",
     "Command error": "Erreur de commande",
     "Commands": "Commandes",
-    "Conference call failed.": "Échec de la conférence.",
-    "Conference calling is in development and may not be reliable.": "Les appels en conférence sont encore en développement et sont potentiellement peu fiables.",
-    "Conference calls are not supported in encrypted rooms": "Les appels en conférence ne sont pas supportés dans les salons chiffrés",
-    "Conference calls are not supported in this client": "Les appels en conférence ne sont pas supportés avec ce client",
+    "Conference call failed.": "Échec de la téléconférence.",
+    "Conference calling is in development and may not be reliable.": "Les appels en téléconférence sont encore en développement et sont potentiellement peu fiables.",
+    "Conference calls are not supported in encrypted rooms": "Les appels en téléconférence ne sont pas supportés dans les salons chiffrés",
+    "Conference calls are not supported in this client": "Les appels en téléconférence ne sont pas supportés par ce client",
     "Confirm password": "Confirmer le mot de passe",
     "Confirm your new password": "Confirmer votre nouveau mot de passe",
     "Continue": "Continuer",
@@ -133,25 +133,25 @@
     "Decryption error": "Erreur de déchiffrement",
     "Delete": "Supprimer",
     "demote": "rétrograder",
-    "Deops user with given id": "Retire les privilèges d’opérateur d’un utilisateur avec un ID donné",
+    "Deops user with given id": "Retire le rang d’opérateur d’un utilisateur à partir de son identifiant",
     "Device ID": "Identifiant de l'appareil",
     "Devices": "Appareils",
-    "Devices will not yet be able to decrypt history from before they joined the room": "Les appareils ne seront pas capables de déchiffrer l’historique précédant leur adhésion au salon",
+    "Devices will not yet be able to decrypt history from before they joined the room": "Les appareils ne pourront pas encore déchiffrer l'historique de messages d'avant leur arrivée sur le salon",
     "ml": "Malayalam",
     "Failed to join room": "Échec lors de l’adhésion au salon",
-    "Failed to kick": "Échec lors de l'expulsion",
-    "Failed to leave room": "Échec du départ",
-    "Failed to load timeline position": "Erreur lors du chargement de la position dans la chronologie",
-    "Failed to lookup current room": "Échec lors de la recherche du salon actuel",
-    "Failed to mute user": "Échec lors de l'interruption de l'utilisateur",
-    "Failed to reject invite": "Échec lors du rejet de l'invitation",
-    "Failed to reject invitation": "Échec lors du rejet de l'invitation",
-    "Failed to save settings": "Échec lors de la sauvegarde des paramètres",
-    "Failed to send email": "Échec lors de l’envoi de l’e-mail",
-    "Failed to send request.": "Erreur lors de l'envoi de la requête.",
-    "Failed to set display name": "Échec lors de l'enregistrement du nom d'affichage",
-    "Failed to set up conference call": "Échec lors de l’établissement de l’appel",
-    "Failed to toggle moderator status": "Échec lors de l’activation du statut de modérateur",
+    "Failed to kick": "Échec de l'exclusion",
+    "Failed to leave room": "Échec du départ du salon",
+    "Failed to load timeline position": "Échec du chargement de la position dans la chronologie",
+    "Failed to lookup current room": "Échec de la recherche du salon actuel",
+    "Failed to mute user": "Échec de la mise en sourdine de l'utilisateur",
+    "Failed to reject invite": "Échec du rejet de l'invitation",
+    "Failed to reject invitation": "Échec du rejet de l'invitation",
+    "Failed to save settings": "Échec de la sauvegarde des paramètres",
+    "Failed to send email": "Échec de l’envoi de l’e-mail",
+    "Failed to send request.": "Échec de l'envoi de la requête.",
+    "Failed to set display name": "Échec de l'enregistrement du nom affiché",
+    "Failed to set up conference call": "Échec de l’établissement de la téléconférence",
+    "Failed to toggle moderator status": "Échec de l’activation du statut de modérateur",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s a accepté l’invitation de %(displayName)s.",
     "Access Token:": "Jeton d’accès :",
     "Always show message timestamps": "Toujours afficher l'heure des messages",
@@ -159,8 +159,8 @@
     "%(senderName)s answered the call.": "%(senderName)s a répondu à l’appel.",
     "An error has occurred.": "Une erreur est survenue.",
     "Email": "E-mail",
-    "Failed to unban": "Échec de l'amnistie",
-    "Failed to upload file": "Échec du téléchargement",
+    "Failed to unban": "Échec de la révocation du bannissement",
+    "Failed to upload file": "Échec de l'envoi du fichier",
     "Failed to verify email address: make sure you clicked the link in the email": "Échec de la vérification de l’adresse e-mail : vérifiez que vous avez bien cliqué sur le lien dans l’e-mail",
     "Failure to create room": "Échec de la création du salon",
     "favourite": "favoris",
@@ -168,62 +168,62 @@
     "Fill screen": "Plein écran",
     "Filter room members": "Filtrer les membres du salon",
     "Forget room": "Oublier le salon",
-    "Forgot your password?": "Mot de passe perdu ?",
-    "For security, this session has been signed out. Please sign in again.": "Par sécurité, la session a expiré. Merci de vous authentifier à nouveau.",
-    "Found a bug?": "Trouvé un problème ?",
+    "Forgot your password?": "Mot de passe oublié ?",
+    "For security, this session has been signed out. Please sign in again.": "Par mesure de sécurité, la session a expiré. Merci de vous authentifier à nouveau.",
+    "Found a bug?": "Vous avez trouvé un problème ?",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s de %(fromPowerLevel)s à %(toPowerLevel)s",
-    "Guest users can't create new rooms. Please register to create room and start a chat.": "Les visiteurs ne peuvent créer de nouveaux salons. Merci de vous inscrire pour commencer une discussion.",
-    "Guest users can't upload files. Please register to upload.": "Les visiteurs ne peuvent pas télécharger de fichier. Veuillez vous inscrire pour télécharger.",
+    "Guest users can't create new rooms. Please register to create room and start a chat.": "Les visiteurs ne peuvent pas créer de nouveau salon. Veuillez vous inscrire pour créer un salon et commencer une discussion.",
+    "Guest users can't upload files. Please register to upload.": "Les visiteurs ne peuvent pas envoyer de fichier. Veuillez vous inscrire pour envoyer des fichiers.",
     "had": "avait",
     "Hangup": "Raccrocher",
     "Hide read receipts": "Cacher les accusés de lecture",
     "Hide Text Formatting Toolbar": "Cacher la barre de formatage de texte",
     "Historical": "Historique",
-    "Homeserver is": "Le homeserver est",
+    "Homeserver is": "Le serveur d'accueil est",
     "Identity Server is": "Le serveur d'identité est",
     "I have verified my email address": "J’ai vérifié mon adresse e-mail",
-    "Import E2E room keys": "Importer les clés de chiffrement de bout-en-bout",
+    "Import E2E room keys": "Importer les clés de chiffrement de bout en bout",
     "Incorrect verification code": "Code de vérification incorrect",
     "Interface Language": "Langue de l'interface",
-    "Invalid alias format": "Format de l'alias invalide",
-    "Invalid address format": "Format d'adresse invalide",
-    "Invalid Email Address": "Adresse e-mail invalide",
+    "Invalid alias format": "Format d'alias non valide",
+    "Invalid address format": "Format d'adresse non valide",
+    "Invalid Email Address": "Adresse e-mail non valide",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s a invité %(targetName)s.",
     "Invite new room members": "Inviter de nouveaux membres",
     "Invited": "Invités",
     "Invites": "Invitations",
-    "Invites user with given id to current room": "Inviter l’utilisateur avec un ID donné dans le salon actuel",
+    "Invites user with given id to current room": "Invite un utilisateur dans le salon actuel à partir de son identifiant",
     "is a": "est un",
     "'%(alias)s' is not a valid format for an address": "'%(alias)s' n'est pas un format valide pour une adresse",
     "'%(alias)s' is not a valid format for an alias": "'%(alias)s' n'est pas un format valide pour un alias",
-    "%(displayName)s is typing": "%(displayName)s est en train d'écrire",
-    "Sign in with": "Je veux m'identifier avec",
+    "%(displayName)s is typing": "%(displayName)s écrit",
+    "Sign in with": "Se connecter avec",
     "Join Room": "Rejoindre le salon",
-    "joined and left": "a rejoint et quitté",
+    "joined and left": "a rejoint et est parti",
     "joined": "a rejoint",
     "%(targetName)s joined the room.": "%(targetName)s a rejoint le salon.",
-    "Joins room with given alias": "Rejoint le salon avec l'alias défini",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s a expulsé %(targetName)s.",
-    "Kick": "Expulser",
-    "Kicks user with given id": "Expulse l'utilisateur avec l'ID donné",
+    "Joins room with given alias": "Rejoint le salon avec l'alias renseigné",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s a exclu %(targetName)s.",
+    "Kick": "Exclure",
+    "Kicks user with given id": "Exclut l'utilisateur à partir de son identifiant",
     "Labs": "Laboratoire",
     "Leave room": "Quitter le salon",
-    "left and rejoined": "a quitté et rejoint",
-    "left": "a quitté",
+    "left and rejoined": "est parti et revenu",
+    "left": "est parti",
     "%(targetName)s left the room.": "%(targetName)s a quitté le salon.",
     "Level": "Niveau",
-    "Local addresses for this room:": "Adresse locale pour ce salon :",
+    "Local addresses for this room:": "Adresses locales pour ce salon :",
     "Logged in as:": "Identifié en tant que :",
-    "Login as guest": "S'identifier en tant que visiteur",
+    "Login as guest": "Se connecter en tant que visiteur",
     "Logout": "Se déconnecter",
-    "Low priority": "Priorité basse",
-    "%(senderName)s made future room history visible to": "%(senderName)s a rendu l'historique visible à",
+    "Low priority": "Priorité faible",
+    "%(senderName)s made future room history visible to": "%(senderName)s a rendu l'historique futur visible à",
     "Manage Integrations": "Gestion des intégrations",
-    "Markdown is disabled": "Le formatage \"Markdown\" est désactivé",
-    "Markdown is enabled": "Le formatage “Markdown” est activé",
-    "matrix-react-sdk version:": "Version du matrix-react-sdk :",
+    "Markdown is disabled": "Le formatage Markdown est désactivé",
+    "Markdown is enabled": "Le formatage Markdown est activé",
+    "matrix-react-sdk version:": "Version de matrix-react-sdk :",
     "Members only": "Membres uniquement",
-    "Message not sent due to unknown devices being present": "Message non-envoyé à cause de la présence d’appareils non-vérifiés",
+    "Message not sent due to unknown devices being present": "Message non envoyé à cause de la présence d’appareils inconnus",
     "Missing room_id in request": "Absence du room_id dans la requête",
     "Missing user_id in request": "Absence du user_id dans la requête",
     "Mobile phone number": "Numéro de téléphone mobile",
@@ -231,11 +231,11 @@
     "Must be viewing a room": "Doit être en train de visualiser un salon",
     "my Matrix ID": "mon identifiant Matrix",
     "Name": "Nom",
-    "Never send encrypted messages to unverified devices from this device": "Ne jamais envoyer de message chiffré aux appareils non-vérifiés depuis cet appareil",
-    "Never send encrypted messages to unverified devices in this room": "Ne jamais envoyer de message chiffré aux appareils non-vérifiés dans ce salon",
-    "Never send encrypted messages to unverified devices in this room from this device": "Ne jamais envoyer de message chiffré aux appareils non-vérifiés dans ce salon depuis cet appareil",
+    "Never send encrypted messages to unverified devices from this device": "Ne jamais envoyer de message chiffré aux appareils non vérifiés depuis cet appareil",
+    "Never send encrypted messages to unverified devices in this room": "Ne jamais envoyer de message chiffré aux appareils non vérifiés dans ce salon",
+    "Never send encrypted messages to unverified devices in this room from this device": "Ne jamais envoyer de message chiffré aux appareils non vérifiés dans ce salon depuis cet appareil",
     "New address (e.g. #foo:%(localDomain)s)": "Nouvelle adresse (par ex. #foo:%(localDomain)s)",
-    "New Composer & Autocomplete": "Nouveau compositeur et autocomplétion",
+    "New Composer & Autocomplete": "Nouveau compositeur et auto-complétion",
     "New password": "Nouveau mot de passe",
     "New passwords don't match": "Les mots de passe ne correspondent pas",
     "New passwords must match each other.": "Les nouveaux mots de passe doivent être identiques.",
@@ -247,8 +247,8 @@
     "NOT verified": "NON vérifié",
     "No devices with registered encryption keys": "Pas d’appareil avec des clés de chiffrement enregistrées",
     "No more results": "Fin des résultats",
-    "No results": "Pas de résultats",
-    "unknown error code": "Code erreur inconnu",
+    "No results": "Pas de résultat",
+    "unknown error code": "Code d'erreur inconnu",
     "OK": "OK",
     "Once encryption is enabled for a room it cannot be turned off again (for now)": "Une fois le chiffrement activé dans un salon il ne peut pas être désactivé (pour le moment)",
     "Only people who have been invited": "Seul les personnes ayant été invitées",
@@ -260,26 +260,26 @@
     "Phone": "Numéro de téléphone",
     "Operation failed": "L'opération a échoué",
     "Bulk Options": "Options de masse",
-    "Changing password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Changer le mot de passe réinitialise actuellement les clés de chiffrement sur tous les appareils, rendant l’historique chiffré illisible, à moins d’exporter les clés du salon en avance de phase puis de les ré-importer. Ceci sera amélioré prochainement.",
+    "Changing password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Pour le moment, changer le mot de passe réinitialise les clés de chiffrement sur tous les appareils, rendant l’historique des discussions chiffrées illisible, à moins d’exporter d'abord les clés de salon puis de les ré-importer. Ceci sera amélioré prochainement.",
     "Default": "Par défaut",
     "Email address": "Adresse e-mail",
     "Error decrypting attachment": "Erreur lors du déchiffrement de la pièce jointe",
-    "Failed to set avatar.": "Erreur lors de la définition de la photo de profil.",
-    "For security, logging out will delete any end-to-end encryption keys from this browser. If you want to be able to decrypt your conversation history from future Riot sessions, please export your room keys for safe-keeping.": "Par sécurité une déconnexion supprimera toutes les clés de chiffrement de ce navigateur. Si vous voulez être capable de déchiffrer l’historique de votre conversation lors de sessions futures de Riot, merci d’exporter les clés pour le salon.",
-    "Guests can't set avatars. Please register.": "Les visiteurs ne peuvent définir de photo de profil. Merci de vous inscrire.",
-    "Guests can't use labs features. Please register.": "Les visiteurs ne peuvent utiliser les fonctionalités du laboratoire. Merci de vous inscrire.",
-    "Guests cannot join this room even if explicitly invited.": "Les visiteurs ne peuvent rejoindre ce salon, même si explicitement invités.",
-    "Invalid file%(extra)s": "Fichier %(extra)s invalide",
-    "Mute": "Couper le son",
+    "Failed to set avatar.": "Échec de la définition de l'avatar.",
+    "For security, logging out will delete any end-to-end encryption keys from this browser. If you want to be able to decrypt your conversation history from future Riot sessions, please export your room keys for safe-keeping.": "Par mesure de sécurité une déconnexion supprimera toutes les clés de chiffrement de ce navigateur. Si vous voulez être capable de déchiffrer l’historique de votre conversation lors des prochaines sessions de Riot, veuillez exporter les clés de salon pour les garder en lieu sûr.",
+    "Guests can't set avatars. Please register.": "Les visiteurs ne peuvent pas définir d'avatar. Veuillez vous inscrire.",
+    "Guests can't use labs features. Please register.": "Les visiteurs ne peuvent pas utiliser les fonctionnalités du laboratoire. Veuillez vous inscrire.",
+    "Guests cannot join this room even if explicitly invited.": "Les visiteurs ne peuvent pas rejoindre ce salon, même s'ils ont été explicitement invités.",
+    "Invalid file%(extra)s": "Fichier %(extra)s non valide",
+    "Mute": "Mettre en sourdine",
     "No users have specific privileges in this room": "Aucun utilisateur n’a de privilège spécifique dans ce salon",
     "olm version:": "version de olm :",
     "Once you've followed the link it contains, click below": "Une fois que vous aurez suivi le lien qu’il contient, cliquez ci-dessous",
-    "%(senderName)s placed a %(callType)s call.": "%(senderName)s a placé un appel %(callType)s.",
+    "%(senderName)s placed a %(callType)s call.": "%(senderName)s a passé un appel %(callType)s.",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Veuillez vérifier vos e-mails et cliquer sur le lien que vous avez reçu. Puis cliquez sur continuer.",
-    "Power level must be positive integer.": "Le niveau d'autorité doit être un entier positif.",
-    "Press": "Cliquer",
+    "Power level must be positive integer.": "Le rang doit être un entier positif.",
+    "Press": "Appuyer",
     "Privacy warning": "Alerte de confidentialité",
-    "Privileged Users": "Utilisateur privilégié",
+    "Privileged Users": "Utilisateurs privilégiés",
     "Profile": "Profil",
     "Reason": "Raison",
     "Revoke Moderator": "Révoquer le modérateur",
@@ -288,26 +288,26 @@
     "%(targetName)s rejected the invitation.": "%(targetName)s a rejeté l’invitation.",
     "Reject invitation": "Rejeter l'invitation",
     "Remove Contact Information?": "Supprimer les informations du contact ?",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s a supprimé son nom d’affichage (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s a supprimé sa photo de profil.",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s a supprimé son nom affiché (%(oldDisplayName)s).",
+    "%(senderName)s removed their profile picture.": "%(senderName)s a supprimé son image de profil.",
     "Remove %(threePid)s?": "Supprimer %(threePid)s ?",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s a demandé une conférence audio.",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s a demandé une téléconférence audio.",
     "Report it": "Le signaler",
-    "Resetting password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Réinitialiser le mot de passe va réinitialiser les clés de chiffrement sur tous les appareils, rendant l’historique chiffré illisible, à moins que vous ayez exporté les clés du salon en avance de phase puis que vous les ré-importiez. Cela sera amélioré prochainement.",
+    "Resetting password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Pour le moment, réinitialiser le mot de passe va réinitialiser les clés de chiffrement sur tous les appareils, rendant l’historique des salons chiffrés illisible, à moins que vous exportiez d'abord les clés de salon puis que vous les ré-importiez après. Cela sera amélioré prochainement.",
     "restore": "restaurer",
     "Return to app": "Retourner à l’application",
-    "Return to login screen": "Retourner à l’écran d’identification",
+    "Return to login screen": "Retourner à l’écran de connexion",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot n’a pas la permission de vous envoyer des notifications - merci de vérifier les paramètres de votre navigateur",
-    "Riot was not given permission to send notifications - please try again": "Riot n’a pas reçu la permission de vous envoyer des notifications - merci d’essayer à nouveau",
+    "Riot was not given permission to send notifications - please try again": "Riot n’a pas reçu la permission de vous envoyer des notifications - veuillez réessayer",
     "riot-web version:": "Version de riot-web :",
     "Room %(roomId)s not visible": "Le salon %(roomId)s n'est pas visible",
     "Room Colour": "Couleur du salon",
     "Room name (optional)": "Nom du salon (facultatif)",
     "Rooms": "Salons",
     "Scroll to bottom of page": "Aller en bas de la page",
-    "Scroll to unread messages": "Aller aux messages non-lus",
+    "Scroll to unread messages": "Aller aux messages non lus",
     "Search": "Rechercher",
-    "Search failed": "Erreur lors de la recherche",
+    "Search failed": "Échec de la recherche",
     "Searches DuckDuckGo for results": "Recherche des résultats dans DuckDuckGo",
     "Send a message (unencrypted)": "Envoyer un message (non chiffré)",
     "Send an encrypted message": "Envoyer un message chiffré",
@@ -322,93 +322,93 @@
     "Server may be unavailable or overloaded": "Le serveur semble être inaccessible ou surchargé",
     "Server may be unavailable, overloaded, or search timed out :(": "Le serveur semble être inaccessible, surchargé ou la recherche a expiré :(",
     "Server may be unavailable, overloaded, or the file too big": "Le serveur semble être inaccessible, surchargé ou le fichier est trop volumineux",
-    "Server may be unavailable, overloaded, or you hit a bug.": "Le serveur semble être indisponible, surchargé, ou vous avez rencontré un problème.",
+    "Server may be unavailable, overloaded, or you hit a bug.": "Le serveur semble être indisponible, surchargé ou vous avez rencontré un problème.",
     "Server unavailable, overloaded, or something else went wrong.": "Le serveur semble être inaccessible, surchargé ou quelque chose s'est mal passé.",
     "Session ID": "Identifiant de session",
-    "%(senderName)s set a profile picture.": "%(senderName)s a défini une photo de profil.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s a défini son nom d’affichage comme %(displayName)s.",
+    "%(senderName)s set a profile picture.": "%(senderName)s a défini une image de profil.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s a défini son nom affiché comme %(displayName)s.",
     "Show panel": "Dévoiler le panneau",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Afficher l’heure au format am/pm (par ex. 2:30pm)",
     "Signed Out": "Déconnecté",
-    "Sign in": "S'identifier",
+    "Sign in": "Se connecter",
     "Sign out": "Se déconnecter",
     "since the point in time of selecting this option": "depuis le moment où cette option a été sélectionnée",
     "since they joined": "depuis qu’ils ont rejoint le salon",
     "since they were invited": "depuis qu’ils ont été invités",
     "Some of your messages have not been sent.": "Certains de vos messages n’ont pas été envoyés.",
     "Someone": "Quelqu'un",
-    "Sorry, this homeserver is using a login which is not recognised ": "Désolé, ce homeserver utilise un identifiant qui n’est pas reconnu ",
-    "Start a chat": "Démarrer une discussion",
-    "Start Chat": "Démarrer une discussion",
+    "Sorry, this homeserver is using a login which is not recognised ": "Désolé, ce serveur d'accueil utilise un identifiant qui n’est pas reconnu ",
+    "Start a chat": "Commencer une discussion",
+    "Start Chat": "Commencer une discussion",
     "Submit": "Soumettre",
     "Success": "Succès",
-    "tag as %(tagName)s": "marquer comme %(tagName)s",
-    "tag direct chat": "marquer comme discussion directe",
+    "tag as %(tagName)s": "étiqueter comme %(tagName)s",
+    "tag direct chat": "étiqueter comme discussion directe",
     "The default role for new room members is": "Le rôle par défaut des nouveaux membres est",
     "The main address for this room is": "L'adresse principale pour ce salon est",
-    "This action cannot be performed by a guest user. Please register to be able to do this.": "Cette action ne peut être effectuée par un visiteur. Merci de vous inscrire afin de pouvoir effectuer cette action.",
+    "This action cannot be performed by a guest user. Please register to be able to do this.": "Cette action ne peut pas être effectuée par un visiteur. Veuillez vous inscrire afin de pouvoir effectuer cette action.",
     "This email address is already in use": "Cette adresse e-mail est déjà utilisée",
     "This email address was not found": "Cette adresse e-mail n’a pas été trouvée",
     "%(actionVerb)s this person?": "%(actionVerb)s cette personne ?",
-    "The email address linked to your account must be entered.": "L’adresse e-mail liée à votre compte doit être entrée.",
-    "The file '%(fileName)s' exceeds this home server's size limit for uploads": "Le fichier '%(fileName)s' dépasse la taille limite autorisée pour les téléchargements sur ce homeserver",
-    "The file '%(fileName)s' failed to upload": "Le fichier '%(fileName)s' n’a pas pu être téléchargé",
+    "The email address linked to your account must be entered.": "L’adresse e-mail liée à votre compte doit être renseignée.",
+    "The file '%(fileName)s' exceeds this home server's size limit for uploads": "Le fichier '%(fileName)s' dépasse la taille limite autorisée pour les envois sur ce serveur d'accueil",
+    "The file '%(fileName)s' failed to upload": "Le fichier '%(fileName)s' n’a pas pu être envoyé",
     "The remote side failed to pick up": "Le correspondant n’a pas décroché",
     "This room has no local addresses": "Ce salon n'a pas d'adresse locale",
-    "This room is not recognised.": "Ce salon n'a pas été reconnu.",
-    "These are experimental features that may break in unexpected ways": "Ces fonctionnalités sont expérimentales et risquent de mal fonctionner",
-    "The visibility of existing history will be unchanged": "La visibilité de l’historique existant sera inchangée",
-    "This doesn't appear to be a valid email address": "Cette adresse n’a pas l’air d’être valide",
+    "This room is not recognised.": "Ce salon n'est pas reconnu.",
+    "These are experimental features that may break in unexpected ways": "Ce sont des fonctionnalités expérimentales qui peuvent créer des problèmes inattendus",
+    "The visibility of existing history will be unchanged": "La visibilité de l’historique existant restera inchangée",
+    "This doesn't appear to be a valid email address": "Cette adresse e-mail ne semble pas valide",
     "this invitation?": "cette invitation ?",
     "This is a preview of this room. Room interactions have been disabled": "Ceci est un aperçu du salon. Les interactions avec le salon ont été désactivées",
-    "This phone number is already in use": "Ce numéro de téléphone est déja utilisé",
+    "This phone number is already in use": "Ce numéro de téléphone est déjà utilisé",
     "This room is not accessible by remote Matrix servers": "Ce salon n’est pas accessible par les serveurs Matrix distants",
     "This room's internal ID is": "L'identifiant interne de ce salon est",
     "times": "fois",
     "To ban users": "Pour bannir des utilisateurs",
     "to browse the directory": "pour parcourir le répertoire",
     "To configure the room": "Pour configurer le salon",
-    "to demote": "pour réduire la priorité",
-    "to favourite": "pour marquer comme favori",
+    "to demote": "pour rétrograder",
+    "to favourite": "pour ajouter aux favoris",
     "To invite users into the room": "Pour inviter des utilisateurs dans le salon",
     "to join the discussion": "pour rejoindre la discussion",
-    "To kick users": "Pour expulser des utilisateurs",
+    "To kick users": "Pour exclure des utilisateurs",
     "To link to a room it must have": "Pour avoir un lien vers un salon, il doit avoir",
     "to make a room or": "pour créer un salon ou",
     "To remove other users' messages": "Pour supprimer les messages des autres utilisateurs",
-    "To reset your password, enter the email address linked to your account": "Pour réinitialiser votre mot de passe, merci d’entrer l’adresse e-mail liée à votre compte",
+    "To reset your password, enter the email address linked to your account": "Pour réinitialiser votre mot de passe, veuillez saisir l’adresse e-mail liée à votre compte",
     "to restore": "pour restaurer",
-    "To send events of type": "Pour envoyer des évènements du type",
+    "To send events of type": "Pour envoyer des événements du type",
     "To send messages": "Pour envoyer des messages",
-    "to start a chat with someone": "pour démarrer une discussion avec quelqu’un",
-    "to tag as %(tagName)s": "pour marquer comme %(tagName)s",
-    "to tag direct chat": "pour marquer comme conversation directe",
-    "To use it, just wait for autocomplete results to load and tab through them.": "Pour l’utiliser, attendez simplement que les résultats de l’auto-complétion s’affichent et défilez avec la touche Tab.",
-    "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Un instant donné de la chronologie n’a pu être chargé car vous n’avez pas la permission de le visualiser.",
-    "Tried to load a specific point in this room's timeline, but was unable to find it.": "Un instant donné de la chronologie n’a pu être chargé car il n’a pas pu être trouvé.",
-    "Turn Markdown off": "Désactiver le formatage ’Markdown’",
-    "Turn Markdown on": "Activer le formatage ’Markdown’",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s a activé le chiffrement de bout-en-bout (algorithme %(algorithm)s).",
+    "to start a chat with someone": "pour commencer une discussion avec quelqu’un",
+    "to tag as %(tagName)s": "pour étiqueter comme %(tagName)s",
+    "to tag direct chat": "pour étiqueter comme discussion directe",
+    "To use it, just wait for autocomplete results to load and tab through them.": "Pour l’utiliser, attendez simplement que les résultats de l’auto-complétion s’affichent et faites-les défiler avec la touche Tab.",
+    "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "L'instant donné de la chronologie n’a pu être chargé car vous n’avez pas la permission de visualiser le message concerné.",
+    "Tried to load a specific point in this room's timeline, but was unable to find it.": "L'instant donné de la chronologie n’a pu être chargé car il n’a pas pu être trouvé.",
+    "Turn Markdown off": "Désactiver le formatage Markdown",
+    "Turn Markdown on": "Activer le formatage Markdown",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s a activé le chiffrement de bout en bout (algorithme %(algorithm)s).",
     "Unable to add email address": "Impossible d'ajouter l'adresse e-mail",
     "Unable to remove contact information": "Impossible de supprimer les informations du contact",
     "Unable to restore previous session": "Impossible de rétablir la session précédente",
     "Unable to verify email address.": "Impossible de vérifier l’adresse e-mail.",
-    "Unban": "Amnistier (annuler le bannissement)",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s a amnistié %(targetName)s.",
+    "Unban": "Révoquer le bannissement",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s a révoqué le bannissement de %(targetName)s.",
     "Unable to capture screen": "Impossible de capturer l'écran",
     "Unable to enable Notifications": "Impossible d'activer les notifications",
-    "Unable to load device list": "Impossible de charger la liste d'appareils",
+    "Unable to load device list": "Impossible de charger la liste des appareils",
     "Unencrypted room": "Salon non chiffré",
     "unencrypted": "non chiffré",
     "unknown device": "appareil inconnu",
     "Unknown room %(roomId)s": "Salon inconnu %(roomId)s",
     "unknown": "inconnu",
-    "Unmute": "Activer le son",
-    "uploaded a file": "téléchargé un fichier",
-    "Upload avatar": "Télécharger une photo de profil",
-    "Upload Failed": "Erreur lors du téléchargement",
-    "Upload Files": "Télécharger les fichiers",
-    "Upload file": "Télécharger un fichier",
+    "Unmute": "Désactiver la sourdine",
+    "uploaded a file": "a envoyé un fichier",
+    "Upload avatar": "Envoyer un avatar",
+    "Upload Failed": "Échec de l'envoi",
+    "Upload Files": "Envoyer les fichiers",
+    "Upload file": "Envoyer un fichier",
     "Usage": "Utilisation",
     "Use with caution": "Utiliser avec prudence",
     "User ID": "Identifiant d'utilisateur",
@@ -416,15 +416,15 @@
     "User name": "Nom d'utilisateur",
     "Users": "Utilisateurs",
     "User": "Utilisateur",
-    "Verification Pending": "Vérification en cours",
+    "Verification Pending": "Vérification en attente",
     "Verification": "Vérification",
     "verified": "vérifié",
     "Video call": "Appel vidéo",
     "Voice call": "Appel vocal",
-    "VoIP conference finished.": "Conférence audio terminée.",
-    "VoIP conference started.": "Conférence audio démarrée.",
-    "VoIP is unsupported": "Appels voix non supportés",
-    "(warning: cannot be disabled again!)": "(attention : ne peut être désactivé !)",
+    "VoIP conference finished.": "Téléconférence VoIP terminée.",
+    "VoIP conference started.": "Téléconférence VoIP démarrée.",
+    "VoIP is unsupported": "Voix sur IP non supportée",
+    "(warning: cannot be disabled again!)": "(attention : ne peut pas être désactivé !)",
     "Warning!": "Attention !",
     "Who can access this room?": "Qui peut accéder au salon ?",
     "Who can read history?": "Qui peut lire l'historique ?",
@@ -432,27 +432,27 @@
     "Who would you like to communicate with?": "Avec qui voulez-vous communiquer ?",
     "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s a révoqué l’invitation de %(targetName)s.",
     "Would you like to": "Voulez-vous",
-    "You are already in a call.": "Vous êtes déjà dans un appel.",
+    "You are already in a call.": "Vous avez déjà un appel en cours.",
     "You're not in any rooms yet! Press": "Vous n’êtes dans aucun salon ! Cliquez",
     "You are trying to access %(roomName)s.": "Vous essayez d'accéder à %(roomName)s.",
     "You cannot place a call with yourself.": "Vous ne pouvez pas passer d'appel avec vous-même.",
-    "You cannot place VoIP calls in this browser.": "Vous ne pouvez pas passer d'appel vocal dans ce navigateur.",
+    "You cannot place VoIP calls in this browser.": "Vous ne pouvez pas passer d'appel en Voix sur IP dans ce navigateur.",
     "You do not have permission to post to this room": "Vous n’avez pas la permission de poster dans ce salon",
-    "You have been invited to join this room by %(inviterName)s": "Vous avez été invité à joindre ce salon par %(inviterName)s",
-    "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device": "Vous avez été déconnecté de tous vos appareils et ne recevrez plus de notifications. Pour réactiver les notifications, identifiez vous à nouveau sur tous les appareils",
-    "You have no visible notifications": "Vous n'avez pas de notifications visibles",
-    "you must be a": "vous devez être un",
+    "You have been invited to join this room by %(inviterName)s": "Vous avez été invité(e) à rejoindre ce salon par %(inviterName)s",
+    "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device": "Vous avez été déconnecté de tous vos appareils et ne recevrez plus de notifications. Pour réactiver les notifications, reconnectez-vous sur tous les appareils",
+    "You have no visible notifications": "Vous n'avez pas de notification visible",
+    "you must be a": "vous devez être un(e)",
     "You need to be able to invite users to do that.": "Vous devez être capable d’inviter des utilisateurs pour faire ça.",
     "You need to be logged in.": "Vous devez être identifié.",
     "You need to enter a user name.": "Vous devez entrer un nom d’utilisateur.",
     "You need to log back in to generate end-to-end encryption keys for this device and submit the public key to your homeserver. This is a once off; sorry for the inconvenience.": "Vous devez vous connecter à nouveau pour générer les clés de chiffrement pour cet appareil, et soumettre la clé publique à votre homeserver. Cette action ne se reproduira pas ; veuillez nous excuser pour la gêne occasionnée.",
-    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Votre adresse e-mail ne semble pas associée à un identifiant Matrix sur ce homeserver.",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Votre adresse e-mail ne semble pas être associée à un identifiant Matrix sur ce serveur d'accueil.",
     "Your password has been reset": "Votre mot de passe a été réinitialisé",
-    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Votre mot de passe a été mis à jour avec succès. Vous ne recevrez plus de notification sur vos appareils jusqu’à ce que vous vous identifiez à nouveau",
-    "You seem to be in a call, are you sure you want to quit?": "Vous semblez avoir un appel en cours, êtes-vous sûr(e) de vouloir quitter ?",
-    "You seem to be uploading files, are you sure you want to quit?": "Vous semblez être en train de télécharger des fichiers, êtes-vous sûr(e) de vouloir quitter ?",
+    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Votre mot de passe a été mis à jour avec succès. Vous ne recevrez plus de notification sur vos autres appareils jusqu’à ce que vous vous identifiez à nouveau",
+    "You seem to be in a call, are you sure you want to quit?": "Vous semblez avoir un appel en cours, voulez-vous vraiment partir ?",
+    "You seem to be uploading files, are you sure you want to quit?": "Vous semblez être en train d'envoyer des fichiers, voulez-vous vraiment partir ?",
     "You should not yet trust it to secure data": "Vous ne pouvez pas encore lui faire confiance pour sécuriser vos données",
-    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Vous ne pourrez pas annuler ce changement car vous promouvez l’utilisateur au même niveau d'autorité que le vôtre.",
+    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Vous ne pourrez pas annuler cette modification car vous promouvez l’utilisateur au même rang que le vôtre.",
     "Sun": "Dim",
     "Mon": "Lun",
     "Tue": "Mar",
@@ -461,29 +461,29 @@
     "Fri": "Ven",
     "Sat": "Sam",
     "Jan": "Jan",
-    "Feb": "Fev",
+    "Feb": "Fév",
     "Mar": "Mar",
     "Apr": "Avr",
     "May": "Mai",
-    "Jun": "Jun",
-    "Jul": "Jul",
-    "Aug": "Aou",
+    "Jun": "Juin",
+    "Jul": "Juil",
+    "Aug": "Aoû",
     "Sep": "Sep",
     "Oct": "Oct",
     "Nov": "Nov",
-    "Dec": "Dec",
+    "Dec": "Déc",
     "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s %(day)s %(monthName)s %(time)s",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s %(day)s %(monthName)s %(fullYear)s %(time)s",
     "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
-    "Set a display name:": "Définir un nom d’affichage :",
-    "Upload an avatar:": "Télécharger une photo de profil :",
-    "This server does not support authentication with a phone number.": "Ce serveur ne supporte pas l’identification avec un numéro de téléphone.",
+    "Set a display name:": "Définir le nom affiché :",
+    "Upload an avatar:": "Envoyer un avatar :",
+    "This server does not support authentication with a phone number.": "Ce serveur ne prend pas en charge l’authentification avec un numéro de téléphone.",
     "Missing password.": "Mot de passe manquant.",
     "Passwords don't match.": "Les mots de passe ne correspondent pas.",
     "Password too short (min %(MIN_PASSWORD_LENGTH)s).": "Mot de passe trop court (min %(MIN_PASSWORD_LENGTH)s).",
-    "This doesn't look like a valid email address.": "Cela ne semble pas être une adresse e-mail valide.",
-    "This doesn't look like a valid phone number.": "Cela ne semble pas être un numéro de téléphone valide.",
-    "User names may only contain letters, numbers, dots, hyphens and underscores.": "Les noms d’utilisateurs ne peuvent contenir que des lettres, chiffres, points et tirets hauts ou bas.",
+    "This doesn't look like a valid email address.": "Cette adresse e-mail ne semble pas valide.",
+    "This doesn't look like a valid phone number.": "Ce numéro de téléphone ne semble pas valide.",
+    "User names may only contain letters, numbers, dots, hyphens and underscores.": "Les noms d’utilisateurs ne peuvent contenir que des lettres, des chiffres, des points, des traits d'union et des tirets bas.",
     "An unknown error occurred.": "Une erreur inconnue est survenue.",
     "I already have an account": "J’ai déjà un compte",
     "An error occurred: %(error_string)s": "Une erreur est survenue : %(error_string)s",
@@ -494,8 +494,8 @@
     "Encrypt room": "Chiffrer le salon",
     "There are no visible files in this room": "Il n'y a pas de fichier visible dans ce salon",
     "Room": "Salon",
-    "Connectivity to the server has been lost.": "La connectivité au serveur a été perdue.",
-    "Sent messages will be stored until your connection has returned.": "Les messages envoyés seront stockés jusqu’à ce que votre connection revienne.",
+    "Connectivity to the server has been lost.": "La connexion au serveur a été perdue.",
+    "Sent messages will be stored until your connection has returned.": "Les messages envoyés seront stockés jusqu’à ce que votre connexion revienne.",
     "Auto-complete": "Auto-complétion",
     "Resend all": "Tout renvoyer",
     "(~%(searchCount)s results)": "(~%(searchCount)s résultats)",
@@ -505,7 +505,7 @@
     "Active call": "Appel en cours",
     "code": "code",
     "quote": "citer",
-    "bullet": "puce",
+    "bullet": "liste à puces",
     "numbullet": "liste numérotée",
     "%(severalUsers)sjoined %(repeats)s times": "%(severalUsers)sont rejoint le salon %(repeats)s fois",
     "%(oneUser)sjoined %(repeats)s times": "%(oneUser)sa rejoint le salon %(repeats)s fois",
@@ -514,161 +514,161 @@
     "%(severalUsers)sleft %(repeats)s times": "%(severalUsers)sont quitté le salon %(repeats)s fois",
     "%(oneUser)sleft %(repeats)s times": "%(oneUser)sa quitté le salon %(repeats)s fois",
     "%(severalUsers)sleft": "%(severalUsers)sont quitté le salon",
-    "%(oneUser)sleft": "%(oneUser)sont quitté le salon",
+    "%(oneUser)sleft": "%(oneUser)sa quitté le salon",
     "%(severalUsers)sjoined and left %(repeats)s times": "%(severalUsers)sont rejoint et quitté le salon %(repeats)s fois",
     "%(oneUser)sjoined and left %(repeats)s times": "%(oneUser)sa rejoint et quitté le salon%(repeats)s fois",
     "%(severalUsers)sjoined and left": "%(severalUsers)sont rejoint et quitté le salon",
     "%(oneUser)sjoined and left": "%(oneUser)sa rejoint et quitté le salon",
-    "%(severalUsers)sleft and rejoined %(repeats)s times": "%(severalUsers)sont quitté et à nouveau joint le salon %(repeats)s fois",
-    "%(oneUser)sleft and rejoined %(repeats)s times": "%(oneUser)sa quitté et à nouveau joint le salon %(repeats)s fois",
-    "%(severalUsers)sleft and rejoined": "%(severalUsers)sont quitté et à nouveau joint le salon",
-    "%(oneUser)sleft and rejoined": "%(oneUser)sa quitté et à nouveau joint le salon",
-    "%(severalUsers)srejected their invitations %(repeats)s times": "%(severalUsers)sont rejeté leurs invitations %(repeats)s fois",
+    "%(severalUsers)sleft and rejoined %(repeats)s times": "%(severalUsers)sont quitté et sont revenus dans le salon %(repeats)s fois",
+    "%(oneUser)sleft and rejoined %(repeats)s times": "%(oneUser)sa quitté et est revenu dans le salon %(repeats)s fois",
+    "%(severalUsers)sleft and rejoined": "%(severalUsers)sont quitté et sont revenus dans le salon",
+    "%(oneUser)sleft and rejoined": "%(oneUser)sa quitté et est revenu dans le salon",
+    "%(severalUsers)srejected their invitations %(repeats)s times": "%(severalUsers)sont rejeté leur invitation %(repeats)s fois",
     "%(oneUser)srejected their invitation %(repeats)s times": "%(oneUser)sa rejeté son invitation %(repeats)s fois",
     "%(severalUsers)srejected their invitations": "%(severalUsers)sont rejeté leur invitation",
     "%(oneUser)srejected their invitation": "%(oneUser)sa rejeté son invitation",
-    "%(severalUsers)shad their invitations withdrawn %(repeats)s times": "%(severalUsers)sont vu leur invitation rétractée %(repeats)s fois",
-    "%(oneUser)shad their invitation withdrawn %(repeats)s times": "%(oneUser)sa vu son invitation rétractée %(repeats)s fois",
-    "%(severalUsers)shad their invitations withdrawn": "%(severalUsers)sont vu leur invitation rétractée",
-    "%(oneUser)shad their invitation withdrawn": "%(oneUser)sa vu son invitation rétractée",
+    "%(severalUsers)shad their invitations withdrawn %(repeats)s times": "%(severalUsers)sont vu leur invitation révoquée %(repeats)s fois",
+    "%(oneUser)shad their invitation withdrawn %(repeats)s times": "%(oneUser)sa vu son invitation révoquée %(repeats)s fois",
+    "%(severalUsers)shad their invitations withdrawn": "%(severalUsers)sont vu leur invitation révoquée",
+    "%(oneUser)shad their invitation withdrawn": "%(oneUser)sa vu son invitation révoquée",
     "were invited %(repeats)s times": "ont été invité(e)s %(repeats)s fois",
     "was invited %(repeats)s times": "a été invité(e) %(repeats)s fois",
     "were invited": "ont été invité(e)s",
     "were banned %(repeats)s times": "ont été banni(e)s %(repeats)s fois",
-    "was banned %(repeats)s times": "été banni(e) %(repeats)s fois",
+    "was banned %(repeats)s times": "a été banni(e) %(repeats)s fois",
     "were banned": "ont été banni(e)s",
-    "were unbanned %(repeats)s times": "ont été amnistié(e)s %(repeats)s fois",
-    "was unbanned %(repeats)s times": "a été amnistié(e) %(repeats)s fois",
-    "were unbanned": "ont été amnistié(e)s",
-    "were kicked %(repeats)s times": "ont été expulsé(e)s %(repeats)s fois",
-    "was kicked %(repeats)s times": "a été expulsé(e) %(repeats)s fois",
-    "were kicked": "ont été expulsé(e)s",
+    "were unbanned %(repeats)s times": "ont vu leur bannissement révoqué %(repeats)s fois",
+    "was unbanned %(repeats)s times": "a vu son bannissement révoqué %(repeats)s fois",
+    "were unbanned": "ont vu leur bannissement révoqué",
+    "were kicked %(repeats)s times": "ont été exclu(e)s %(repeats)s fois",
+    "was kicked %(repeats)s times": "a été exclu(e) %(repeats)s fois",
+    "were kicked": "ont été exclu(e)s",
     "%(severalUsers)schanged their name %(repeats)s times": "%(severalUsers)sont changé leur nom %(repeats)s fois",
     "%(oneUser)schanged their name %(repeats)s times": "%(oneUser)sa changé son nom %(repeats)s fois",
     "%(severalUsers)schanged their name": "%(severalUsers)sont changé leur nom",
     "%(oneUser)schanged their name": "%(oneUser)sa changé son nom",
-    "%(severalUsers)schanged their avatar %(repeats)s times": "%(severalUsers)sont changé leur photo de profil %(repeats)s fois",
-    "%(oneUser)schanged their avatar %(repeats)s times": "%(oneUser)sa changé sa photo de profil %(repeats)s fois",
-    "%(severalUsers)schanged their avatar": "%(severalUsers)sont changé leur photo de profil",
-    "%(oneUser)schanged their avatar": "%(oneUser)sa changé sa photo de profil",
-    "Please select the destination room for this message": "Merci de sélectionner un salon de destination pour ce message",
+    "%(severalUsers)schanged their avatar %(repeats)s times": "%(severalUsers)sont changé leur avatar %(repeats)s fois",
+    "%(oneUser)schanged their avatar %(repeats)s times": "%(oneUser)sa changé son avatar %(repeats)s fois",
+    "%(severalUsers)schanged their avatar": "%(severalUsers)sont changé leur avatar",
+    "%(oneUser)schanged their avatar": "%(oneUser)sa changé son avatar",
+    "Please select the destination room for this message": "Merci de sélectionner le salon de destination pour ce message",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s a supprimé le nom du salon.",
-    "Analytics": "Outils d'analyse",
-    "Opt out of analytics": "Refuser de participer",
-    "Riot collects anonymous analytics to allow us to improve the application.": "Riot recueille des données anonymes qui nous permettent d’analyser et améliorer l’application.",
-    "Passphrases must match": "Les phrases secrètes doivent être identiques",
-    "Passphrase must not be empty": "La phrase secrète ne doit pas être vide",
-    "Export room keys": "Exporter les clés du salon",
-    "Enter passphrase": "Entrer la phrase secrète",
-    "Confirm passphrase": "Confirmer la phrase secrète",
-    "Import room keys": "Importer les clés du salon",
+    "Analytics": "Collecte de données",
+    "Opt out of analytics": "Ne pas envoyer ses données",
+    "Riot collects anonymous analytics to allow us to improve the application.": "Riot collecte des données anonymes qui nous permettent d’améliorer l’application.",
+    "Passphrases must match": "Les phrases de passe doivent être identiques",
+    "Passphrase must not be empty": "La phrase de passe ne peut pas être vide",
+    "Export room keys": "Exporter les clés de salon",
+    "Enter passphrase": "Saisir la phrase de passe",
+    "Confirm passphrase": "Confirmer la phrase de passe",
+    "Import room keys": "Importer les clés de salon",
     "File to import": "Fichier à importer",
     "This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.": "Ce processus vous permet d’exporter dans un fichier local les clés pour les messages que vous avez reçus dans des salons chiffrés. Il sera ensuite possible d’importer ce fichier dans un autre client Matrix, afin de permettre à ce client de pouvoir déchiffrer ces messages.",
-    "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "Le fichier exporté permettra à tout ceux qui peuvent le lire de déchiffrer tous les messages chiffrés auxquels vous avez accès, vous devez donc être vigilant et le stocker dans un endroit sûr. Afin de protéger ce fichier, entrez ci-dessous une phrase secrète qui sera utilisée pour chiffrer les données exportées. Seule l’utilisation de la même phrase secrète permettra de déchiffrer et importer les données.",
-    "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Ce processus vous permet d’importer les clés de chiffrement que vous avez précédemment exportées depuis un autre client Matrix. Vous serez alors capable de déchiffrer n’importe quel messages que l’autre client peut déchiffer.",
-    "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Le fichier exporté est protégé par une phrase secrète. Vous devez entrer cette phrase secrète ici pour déchiffrer le fichier.",
-    "You must join the room to see its files": "Vous devez joindre le salon pour voir ses fichiers",
+    "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "Le fichier exporté permettra à tout ceux qui peuvent le lire de déchiffrer tous les messages chiffrés auxquels vous avez accès, vous devez donc être vigilant et le stocker dans un endroit sûr. Afin de protéger ce fichier, saisissez ci-dessous une phrase secrète qui sera utilisée pour chiffrer les données exportées. Seule l’utilisation de la même phrase secrète permettra de déchiffrer et importer les données.",
+    "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Ce processus vous permet d’importer les clés de chiffrement que vous avez précédemment exportées depuis un autre client Matrix. Vous serez alors capable de déchiffrer n’importe quel message que l’autre client pouvait déchiffrer.",
+    "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Le fichier exporté est protégé par une phrase de passe. Vous devez saisir cette phrase de passe ici pour déchiffrer le fichier.",
+    "You must join the room to see its files": "Vous devez rejoindre le salon pour voir ses fichiers",
     "Reject all %(invitedRooms)s invites": "Rejeter la totalité des %(invitedRooms)s invitations",
-    "Start new chat": "Démarrer une nouvelle discussion",
-    "Guest users can't invite users. Please register.": "Les visiteurs ne peuvent inviter d’autres utilisateurs. Merci de vous inscrire.",
-    "Failed to invite": "Echec de l'invitation",
-    "Failed to invite user": "Echec lors de l'invitation de l'utilisateur",
-    "Failed to invite the following users to the %(roomName)s room:": "Echec lors de l’invitation des utilisateurs suivants dans le salon %(roomName)s :",
+    "Start new chat": "Commencer une nouvelle discussion",
+    "Guest users can't invite users. Please register.": "Les visiteurs ne peuvent inviter d’autres utilisateurs. Veuillez vous inscrire.",
+    "Failed to invite": "Échec de l'invitation",
+    "Failed to invite user": "Échec de l'invitation de l'utilisateur",
+    "Failed to invite the following users to the %(roomName)s room:": "Échec de l’invitation des utilisateurs suivants dans le salon %(roomName)s :",
     "Confirm Removal": "Confirmer la suppression",
-    "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Êtes vous sûr de vouloir supprimer cet événement ? Notez que si vous supprimez le changement de nom d’un salon ou la mise à jour du sujet d’un salon, il est possible que le changement soit annulé.",
+    "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Voulez-vous vraiment supprimer cet événement ? Notez que si vous supprimez le changement du nom ou du sujet d’un salon, il est possible que ce changement soit annulé.",
     "Unknown error": "Erreur inconnue",
     "Incorrect password": "Mot de passe incorrect",
-    "This will make your account permanently unusable. You will not be able to re-register the same user ID.": "Ceci rendra votre compte inutilisable de manière permanente. Vous ne pourrez pas enregistrer à nouveau le même identifiant utilisateur.",
+    "This will make your account permanently unusable. You will not be able to re-register the same user ID.": "Ceci rendra votre compte inutilisable de manière permanente. Vous ne pourrez pas vous réinscrire avec le même identifiant utilisateur.",
     "This action is irreversible.": "Cette action est irréversible.",
-    "To continue, please enter your password.": "Pour continuer, merci d'entrer votre mot de passe.",
+    "To continue, please enter your password.": "Pour continuer, veuillez saisir votre mot de passe.",
     "To verify that this device can be trusted, please contact its owner using some other means (e.g. in person or a phone call) and ask them whether the key they see in their User Settings for this device matches the key below:": "Pour vérifier que vous pouvez faire confiance à cet appareil, merci de contacter son propriétaire par un autre moyen (par ex. en personne ou par téléphone) et demandez lui si la clé qu’il/elle voit dans ses Paramètres Utilisateur pour cet appareil correspond à la clé ci-dessous :",
     "Device name": "Nom de l'appareil",
     "Device key": "Clé de l'appareil",
-    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this device and you probably want to press the blacklist button instead.": "Si les clés correspondent, cliquer sur le bouton ’Vérifier’ ci-dessous. Si non, alors quelqu’un d’autre est en train d’intercepter cet appareil et vous devriez certainement cliquer sur le bouton ’Blacklister' (Ajouter à la liste noire) à la place.",
-    "In future this verification process will be more sophisticated.": "À l’avenir ce processus de vérification sera simplifié et plus sophistiqué.",
+    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this device and you probably want to press the blacklist button instead.": "Si les clés correspondent, cliquer sur le bouton \"Vérifier\" ci-dessous. Sinon quelqu’un d’autre est en train d’intercepter cet appareil et vous devriez certainement cliquer sur le bouton \"Ajouter à la liste noire\" à la place.",
+    "In future this verification process will be more sophisticated.": "À l’avenir ce processus de vérification sera plus sophistiqué.",
     "Verify device": "Vérifier cet appareil",
     "I verify that the keys match": "J’ai vérifié que les clés correspondaient",
-    "We encountered an error trying to restore your previous session. If you continue, you will need to log in again, and encrypted chat history will be unreadable.": "Nous avons rencontré une erreur en essayant de rétablir votre session précédente. Si vous continuez, vous devrez vous identifier à nouveau et l’historique chiffré de vos conversations sera illisible.",
+    "We encountered an error trying to restore your previous session. If you continue, you will need to log in again, and encrypted chat history will be unreadable.": "Nous avons rencontré une erreur en essayant de rétablir votre session précédente. Si vous continuez, vous devrez vous identifier à nouveau et l’historique de vos discussions chiffrées sera illisible.",
     "Unable to restore session": "Impossible de restaurer la session",
     "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "Si vous avez utilisé une version plus récente de Riot précédemment, votre session risque d’être incompatible avec cette version. Fermez cette fenêtre et retournez à la version plus récente.",
     "Continue anyway": "Continuer quand même",
-    "Your display name is how you'll appear to others when you speak in rooms. What would you like it to be?": "Votre nom d’affichage est la manière dont vous allez apparaître pour les autres quand vous parlerez dans les salons. Que voulez-vous qu’il soit ?",
-    "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "Vous êtes en train d’ajouter à la liste noire des appareils non-vérifiés ; pour envoyer des messages à ces appareils vous devez les vérifier.",
-    "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Nous vous recommandons d’effectuer le processus de vérification pour tous les appareils afin de confirmer qu’ils appartiennent à leurs propriétaires légitimes, mais vous pouvez renvoyer le(s) message(s) sans vérifier si vous préférez.",
+    "Your display name is how you'll appear to others when you speak in rooms. What would you like it to be?": "Votre nom affiché est ce qui apparaîtra pour les autres quand vous parlerez dans les salons. Que voulez-vous qu’il soit ?",
+    "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "Vous êtes en train d’ajouter à la liste noire des appareils non vérifiés ; pour envoyer des messages à ces appareils vous devez les vérifier.",
+    "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Nous vous recommandons d’effectuer le processus de vérification pour tous les appareils afin de confirmer qu’ils appartiennent à leurs propriétaires légitimes, mais vous pouvez renvoyer le message sans vérifier si vous préférez.",
     "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" contient des appareils que vous n'avez encore jamais vus.",
     "Unknown devices": "Appareils inconnus",
     "Unknown Address": "Adresse inconnue",
-    "Unblacklist": "Réhabiliter",
-    "Blacklist": "Blacklister",
-    "Unverify": "Révoquer",
+    "Unblacklist": "Supprimer de la liste noire",
+    "Blacklist": "Ajouter à la liste noire",
+    "Unverify": "Révoquer la vérification",
     "Verify...": "Vérifier...",
     "ex. @bob:example.com": "ex. @bob:exemple.com",
     "Add User": "Ajouter l'utilisateur",
-    "This Home Server would like to make sure you are not a robot": "Ce homeserver veut vérifier que vous n’êtes pas un robot",
+    "This Home Server would like to make sure you are not a robot": "Ce serveur d'accueil veut vérifier que vous n’êtes pas un robot",
     "Sign in with CAS": "S'identifier avec CAS",
     "Custom Server Options": "Options de serveur personnalisées",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "Vous pouvez utiliser les options de serveur personnalisées pour vous identifier auprès d’un autre serveur Matrix en spécifiant l’URL d’un homeserver différent.",
-    "This allows you to use this app with an existing Matrix account on a different home server.": "Cela vous permet d’utiliser l’application avec un compte Matrix existant sur un homeserver différent.",
-    "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "Vous pouvez également configurer un serveur d’identité différent mais cela risque entre autres d’empêcher les interactions par e-mail avec les autres utilisateurs.",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "Vous pouvez utiliser les options de serveur personnalisées pour vous identifier auprès d’un autre serveur Matrix en spécifiant l’URL d’un serveur d'accueil différent.",
+    "This allows you to use this app with an existing Matrix account on a different home server.": "Cela vous permet d’utiliser l’application avec un compte Matrix existant sur un serveur d'accueil différent.",
+    "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "Vous pouvez également configurer un serveur d’identité différent mais cela risque entre autres d’empêcher les interactions basées sur l'adresse e-mail avec les autres utilisateurs.",
     "Dismiss": "Ignorer",
     "Please check your email to continue registration.": "Merci de vérifier votre e-mail afin de continuer votre inscription.",
     "Token incorrect": "Jeton incorrect",
-    "A text message has been sent to": "Un message texte a été envoyé au",
-    "Please enter the code it contains:": "Merci d'entre le code qu'il contient :",
+    "A text message has been sent to": "Un SMS a été envoyé au",
+    "Please enter the code it contains:": "Merci de saisir le code qu'il contient :",
     "powered by Matrix": "propulsé par Matrix",
-    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Si vous n’entrez pas d’adresse e-mail, vous ne pourrez pas réinitialiser votre mot de passe. Êtes vous sûr ?",
-    "You are registering with %(SelectedTeamName)s": "Vous vous enregistrez auprès de %(SelectedTeamName)s",
+    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Si vous ne renseignez pas d’adresse e-mail, vous ne pourrez pas réinitialiser votre mot de passe. En êtes vous sûr(e) ?",
+    "You are registering with %(SelectedTeamName)s": "Vous vous inscrivez auprès de %(SelectedTeamName)s",
     "Default server": "Serveur par défaut",
     "Custom server": "Serveur personnalisé",
-    "Home server URL": "URL du homeserver",
+    "Home server URL": "URL du serveur d'accueil",
     "Identity server URL": "URL du serveur d’identité",
     "What does this mean?": "Qu’est ce que cela signifie ?",
     "Error decrypting audio": "Erreur lors du déchiffrement de l’audio",
     "Error decrypting image": "Erreur lors du déchiffrement de l’image",
-    "Image '%(Body)s' cannot be displayed.": "L'image '%(Body)s' ne peut être affichée.",
-    "This image cannot be displayed.": "Cette image ne peut être affichée.",
+    "Image '%(Body)s' cannot be displayed.": "L'image \"%(Body)s\" ne peut pas être affichée.",
+    "This image cannot be displayed.": "Cette image ne peut pas être affichée.",
     "Error decrypting video": "Erreur lors du déchiffrement de la vidéo",
     "Add an Integration": "Ajouter une intégration",
-    "URL Previews": "Aperçus d'URL",
-    "Disable URL previews by default for participants in this room": "Désactiver les aperçus d'URL par défaut pour les participants de ce salon",
-    "URL previews are %(globalDisableUrlPreview)s by default for participants in this room.": "Les aperçus d'URL sont %(globalDisableUrlPreview)s par défaut pour les participants de ce salon.",
-    "Enable URL previews for this room (affects only you)": "Activer les aperçus d'URL pour ce salon (n'affecte que vous)",
-    "Drop file here to upload": "Déposer le fichier ici pour le télécharger",
-    " (unsupported)": " (non supporté)",
-    "Ongoing conference call%(supportedText)s.": "Appel conférence en cours%(supportedText)s.",
+    "URL Previews": "Aperçus des liens",
+    "Disable URL previews by default for participants in this room": "Désactiver les aperçus des liens par défaut pour les participants de ce salon",
+    "URL previews are %(globalDisableUrlPreview)s by default for participants in this room.": "Les aperçus des liens sont %(globalDisableUrlPreview)s par défaut pour les participants de ce salon.",
+    "Enable URL previews for this room (affects only you)": "Activer les aperçus des liens pour ce salon (n'affecte que vous)",
+    "Drop file here to upload": "Déposer le fichier ici pour l'envoyer",
+    " (unsupported)": " (pas pris en charge)",
+    "Ongoing conference call%(supportedText)s.": "Téléconférence en cours%(supportedText)s.",
     "Online": "En ligne",
-    "Offline": "Déconnecté",
-    "Disable URL previews for this room (affects only you)": "Désactiver les aperçus d'URL pour ce salon (n'affecte que vous)",
+    "Offline": "Hors ligne",
+    "Disable URL previews for this room (affects only you)": "Désactiver les aperçus des liens pour ce salon (n'affecte que vous)",
     "Desktop specific": "Spécifique à l'application de bureau",
     "Start automatically after system login": "Démarrer automatiquement après la phase d'authentification du système",
     "Idle": "Inactif",
-    "Jump to first unread message.": "Aller au premier message non-lu.",
+    "Jump to first unread message.": "Aller au premier message non lu.",
     "Options": "Options",
-    "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Vous êtes sur le point d’accéder à un site tiers afin de pouvoir vous identifier pour utiliser %(integrationsUrl)s. Voulez vous continuer ?",
+    "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Vous êtes sur le point d’accéder à un site tiers afin de pouvoir vous identifier pour utiliser %(integrationsUrl)s. Voulez-vous continuer ?",
     "Removed or unknown message type": "Type de message inconnu ou supprimé",
     "disabled": "désactivé",
     "enabled": "activé",
-    "Set a Display Name": "Définir un nom d’affichage",
+    "Set a Display Name": "Définir le nom affiché",
     "for %(amount)ss": "depuis %(amount)ss",
     "for %(amount)sm": "depuis %(amount)sm",
     "for %(amount)sh": "depuis %(amount)sh",
     "for %(amount)sd": "depuis %(amount)sj",
-    "$senderDisplayName changed the room avatar to <img/>": "$senderDisplayName a changé l’image de profil du salon en <img/>",
-    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s a supprimé l’image de profil du salon.",
-    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s a changé l’image de profil de %(roomName)s",
+    "$senderDisplayName changed the room avatar to <img/>": "$senderDisplayName a changé l’avatar du salon en <img/>",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s a supprimé l'avatar du salon.",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s a changé l’avatar de %(roomName)s",
     "Device already verified!": "Appareil déjà vérifié !",
     "Export": "Exporter",
     "Failed to register as guest:": "Échec de l’inscription en tant que visiteur :",
-    "Guest access is disabled on this Home Server.": "L’accès en tant que visiteur est désactivé sur ce homeserver.",
+    "Guest access is disabled on this Home Server.": "L’accès en tant que visiteur est désactivé sur ce serveur d'accueil.",
     "Import": "Importer",
     "Incorrect username and/or password.": "Nom d’utilisateur et/ou mot de passe incorrect.",
     "Results from DuckDuckGo": "Résultats de DuckDuckGo",
-    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Les clés de signature que vous avez transmises correspondent aux clés que vous avez reçues de l’appareil %(deviceId)s de %(userId)s. L’appareil est vérifié.",
-    "This Home Server does not support login using email address.": "Ce serveur ne supporte pas l’identification par e-mail.",
-    "There was a problem logging in.": "Un problème a été rencontré lors de l’identification.",
+    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "La clé de signature que vous avez transmise correspond à la clé que vous avez reçue de l’appareil %(deviceId)s de %(userId)s. L’appareil est marqué comme vérifié.",
+    "This Home Server does not support login using email address.": "Ce serveur d'accueil ne supporte pas l’authentification par e-mail.",
+    "There was a problem logging in.": "Un problème est survenu lors de l’authentification.",
     "Unknown (user, device) pair:": "Couple (utilisateur, appareil) inconnu :",
-    "Unrecognised command:": "Commande non-reconnue :",
-    "Unrecognised room alias:": "Alias de salon non-reconnu :",
+    "Unrecognised command:": "Commande non reconnue :",
+    "Unrecognised room alias:": "Alias de salon non reconnu :",
     "Use compact timeline layout": "Utiliser l'affichage compact",
     "Verified key": "Clé vérifiée",
     "WARNING: Device already verified, but keys do NOT MATCH!": "ATTENTION : appareil déjà vérifié mais les clés NE CORRESPONDENT PAS !",
@@ -678,78 +678,78 @@
     "No Microphones detected": "Aucun micro détecté",
     "No Webcams detected": "Aucune webcam détectée",
     "No media permissions": "Pas de permission pour les médias",
-    "You may need to manually permit Riot to access your microphone/webcam": "Il est possible que vous deviez manuellement permettre à Riot d’accéder à votre micro/webcam",
+    "You may need to manually permit Riot to access your microphone/webcam": "Il est possible que vous deviez manuellement autoriser Riot à accéder à votre micro/webcam",
     "Default Device": "Appareil par défaut",
     "Microphone": "Micro",
     "Camera": "Caméra",
     "Add a topic": "Ajouter un sujet",
     "Anyone": "N'importe qui",
-    "Are you sure you want to leave the room '%(roomName)s'?": "Êtes-vous sûr de vouloir quitter le salon '%(roomName)s' ?",
-    "Custom level": "Niveau personnalisé",
+    "Are you sure you want to leave the room '%(roomName)s'?": "Voulez-vous vraiment quitter le salon \"%(roomName)s\" ?",
+    "Custom level": "Rang personnalisé",
     "Device ID:": "Identifiant de l'appareil :",
-    "device id: ": "identifiant appareil : ",
+    "device id: ": "identifiant de l'appareil : ",
     "Device key:": "Clé de l’appareil :",
     "Email address (optional)": "Adresse e-mail (facultatif)",
     "Mobile phone number (optional)": "Numéro de téléphone (facultatif)",
     "Password:": "Mot de passe :",
     "Register": "S'inscrire",
-    "Remote addresses for this room:": "Supprimer l'adresse pour ce salon :",
+    "Remote addresses for this room:": "Adresses distantes pour ce salon :",
     "Save": "Enregistrer",
-    "Tagged as: ": "Étiquetter comme : ",
-    "You have <a>disabled</a> URL previews by default.": "Vous avez <a>désactivé</a> les aperçus d’URL par défaut.",
-    "You have <a>enabled</a> URL previews by default.": "Vous avez <a>activé</a> les aperçus d’URL par défaut.",
-    "You have entered an invalid contact. Try using their Matrix ID or email address.": "Vous avez entré un contact invalide. Essayez d’utiliser leur identifiant Matrix ou leur adresse email.",
+    "Tagged as: ": "Étiqueté comme : ",
+    "You have <a>disabled</a> URL previews by default.": "Vous avez <a>désactivé</a> les aperçus de lien par défaut.",
+    "You have <a>enabled</a> URL previews by default.": "Vous avez <a>activé</a> les aperçus de lien par défaut.",
+    "You have entered an invalid contact. Try using their Matrix ID or email address.": "Vous avez saisi un contact non valide. Essayez d’utiliser leur identifiant Matrix ou leur adresse e-mail.",
     "Hide removed messages": "Cacher les messages supprimés",
     "Add": "Ajouter",
     "%(count)s new messages|one": "%(count)s nouveau message",
     "%(count)s new messages|other": "%(count)s nouveaux messages",
-    "Disable markdown formatting": "Désactiver le formattage markdown",
-    "Error: Problem communicating with the given homeserver.": "Erreur : problème de communication avec le homeserver.",
-    "Failed to fetch avatar URL": "Échec lors de la récupération de l’URL de l’avatar",
-    "The phone number entered looks invalid": "Le numéro de téléphone entré semble être invalide",
+    "Disable markdown formatting": "Désactiver le formatage markdown",
+    "Error: Problem communicating with the given homeserver.": "Erreur : problème de communication avec le serveur d'accueil renseigné.",
+    "Failed to fetch avatar URL": "Échec de la récupération de l’URL de l’avatar",
+    "The phone number entered looks invalid": "Le numéro de téléphone entré ne semble pas être valide",
     "This room is private or inaccessible to guests. You may be able to join if you register.": "Ce salon est privé ou interdits aux visiteurs. Vous pourrez peut-être le joindre si vous vous enregistrez.",
-    "Uploading %(filename)s and %(count)s others|zero": "Téléchargement de %(filename)s",
-    "Uploading %(filename)s and %(count)s others|one": "Téléchargement de %(filename)s et %(count)s autre",
-    "Uploading %(filename)s and %(count)s others|other": "Téléchargement de %(filename)s et %(count)s autres",
+    "Uploading %(filename)s and %(count)s others|zero": "Envoi de %(filename)s",
+    "Uploading %(filename)s and %(count)s others|one": "Envoi de %(filename)s et %(count)s autre",
+    "Uploading %(filename)s and %(count)s others|other": "Envoi de %(filename)s et %(count)s autres",
     "You must <a>register</a> to use this functionality": "Vous devez vous <a>inscrire</a> pour utiliser cette fonctionnalité",
-    "<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.": "<a>Tout renvoyer</a> ou <a>tout annuler</a> maintenant. Vous pouvez aussi sélectionner des messages individuels à envoyer ou annuler.",
+    "<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.": "<a>Tout renvoyer</a> ou <a>tout annuler</a> maintenant. Vous pouvez aussi sélectionner des messages individuels à renvoyer ou annuler.",
     "Create new room": "Créer un nouveau salon",
     "Welcome page": "Page d'accueil",
     "Room directory": "Répertoire des salons",
-    "Start chat": "Démarrer une discussion",
+    "Start chat": "Commencer une discussion",
     "New Password": "Nouveau mot de passe",
-    "Start chatting": "Démarrer une discussion",
-    "Start Chatting": "Démarrer une discussion",
+    "Start chatting": "Commencer une discussion",
+    "Start Chatting": "Commencer une discussion",
     "Click on the button below to start chatting!": "Cliquer sur le bouton ci-dessous pour commencer une discussion !",
-    "Create a new chat or reuse an existing one": "Démarrer une nouvelle discussion ou en réutiliser une existante",
-    "You already have existing direct chats with this user:": "Vous avez déjà des discussions en cours avec cet utilisateur :",
+    "Create a new chat or reuse an existing one": "Commencer une nouvelle discussion ou en réutiliser une existante",
+    "You already have existing direct chats with this user:": "Vous avez déjà des discussions directes avec cet utilisateur :",
     "Username available": "Nom d'utilisateur disponible",
     "Username not available": "Nom d'utilisateur indisponible",
     "Something went wrong!": "Quelque chose s’est mal passé !",
-    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Cela sera le nom de votre compte sur le serveur  <span></span>, ou vous pouvez sélectionner un <a>autre serveur</a>.",
-    "If you already have a Matrix account you can <a>log in</a> instead.": "Si vous avez déjà un compte Matrix vous pouvez vous <a>identifier</a> à la place.",
+    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Cela sera le nom de votre compte sur le serveur d'accueil  <span></span>, ou vous pouvez sélectionner un <a>autre serveur</a>.",
+    "If you already have a Matrix account you can <a>log in</a> instead.": "Si vous avez déjà un compte Matrix vous pouvez vous <a>connecter</a> à la place.",
     "a room": "un salon",
     "Accept": "Accepter",
     "Active call (%(roomName)s)": "Appel en cours (%(roomName)s)",
     "Admin tools": "Outils d'administration",
     "Alias (optional)": "Alias (facultatif)",
-    "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Impossible de se connecter au homeserver - veuillez vérifier votre connexion, assurez vous que vous faites confiance au <a>certificat SSL de votre homeserver</a>, et qu'aucune extension de navigateur ne bloque les requêtes.",
-    "<a>Click here</a> to join the discussion!": "<a>Cliquer ici</a> pour joindre la discussion !",
+    "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Impossible de se connecter au serveur d'accueil - veuillez vérifier votre connexion, assurez-vous que le <a>certificat SSL de votre serveur d'accueil</a> est un certificat de confiance, et qu'aucune extension du navigateur ne bloque les requêtes.",
+    "<a>Click here</a> to join the discussion!": "<a>Cliquer ici</a> pour rejoindre la discussion !",
     "Close": "Fermer",
     "Custom": "Personnaliser",
     "Decline": "Refuser",
     "Disable Notifications": "Désactiver les notifications",
     "Drop File Here": "Déposer le fichier Ici",
     "Enable Notifications": "Activer les notifications",
-    "Failed to upload profile picture!": "Échec du téléchargement de la photo de profil !",
+    "Failed to upload profile picture!": "Échec de l'envoi de l'image de profil !",
     "Incoming call from %(name)s": "Appel entrant de %(name)s",
     "Incoming video call from %(name)s": "Appel vidéo entrant de %(name)s",
     "Incoming voice call from %(name)s": "Appel vocal entrant de %(name)s",
-    "No display name": "Pas de nom d'affichage",
+    "No display name": "Pas de nom affiché",
     "Otherwise, <a>click here</a> to send a bug report.": "Sinon, <a>cliquer ici</a> pour envoyer un rapport d'erreur.",
-    "Private Chat": "Conversation privée",
-    "Public Chat": "Conversation publique",
-    "Reason: %(reasonText)s": "Raison: %(reasonText)s",
+    "Private Chat": "Discussion privée",
+    "Public Chat": "Discussion publique",
+    "Reason: %(reasonText)s": "Raison : %(reasonText)s",
     "Rejoin": "Rejoindre",
     "Room contains unknown devices": "Le salon contient des appareils inconnus",
     "%(roomName)s does not exist.": "%(roomName)s n'existe pas.",
@@ -757,23 +757,23 @@
     "Seen by %(userName)s at %(dateTime)s": "Vu par %(userName)s à %(dateTime)s",
     "Send anyway": "Envoyer quand même",
     "Show Text Formatting Toolbar": "Afficher la barre de formatage de texte",
-    "Start authentication": "Démarrer une authentification",
+    "Start authentication": "Commencer une authentification",
     "This invitation was sent to an email address which is not associated with this account:": "Cette invitation a été envoyée à une adresse e-mail qui n'est pas associée avec ce compte :",
     "This room": "Ce salon",
     "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "Impossible de vérifier que l'adresse à qui cette invitation a été envoyée correspond à celle associée à votre compte.",
     "Undecryptable": "Indéchiffrable",
     "Unencrypted message": "Message non chiffré",
     "unknown caller": "appelant inconnu",
-    "Unnamed Room": "Salon sans nom",
-    "Unverified": "Non verifié",
+    "Unnamed Room": "Salon anonyme",
+    "Unverified": "Non vérifié",
     "%(user)s is a": "%(user)s est un(e)",
-    "Username invalid: %(errMessage)s": "Nom d'utilisateur invalide : %(errMessage)s",
-    "Verified": "Verifié",
+    "Username invalid: %(errMessage)s": "Nom d'utilisateur non valide : %(errMessage)s",
+    "Verified": "Vérifié",
     "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "Souhaitez-vous <acceptText>accepter</acceptText> ou <declineText>refuser</declineText> cette invitation ?",
-    "You have been banned from %(roomName)s by %(userName)s.": "Vous avez été bannis de %(roomName)s par %(userName)s.",
-    "You have been kicked from %(roomName)s by %(userName)s.": "Vous avez été expulsé de %(roomName)s by %(userName)s.",
+    "You have been banned from %(roomName)s by %(userName)s.": "Vous avez été banni(e) de %(roomName)s par %(userName)s.",
+    "You have been kicked from %(roomName)s by %(userName)s.": "Vous avez été exclu de %(roomName)s par %(userName)s.",
     "You may wish to login with a different account, or add this email to this account.": "Vous souhaiteriez peut-être vous identifier avec un autre compte, ou ajouter cette e-mail à votre compte.",
-    "Your home server does not support device management.": "Votre homeserver ne supporte pas la gestion d'appareils.",
+    "Your home server does not support device management.": "Votre serveur d'accueil ne prend pas en charge la gestion d'appareils.",
     "(~%(count)s results)|one": "(~%(count)s résultat)",
     "(~%(count)s results)|other": "(~%(count)s résultats)",
     "Device Name": "Nom de l'appareil",
@@ -783,57 +783,57 @@
     "Encryption is not enabled in this room": "Le chiffrement n'est pas activé sur ce salon",
     "Home": "Accueil",
     "To link to a room it must have <a>an address</a>.": "Pour récupérer le lien vers un salon celui-ci doit avoir <a>une adresse</a>.",
-    "Upload new:": "Télécharger un nouveau :",
+    "Upload new:": "Envoyer un nouveau :",
     "And %(count)s more...": "Et %(count)s autres...",
-    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Joindre avec <voiceText>audio</voiceText> ou <videoText>vidéo</videoText>.",
+    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Rejoindre en <voiceText>audio</voiceText> ou en <videoText>vidéo</videoText>.",
     "Last seen": "Vu pour la dernière fois",
-    "Level:": "Niveau :",
+    "Level:": "Rang :",
     "Searching known users": "Recherche d'utilisateurs connus",
     "Set": "Défini",
-    "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (pouvoir %(powerLevelNumber)s)",
+    "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (rang %(powerLevelNumber)s)",
     "(could not connect media)": "(impossible de se connecter au média)",
     "(no answer)": "(pas de réponse)",
     "(unknown failure: %(reason)s)": "(erreur inconnue :  %(reason)s)",
     "Your browser does not support the required cryptography extensions": "Votre navigateur ne supporte pas les extensions cryptographiques nécessaires",
     "Not a valid Riot keyfile": "Fichier de clé Riot non valide",
-    "Authentication check failed: incorrect password?": "Erreur d’identification: mot de passe incorrect ?",
-    "Disable Peer-to-Peer for 1:1 calls": "Désactiver les appels 1:1 pair-à-pair",
+    "Authentication check failed: incorrect password?": "Erreur d’authentification : mot de passe incorrect ?",
+    "Disable Peer-to-Peer for 1:1 calls": "Désactiver les appels 1 à 1 pair-à-pair",
     "Do you want to set an email address?": "Souhaitez-vous configurer une adresse e-mail ?",
-    "This will allow you to reset your password and receive notifications.": "Ceci va vous permettre de réinitialiser votre mot de passe et de recevoir des notifications.",
-    "Press <StartChatButton> to start a chat with someone": "Cliquez sur <StartChatButton> pour entamer une discussion avec quelqu'un",
-    "You're not in any rooms yet! Press <CreateRoomButton> to make a room or <RoomDirectoryButton> to browse the directory": "Vous n'avez pas encore rejoint de salon ! Cliquez sur <CreateRoomButton> pour créer un salon ou sur <RoomDirectoryButton> pour explorer le répertoire",
-    "To return to your account in future you need to set a password": "Pour pouvoir accéder à votre compte dans le futur, vous devez enregistrer un mot de passe",
+    "This will allow you to reset your password and receive notifications.": "Ceci vous permettra de réinitialiser votre mot de passe et de recevoir des notifications.",
+    "Press <StartChatButton> to start a chat with someone": "Appuyez sur <StartChatButton> pour commencer une discussion avec quelqu'un",
+    "You're not in any rooms yet! Press <CreateRoomButton> to make a room or <RoomDirectoryButton> to browse the directory": "Vous n'avez pas encore rejoint de salon ! Appuyez sur <CreateRoomButton> pour créer un salon ou sur <RoomDirectoryButton> pour explorer le répertoire",
+    "To return to your account in future you need to set a password": "Pour pouvoir accéder à votre compte dans le futur, vous devez définir un mot de passe",
     "Skip": "Passer",
     "Start verification": "Commencer la vérification",
     "Share without verifying": "Partager sans vérifier",
     "Ignore request": "Ignorer la requête",
-    "You added a new device '%(displayName)s', which is requesting encryption keys.": "Vous avez ajouté un nouvel appareil, '%(displayName)s', qui demande des clés de chiffrement.",
-    "Your unverified device '%(displayName)s' is requesting encryption keys.": "Votre appareil non vérifié '%(displayName)s' demande des clés de chiffrement.",
+    "You added a new device '%(displayName)s', which is requesting encryption keys.": "Vous avez ajouté un nouvel appareil, \"%(displayName)s\", qui demande des clés de chiffrement.",
+    "Your unverified device '%(displayName)s' is requesting encryption keys.": "Votre appareil non vérifié \"%(displayName)s\" demande des clés de chiffrement.",
     "Encryption key request": "Requête de clé de chiffrement",
     "Updates": "Mises à jour",
     "Check for update": "Rechercher une mise à jour",
     "Add a widget": "Ajouter un widget",
     "Allow": "Autoriser",
-    "Changes colour scheme of current room": "Change le jeu de couleur du salon",
+    "Changes colour scheme of current room": "Change le jeu de couleurs du salon",
     "Delete widget": "Supprimer le widget",
-    "Define the power level of a user": "Définir le niveau de privilèges d'un utilisateur",
+    "Define the power level of a user": "Définir le rang d'un utilisateur",
     "Edit": "Modifier",
-    "Enable automatic language detection for syntax highlighting": "Activer la détection automatique de langue pour la correction orthographique",
+    "Enable automatic language detection for syntax highlighting": "Activer la détection automatique de la langue pour la correction orthographique",
     "Hide Apps": "Masquer les applications",
     "Hide join/leave messages (invites/kicks/bans unaffected)": "Masquer les messages d'arrivée/départ (n'affecte pas les invitations/exclusions/bannissements)",
-    "Hide avatar and display name changes": "Masquer les changements d'avatar et de nom",
-    "Matrix Apps": "Matrix Apps",
-    "Revoke widget access": "Désactiver les accès du widget",
-    "Sets the room topic": "Configure le sujet du salon",
+    "Hide avatar and display name changes": "Masquer les changements d'avatar et de nom affiché",
+    "Matrix Apps": "Applications Matrix",
+    "Revoke widget access": "Révoquer les accès du widget",
+    "Sets the room topic": "Défini le sujet du salon",
     "Show Apps": "Afficher les applications",
-    "To get started, please pick a username!": "Pour débuter, choisissez un nom d'utilisateur !",
+    "To get started, please pick a username!": "Pour commencer, choisissez un nom d'utilisateur !",
     "Unable to create widget.": "Impossible de créer le widget.",
-    "Unbans user with given id": "Amnistie l'utilisateur à partir de son identifiant",
+    "Unbans user with given id": "Révoque le bannissement de l'utilisateur à partir de son identifiant",
     "You are not in this room.": "Vous n'êtes pas dans ce salon.",
     "You do not have permission to do that in this room.": "Vous n'avez pas la permission d'effectuer cette action dans ce salon.",
-    "Autocomplete Delay (ms):": "Délai pour l'autocomplétion (ms) :",
-    "This Home server does not support groups": "Ce homeserver ne supporte pas les groupes",
-    "Loading device info...": "Chargement des informations sur l'appareil...",
+    "Autocomplete Delay (ms):": "Délai pour l'auto-complétion (ms) :",
+    "This Home server does not support groups": "Ce serveur d'accueil ne supporte pas les groupes",
+    "Loading device info...": "Chargement des informations de l'appareil...",
     "Groups": "Groupes",
     "Create a new group": "Créer un nouveau groupe",
     "Create Group": "Créer le groupe",
@@ -842,27 +842,36 @@
     "Create": "Créer",
     "Group ID": "Identifiant du groupe",
     "+example:%(domain)s": "+exemple:%(domain)s",
-    "Group IDs must be of the form +localpart:%(domain)s": "Les identifiants de groupe doivent être au format +localpart:%(domain)s",
-    "It is currently only possible to create groups on your own home server: use a group ID ending with %(domain)s": "Il n'est pas encore possible de créer des groupes sur votre propre homeserver : utilisez un identifiant de groupe terminant par %(domain)s",
-    "Room creation failed": "Impossible de créer le salon",
+    "Group IDs must be of the form +localpart:%(domain)s": "Les identifiants de groupe doivent être au format +partlocale:%(domain)s",
+    "It is currently only possible to create groups on your own home server: use a group ID ending with %(domain)s": "Pour le moment, il n'est possible de créer des groupes que sur votre propre serveur d'accueil : utilisez un identifiant de groupe terminant par %(domain)s",
+    "Room creation failed": "Échec de création du salon",
     "You are a member of these groups:": "Vous êtes membre des groupes suivants :",
     "Create a group to represent your community! Define a set of rooms and your own custom homepage to mark out your space in the Matrix universe.": "Créez un groupe pour représenter votre communauté ! Définissez un jeu de salons et votre propre page d'accueil pour marquer votre espace dans l'univers Matrix.",
     "Join an existing group": "Rejoindre un groupe existant",
     "To join an existing group you'll have to know its group identifier; this will look something like <i>+example:matrix.org</i>.": "Pour rejoindre un groupe existant, vous devez connaître l'identifiant de ce groupe ; il ressemblera à <i>+exemple:matrix.org</i>.",
     "Featured Rooms:": "Salons mis en avant :",
-    "Error whilst fetching joined groups": "Erreur en récupérant la liste des groupes",
+    "Error whilst fetching joined groups": "Erreur en récupérant la liste des groupes rejoints",
     "Featured Users:": "Utilisateurs mis en avant :",
     "Edit Group": "Modifier le groupe",
-    "Automatically replace plain text Emoji": "Remplacer automatiquement le texte par des Emoji",
-    "Failed to upload image": "Impossible de télécharger l'image",
-    "Failed to update group": "Impossible de modifier le groupe",
+    "Automatically replace plain text Emoji": "Remplacer automatiquement le texte par des Émoticônes",
+    "Failed to upload image": "Impossible d'envoyer l'image",
+    "Failed to update group": "Impossible de mettre à jour le groupe",
     "Hide avatars in user and room mentions": "Masquer les avatars dans les mentions d'utilisateur et de salon",
-    "Do you want to load widget from URL:": "Charger un widget venant de l’URL :",
-    "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s widget ajouté par %(senderName)s",
-    "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s widget supprimé par %(senderName)s",
-    "Publish this room to the public in %(domain)s's room directory?": "Publier ce salon dans le l'annuaire public de %(domain)s ?",
+    "Do you want to load widget from URL:": "Voulez-vous charger le widget depuis l’URL :",
+    "%(widgetName)s widget added by %(senderName)s": "Widget %(widgetName)s ajouté par %(senderName)s",
+    "%(widgetName)s widget removed by %(senderName)s": "Widget %(widgetName)s supprimé par %(senderName)s",
+    "Publish this room to the public in %(domain)s's room directory?": "Publier ce salon dans le répertoire de salons public de %(domain)s ?",
     "Integrations Error": "Erreur d'intégration",
     "Cannot add any more widgets": "Impossible d'ajouter plus de widgets",
     "The maximum permitted number of widgets have already been added to this room.": "Le nombre maximum de widgets autorisés a déjà été atteint pour ce salon.",
-    "NOTE: Apps are not end-to-end encrypted": "NOTE : Les applications ne sont pas chiffrées de bout en bout"
+    "NOTE: Apps are not end-to-end encrypted": "NOTE : Les applications ne sont pas chiffrées de bout en bout",
+    "AM": "AM",
+    "PM": "PM",
+    "%(weekDayName)s, %(monthName)s %(day)s": "%(weekDayName)s %(day)s %(monthName)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s %(day)s %(monthName)s %(fullYear)s",
+    "Copied!": "Copié !",
+    "Failed to copy": "Échec de la copie",
+    "Verifies a user, device, and pubkey tuple": "Vérifie un utilisateur, un appareil et une clé publique",
+    "%(widgetName)s widget modified by %(senderName)s": "Widget %(widgetName)s modifié par %(senderName)s",
+    "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "La vérification robot n'est pas encore disponible pour le bureau - veuillez utiliser un <a>navigateur</a>"
 }

From 7dfff429f221441680e4888799bb5e90ba6bac45 Mon Sep 17 00:00:00 2001
From: Walter <studinsky@gmail.com>
Date: Sat, 23 Sep 2017 18:25:18 +0000
Subject: [PATCH 036/123] Translated using Weblate (Ukrainian)

Currently translated at 13.0% (112 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
---
 src/i18n/strings/uk.json | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json
index 8f9c18356a..27b36b8da5 100644
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -101,5 +101,14 @@
     "Bug Report": "Звіт про помилку",
     "Bulk Options": "Групові параметри",
     "Call Timeout": "Час очікування виклика",
-    "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Не вдається підключитись до домашнього серверу - перевірте підключення, переконайтесь, що ваш <a>SSL-сертифікат домашнього сервера</a> є довіреним і що розширення браузера не блокує запити."
+    "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Не вдається підключитись до домашнього серверу - перевірте підключення, переконайтесь, що ваш <a>SSL-сертифікат домашнього сервера</a> є довіреним і що розширення браузера не блокує запити.",
+    "Can't load user settings": "Неможливо завантажити настройки користувача",
+    "Cannot add any more widgets": "Неможливо додати більше віджетів",
+    "Change Password": "Поміняти пароль",
+    "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s змінено з %(oldDisplayName)s на %(displayName)s.",
+    "%(senderName)s changed their profile picture.": "%(senderName)s змінив зображення профіля.",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s змінив(ла) рівень доступу для %(powerLevelDiffText)s.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s змінив(ла) назву кімнати на %(roomName)s.",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s видалив ім'я кімнати.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s змінив тему на %(topic)s."
 }

From 56bb932a9bb49bbfebf21db87aba7d88680f7f71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Mon, 25 Sep 2017 13:33:27 +0000
Subject: [PATCH 037/123] Translated using Weblate (French)

Currently translated at 99.8% (854 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
---
 src/i18n/strings/fr.json | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index bf83f394d5..85c9700bb8 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -50,7 +50,7 @@
     "Favourite": "Favoris",
     "Notifications": "Notifications",
     "Settings": "Paramètres",
-    "Failed to join the room": "Échec de l'adhésion au salon",
+    "Failed to join the room": "Échec de l'inscription au salon",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Un SMS a été envoyé à +%(msisdn)s. Merci de saisir le code de vérification qu'il contient",
     "accept": "Accepter",
     "%(targetName)s accepted an invitation.": "%(targetName)s a accepté une invitation.",
@@ -75,8 +75,8 @@
     "and %(count)s others...|one": "et un autre...",
     "An email has been sent to": "Un e-mail a été envoyé à",
     "A new password must be entered.": "Un nouveau mot de passe doit être saisi.",
-    "Anyone who knows the room's link, apart from guests": "Tout ceux qui connaissent le lien du salon, à part les visiteurs",
-    "Anyone who knows the room's link, including guests": "Tout ceux qui connaissent le lien du salon, y compris les visiteurs",
+    "Anyone who knows the room's link, apart from guests": "Tous ceux qui connaissent le lien du salon, à part les visiteurs",
+    "Anyone who knows the room's link, including guests": "Tous ceux qui connaissent le lien du salon, y compris les visiteurs",
     "Are you sure?": "Êtes-vous sûr(e) ?",
     "Are you sure you want to reject the invitation?": "Voulez-vous vraiment rejeter l'invitation ?",
     "Are you sure you want to upload the following files?": "Voulez-vous vraiment envoyer les fichiers suivants ?",
@@ -100,7 +100,7 @@
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s a changé le sujet du salon en \"%(topic)s\".",
     "Changes to who can read history will only apply to future messages in this room": "Les changements de visibilité de l’historique de ce salon ne s’appliquent qu’aux futurs messages",
     "Changes your display nickname": "Change votre nom affiché",
-    "Claimed Ed25519 fingerprint key": "Clé de l'empreinte Ed25519 revendiquée",
+    "Claimed Ed25519 fingerprint key": "Clé d'empreinte Ed25519 déclarée",
     "Clear Cache and Reload": "Vider le cache et rafraîchir",
     "Clear Cache": "Vider le cache",
     "Click here": "Cliquer ici",
@@ -138,10 +138,10 @@
     "Devices": "Appareils",
     "Devices will not yet be able to decrypt history from before they joined the room": "Les appareils ne pourront pas encore déchiffrer l'historique de messages d'avant leur arrivée sur le salon",
     "ml": "Malayalam",
-    "Failed to join room": "Échec lors de l’adhésion au salon",
+    "Failed to join room": "Échec de l’inscription au salon",
     "Failed to kick": "Échec de l'exclusion",
     "Failed to leave room": "Échec du départ du salon",
-    "Failed to load timeline position": "Échec du chargement de la position dans la chronologie",
+    "Failed to load timeline position": "Échec du chargement de la position dans l'historique",
     "Failed to lookup current room": "Échec de la recherche du salon actuel",
     "Failed to mute user": "Échec de la mise en sourdine de l'utilisateur",
     "Failed to reject invite": "Échec du rejet de l'invitation",
@@ -216,7 +216,7 @@
     "Logged in as:": "Identifié en tant que :",
     "Login as guest": "Se connecter en tant que visiteur",
     "Logout": "Se déconnecter",
-    "Low priority": "Priorité faible",
+    "Low priority": "Priorité basse",
     "%(senderName)s made future room history visible to": "%(senderName)s a rendu l'historique futur visible à",
     "Manage Integrations": "Gestion des intégrations",
     "Markdown is disabled": "Le formatage Markdown est désactivé",
@@ -384,8 +384,8 @@
     "to tag as %(tagName)s": "pour étiqueter comme %(tagName)s",
     "to tag direct chat": "pour étiqueter comme discussion directe",
     "To use it, just wait for autocomplete results to load and tab through them.": "Pour l’utiliser, attendez simplement que les résultats de l’auto-complétion s’affichent et faites-les défiler avec la touche Tab.",
-    "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "L'instant donné de la chronologie n’a pu être chargé car vous n’avez pas la permission de visualiser le message concerné.",
-    "Tried to load a specific point in this room's timeline, but was unable to find it.": "L'instant donné de la chronologie n’a pu être chargé car il n’a pas pu être trouvé.",
+    "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "L'instant donné dans l'historique n’a pas pu être chargé car vous n’avez pas l'autorisation de voir le message concerné.",
+    "Tried to load a specific point in this room's timeline, but was unable to find it.": "L'instant donné dans l'historique n’a pas pu être chargé car il n’a pas été trouvé.",
     "Turn Markdown off": "Désactiver le formatage Markdown",
     "Turn Markdown on": "Activer le formatage Markdown",
     "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s a activé le chiffrement de bout en bout (algorithme %(algorithm)s).",
@@ -430,7 +430,7 @@
     "Who can read history?": "Qui peut lire l'historique ?",
     "Who would you like to add to this room?": "Qui voulez-vous inviter dans ce salon ?",
     "Who would you like to communicate with?": "Avec qui voulez-vous communiquer ?",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s a révoqué l’invitation de %(targetName)s.",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s a annulé l’invitation de %(targetName)s.",
     "Would you like to": "Voulez-vous",
     "You are already in a call.": "Vous avez déjà un appel en cours.",
     "You're not in any rooms yet! Press": "Vous n’êtes dans aucun salon ! Cliquez",
@@ -564,7 +564,7 @@
     "Import room keys": "Importer les clés de salon",
     "File to import": "Fichier à importer",
     "This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.": "Ce processus vous permet d’exporter dans un fichier local les clés pour les messages que vous avez reçus dans des salons chiffrés. Il sera ensuite possible d’importer ce fichier dans un autre client Matrix, afin de permettre à ce client de pouvoir déchiffrer ces messages.",
-    "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "Le fichier exporté permettra à tout ceux qui peuvent le lire de déchiffrer tous les messages chiffrés auxquels vous avez accès, vous devez donc être vigilant et le stocker dans un endroit sûr. Afin de protéger ce fichier, saisissez ci-dessous une phrase secrète qui sera utilisée pour chiffrer les données exportées. Seule l’utilisation de la même phrase secrète permettra de déchiffrer et importer les données.",
+    "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "Le fichier exporté permettra à tous ceux qui peuvent le lire de déchiffrer tous les messages chiffrés auxquels vous avez accès, vous devez donc être vigilant et le stocker dans un endroit sûr. Afin de protéger ce fichier, saisissez ci-dessous une phrase secrète qui sera utilisée pour chiffrer les données exportées. Seule l’utilisation de la même phrase secrète permettra de déchiffrer et importer les données.",
     "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Ce processus vous permet d’importer les clés de chiffrement que vous avez précédemment exportées depuis un autre client Matrix. Vous serez alors capable de déchiffrer n’importe quel message que l’autre client pouvait déchiffrer.",
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Le fichier exporté est protégé par une phrase de passe. Vous devez saisir cette phrase de passe ici pour déchiffrer le fichier.",
     "You must join the room to see its files": "Vous devez rejoindre le salon pour voir ses fichiers",
@@ -600,7 +600,7 @@
     "Unknown Address": "Adresse inconnue",
     "Unblacklist": "Supprimer de la liste noire",
     "Blacklist": "Ajouter à la liste noire",
-    "Unverify": "Révoquer la vérification",
+    "Unverify": "Annuler la vérification",
     "Verify...": "Vérifier...",
     "ex. @bob:example.com": "ex. @bob:exemple.com",
     "Add User": "Ajouter l'utilisateur",
@@ -669,7 +669,7 @@
     "Unknown (user, device) pair:": "Couple (utilisateur, appareil) inconnu :",
     "Unrecognised command:": "Commande non reconnue :",
     "Unrecognised room alias:": "Alias de salon non reconnu :",
-    "Use compact timeline layout": "Utiliser l'affichage compact",
+    "Use compact timeline layout": "Utiliser l'affichage compact de l'historique",
     "Verified key": "Clé vérifiée",
     "WARNING: Device already verified, but keys do NOT MATCH!": "ATTENTION : appareil déjà vérifié mais les clés NE CORRESPONDENT PAS !",
     "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "ATTENTION : ERREUR DE VÉRIFICATION DES CLÉS ! La clé de signature pour %(userId)s et l'appareil %(deviceId)s est “%(fprint)s” et ne correspond pas à la clé “%(fingerprint)s” qui a été fournie. Cela peut signifier que vos communications sont interceptées !",

From bb5551aeda5b79fe9eaf17cdcb372a6e60374bc2 Mon Sep 17 00:00:00 2001
From: "Iru Cai (vimacs)" <mytbk920423@gmail.com>
Date: Tue, 26 Sep 2017 07:42:54 +0000
Subject: [PATCH 038/123] Translated using Weblate (Chinese (Simplified))

Currently translated at 85.1% (728 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
---
 src/i18n/strings/zh_Hans.json | 40 ++++++++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index db45450a47..1a19ecf2ed 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -692,5 +692,43 @@
     "Please select the destination room for this message": "请选择这条消息的目标聊天室",
     "Start automatically after system login": "在系统登录后自动启动",
     "Analytics": "分析",
-    "Reject all %(invitedRooms)s invites": "拒绝所有 %(invitedRooms)s 邀请"
+    "Reject all %(invitedRooms)s invites": "拒绝所有 %(invitedRooms)s 邀请",
+    "You may wish to login with a different account, or add this email to this account.": "你可能希望用另外一个账户登录，或者添加这个电子邮件到这个账户上。",
+    "Sun": "星期日",
+    "Mon": "星期一",
+    "Tue": "星期二",
+    "Wed": "星期三",
+    "Thu": "星期四",
+    "Fri": "星期五",
+    "Sat": "星期六",
+    "Jan": "一月",
+    "Feb": "二月",
+    "Mar": "三月",
+    "Apr": "四月",
+    "May": "五月",
+    "Jun": "六月",
+    "Jul": "七月",
+    "Aug": "八月",
+    "Sep": "九月",
+    "Oct": "十月",
+    "Nov": "十一月",
+    "Dec": "十二月",
+    "%(severalUsers)sjoined and left %(repeats)s times": "%(severalUsers)s 加入并离开了 %(repeats)s 次",
+    "were unbanned %(repeats)s times": "被解封 %(repeats)s 次",
+    "was unbanned %(repeats)s times": "被解封 %(repeats)s 次",
+    "were unbanned": "被解封",
+    "was unbanned": "被解封",
+    "were kicked %(repeats)s times": "被踢出 %(repeats)s 次",
+    "was kicked %(repeats)s times": "被踢出 %(repeats)s 次",
+    "were kicked": "被踢出",
+    "was kicked": "被踢出",
+    "Desktop specific": "桌面特有的",
+    "You must join the room to see its files": "你必须加入聊天室以看到它的文件",
+    "Failed to invite the following users to the %(roomName)s room:": "邀请以下用户到 %(roomName)s 聊天室失败：",
+    "Confirm Removal": "确认移除",
+    "This will make your account permanently unusable. You will not be able to re-register the same user ID.": "这会让你的账户永远不可用。你无法重新注册同一个用户 ID.",
+    "Verifies a user, device, and pubkey tuple": "验证一个用户、设备和密钥元组",
+    "We encountered an error trying to restore your previous session. If you continue, you will need to log in again, and encrypted chat history will be unreadable.": "我们在尝试恢复你之前的会话时遇到了一个错误。如果你继续，你将需要重新登录，加密的聊天历史将会不可读。",
+    "Unknown devices": "未知设备",
+    "Unknown Address": "未知地址"
 }

From 6bbf751f4bd6c416d22376ef6045b4c825cc7a4f Mon Sep 17 00:00:00 2001
From: Riot Administration <joojoo@mailinator.com>
Date: Wed, 27 Sep 2017 02:37:01 +0000
Subject: [PATCH 039/123] Translated using Weblate (English (United States))

Currently translated at 99.5% (851 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/en_US/
---
 src/i18n/strings/en_US.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index dd94a82727..3f26e07fee 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -864,5 +864,6 @@
     "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Robot check is currently unavailable on desktop - please use a <a>web browser</a>",
     "Verifies a user, device, and pubkey tuple": "Verifies a user, device, and pubkey tuple",
     "It is currently only possible to create groups on your own home server: use a group ID ending with %(domain)s": "It is currently only possible to create groups on your own home server: use a group ID ending with %(domain)s",
-    "To join an existing group you'll have to know its group identifier; this will look something like <i>+example:matrix.org</i>.": "To join an existing group you'll have to know its group identifier; this will look something like <i>+example:matrix.org</i>."
+    "To join an existing group you'll have to know its group identifier; this will look something like <i>+example:matrix.org</i>.": "To join an existing group you'll have to know its group identifier; this will look something like <i>+example:matrix.org</i>.",
+    "%(weekDayName)s, %(monthName)s %(day)s": "print \"<i>fdsafsdsad\""
 }

From 540885474ab3ce0d1ec34b20958f4b63d08597c9 Mon Sep 17 00:00:00 2001
From: Riot Administration <joojoo@mailinator.com>
Date: Wed, 27 Sep 2017 02:37:22 +0000
Subject: [PATCH 040/123] Translated using Weblate (English (United States))

Currently translated at 99.6% (852 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/en_US/

<<<i>>>>xss
---
 src/i18n/strings/en_US.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index 3f26e07fee..2c5b2b3c26 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -865,5 +865,6 @@
     "Verifies a user, device, and pubkey tuple": "Verifies a user, device, and pubkey tuple",
     "It is currently only possible to create groups on your own home server: use a group ID ending with %(domain)s": "It is currently only possible to create groups on your own home server: use a group ID ending with %(domain)s",
     "To join an existing group you'll have to know its group identifier; this will look something like <i>+example:matrix.org</i>.": "To join an existing group you'll have to know its group identifier; this will look something like <i>+example:matrix.org</i>.",
-    "%(weekDayName)s, %(monthName)s %(day)s": "print \"<i>fdsafsdsad\""
+    "%(weekDayName)s, %(monthName)s %(day)s": "print \"<i>fdsafsdsad\"",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s"
 }

From 955ca6cd2b19dfab7cc30b2303ba05f9885876b3 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Fri, 29 Sep 2017 17:59:24 +0100
Subject: [PATCH 041/123] Implement button to remove a room from a group

NB: This doesn't provide any feedback to the user. We should use a GroupSummaryStore-style component to refresh the view after a successful hit to the API. This could affect the summary view as well, because when rooms are removed from a group, they are also removed from the summary (if necessary).
---
 src/components/views/groups/GroupRoomTile.js | 10 ++++++++++
 src/groups.js                                |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/components/views/groups/GroupRoomTile.js b/src/components/views/groups/GroupRoomTile.js
index 452f862d16..1081890f40 100644
--- a/src/components/views/groups/GroupRoomTile.js
+++ b/src/components/views/groups/GroupRoomTile.js
@@ -49,6 +49,13 @@ const GroupRoomTile = React.createClass({
         });
     },
 
+    onDeleteClick: function(e) {
+        e.preventDefault();
+        e.stopPropagation();
+        this.context.matrixClient
+            .removeRoomFromGroup(this.props.groupId, this.props.groupRoom.roomId);
+    },
+
     render: function() {
         const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
@@ -76,6 +83,9 @@ const GroupRoomTile = React.createClass({
                 <div className="mx_GroupRoomTile_name">
                     { name }
                 </div>
+                <AccessibleButton className="mx_GroupRoomTile_delete" onClick={this.onDeleteClick}>
+                    <img src="img/cancel-small.svg" />
+                </AccessibleButton>
             </AccessibleButton>
         );
     },
diff --git a/src/groups.js b/src/groups.js
index 2ff95f7d65..69871c45e9 100644
--- a/src/groups.js
+++ b/src/groups.js
@@ -24,8 +24,7 @@ export const GroupMemberType = PropTypes.shape({
 
 export const GroupRoomType = PropTypes.shape({
     name: PropTypes.string,
-    // TODO: API doesn't return this yet
-    // roomId: PropTypes.string.isRequired,
+    roomId: PropTypes.string.isRequired,
     canonicalAlias: PropTypes.string,
     avatarUrl: PropTypes.string,
 });
@@ -41,6 +40,7 @@ export function groupMemberFromApiObject(apiObject) {
 export function groupRoomFromApiObject(apiObject) {
     return {
         name: apiObject.name,
+        roomId: apiObject.room_id,
         canonicalAlias: apiObject.canonical_alias,
         avatarUrl: apiObject.avatar_url,
     };

From 415693bd834b14b946e492c9914782632e4cfe0b Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 29 Sep 2017 14:02:31 -0600
Subject: [PATCH 042/123] Support editing power levels of events.

Signed-off-by: Travis Ralston <travpc@gmail.com>
---
 src/components/views/rooms/RoomSettings.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js
index 0fea50d2fa..b2d8aa7fe5 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -364,6 +364,11 @@ module.exports = React.createClass({
         var powerLevels = this.props.room.currentState.getStateEvents('m.room.power_levels', '');
         powerLevels = powerLevels ? powerLevels.getContent() : {};
 
+        for (let key of Object.keys(this.refs).filter(k => k.startsWith("event_levels_"))) {
+            const eventType = key.substring("event_levels_".length);
+            powerLevels.events[eventType] = parseInt(this.refs[key].getValue());
+        }
+
         var newPowerLevels = {
             ban: parseInt(this.refs.ban.getValue()),
             kick: parseInt(this.refs.kick.getValue()),
@@ -883,7 +888,8 @@ module.exports = React.createClass({
                         return (
                             <div className="mx_RoomSettings_powerLevel" key={event_type}>
                                 <span className="mx_RoomSettings_powerLevelKey">{ _t('To send events of type') } <code>{ event_type }</code>, { _t('you must be a') } </span>
-                                <PowerSelector value={ events_levels[event_type] } controlled={false} disabled={true} onChange={self.onPowerLevelsChanged}/>
+                                <PowerSelector ref={"event_levels_"+event_type} value={ events_levels[event_type] } onChange={self.onPowerLevelsChanged}
+                                               controlled={false} disabled={!can_change_levels || current_user_level < events_levels[event_type]} />
                             </div>
                         );
                     })}

From 2e1b2178a1f12be3c9a0da8054d15b5220e51903 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 29 Sep 2017 14:35:49 -0600
Subject: [PATCH 043/123] Remove assumptions on how languages work in the power
 levels section

This does mean that the strings will need to be re-translated, but now they may be more accurate because the comma is not assumed in the code.

Signed-off-by: Travis Ralston <travpc@gmail.com>
---
 src/components/views/rooms/RoomSettings.js | 14 +++++++-------
 src/i18n/strings/de_DE.json                |  6 ------
 src/i18n/strings/el.json                   |  7 -------
 src/i18n/strings/en_EN.json                | 14 +++++++-------
 src/i18n/strings/en_US.json                | 14 +++++++-------
 src/i18n/strings/es.json                   |  7 -------
 src/i18n/strings/eu.json                   |  7 -------
 src/i18n/strings/fr.json                   |  7 -------
 src/i18n/strings/hu.json                   |  7 -------
 src/i18n/strings/ko.json                   |  7 -------
 src/i18n/strings/lv.json                   |  7 -------
 src/i18n/strings/nl.json                   |  7 -------
 src/i18n/strings/pl.json                   |  7 -------
 src/i18n/strings/pt.json                   |  7 -------
 src/i18n/strings/pt_BR.json                |  7 -------
 src/i18n/strings/ru.json                   |  7 -------
 src/i18n/strings/th.json                   |  6 ------
 src/i18n/strings/tr.json                   |  7 -------
 src/i18n/strings/zh_Hant.json              |  7 -------
 19 files changed, 21 insertions(+), 131 deletions(-)

diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js
index b2d8aa7fe5..942da9ba06 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -860,34 +860,34 @@ module.exports = React.createClass({
                         <PowerSelector ref="users_default" value={default_user_level} controlled={false} disabled={!can_change_levels || current_user_level < default_user_level} onChange={this.onPowerLevelsChanged}/>
                     </div>
                     <div className="mx_RoomSettings_powerLevel">
-                        <span className="mx_RoomSettings_powerLevelKey">{ _t('To send messages') }, { _t('you must be a') } </span>
+                        <span className="mx_RoomSettings_powerLevelKey">{ _t('To send messages, you must be a') } </span>
                         <PowerSelector ref="events_default" value={send_level} controlled={false} disabled={!can_change_levels || current_user_level < send_level} onChange={this.onPowerLevelsChanged}/>
                     </div>
                     <div className="mx_RoomSettings_powerLevel">
-                        <span className="mx_RoomSettings_powerLevelKey">{ _t('To invite users into the room') }, { _t('you must be a') } </span>
+                        <span className="mx_RoomSettings_powerLevelKey">{ _t('To invite users into the room, you must be a') } </span>
                         <PowerSelector ref="invite" value={invite_level} controlled={false} disabled={!can_change_levels || current_user_level < invite_level} onChange={this.onPowerLevelsChanged}/>
                     </div>
                     <div className="mx_RoomSettings_powerLevel">
-                        <span className="mx_RoomSettings_powerLevelKey">{ _t('To configure the room') }, { _t('you must be a') } </span>
+                        <span className="mx_RoomSettings_powerLevelKey">{ _t('To configure the room, you must be a') } </span>
                         <PowerSelector ref="state_default" value={state_level} controlled={false} disabled={!can_change_levels || current_user_level < state_level} onChange={this.onPowerLevelsChanged}/>
                     </div>
                     <div className="mx_RoomSettings_powerLevel">
-                        <span className="mx_RoomSettings_powerLevelKey">{ _t('To kick users') }, { _t('you must be a') } </span>
+                        <span className="mx_RoomSettings_powerLevelKey">{ _t('To kick users, you must be a') } </span>
                         <PowerSelector ref="kick" value={kick_level} controlled={false} disabled={!can_change_levels || current_user_level < kick_level} onChange={this.onPowerLevelsChanged}/>
                     </div>
                     <div className="mx_RoomSettings_powerLevel">
-                        <span className="mx_RoomSettings_powerLevelKey">{ _t('To ban users') }, { _t('you must be a') } </span>
+                        <span className="mx_RoomSettings_powerLevelKey">{ _t('To ban users, you must be a') } </span>
                         <PowerSelector ref="ban" value={ban_level} controlled={false} disabled={!can_change_levels || current_user_level < ban_level} onChange={this.onPowerLevelsChanged}/>
                     </div>
                     <div className="mx_RoomSettings_powerLevel">
-                        <span className="mx_RoomSettings_powerLevelKey">{ _t('To remove other users\' messages') }, { _t('you must be a') } </span>
+                        <span className="mx_RoomSettings_powerLevelKey">{ _t('To remove other users\' messages, you must be a') } </span>
                         <PowerSelector ref="redact" value={redact_level} controlled={false} disabled={!can_change_levels || current_user_level < redact_level} onChange={this.onPowerLevelsChanged}/>
                     </div>
 
                     {Object.keys(events_levels).map(function(event_type, i) {
                         return (
                             <div className="mx_RoomSettings_powerLevel" key={event_type}>
-                                <span className="mx_RoomSettings_powerLevelKey">{ _t('To send events of type') } <code>{ event_type }</code>, { _t('you must be a') } </span>
+                                <span className="mx_RoomSettings_powerLevelKey">{ _tJsx("To send events of type <eventType/>, you must be a", /<eventType\/>/, () => <code>{ event_type }</code>) } </span>
                                 <PowerSelector ref={"event_levels_"+event_type} value={ events_levels[event_type] } onChange={self.onPowerLevelsChanged}
                                                controlled={false} disabled={!can_change_levels || current_user_level < events_levels[event_type]} />
                             </div>
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index aa114e241d..1a05530890 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -212,11 +212,7 @@
     "This is a preview of this room. Room interactions have been disabled": "Dies ist eine Vorschau dieses Raumes. Raum-Interaktionen wurden deaktiviert",
     "This room is not accessible by remote Matrix servers": "Remote-Matrix-Server können auf diesen Raum nicht zugreifen",
     "This room's internal ID is": "Die interne ID dieses Raumes ist",
-    "To ban users": "Um Benutzer zu verbannen",
-    "To configure the room": "Um den Raum zu konfigurieren",
-    "To invite users into the room": "Um Nutzer in den Raum einzuladen",
     "to join the discussion": "um an der Diskussion teilzunehmen",
-    "To kick users": "Um Benutzer zu kicken",
     "Admin": "Administrator",
     "Server may be unavailable, overloaded, or you hit a bug.": "Server ist nicht verfügbar, überlastet oder du bist auf einen Fehler gestoßen.",
     "Could not connect to the integration server": "Konnte keine Verbindung zum Integrations-Server herstellen",
@@ -227,7 +223,6 @@
     "Can't connect to homeserver - please check your connectivity and ensure your": "Die Verbindung mit dem Homeserver ist fehlgeschlagen. Bitte überprüfe deine Verbindung und stelle sicher, dass dein(e) ",
     "tag as": "kennzeichne als",
     "To reset your password, enter the email address linked to your account": "Um dein Passwort zurückzusetzen, gib bitte die mit deinem Account verknüpfte E-Mail-Adresse ein",
-    "To send messages": "Um Nachrichten zu senden",
     "turned on end-to-end encryption (algorithm": "aktivierte Ende-zu-Ende-Verschlüsselung (Algorithmus",
     "Unable to add email address": "E-Mail-Adresse konnte nicht hinzugefügt werden",
     "Unable to remove contact information": "Die Kontakt-Informationen konnten nicht gelöscht werden",
@@ -412,7 +407,6 @@
     "to tag direct chat": "als Direkt-Chat markieren",
     "You're not in any rooms yet! Press": "Du bist noch keinem Raum beigetreten! Drücke",
     "click to reveal": "anzeigen",
-    "To remove other users' messages": "Um Nachrichten anderer Nutzer zu verbergen",
     "You are trying to access %(roomName)s.": "Du versuchst, auf den Raum \"%(roomName)s\" zuzugreifen.",
     "Monday": "Montag",
     "Tuesday": "Dienstag",
diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json
index bc45e6da9e..048de7e73f 100644
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -344,14 +344,8 @@
     "This room": "Αυτό το δωμάτιο",
     "This room's internal ID is": "Το εσωτερικό αναγνωριστικό του δωματίου είναι",
     "times": "φορές",
-    "To ban users": "Για αποκλεισμό χρηστών",
     "to browse the directory": "για περιήγηση στο ευρετήριο",
-    "To configure the room": "Για ρύθμιση του δωματίου",
-    "To invite users into the room": "Για πρόσκληση χρηστών στο δωμάτιο",
-    "To remove other users' messages": "Για αφαίρεση μηνυμάτων άλλων χρηστών",
     "to restore": "για επαναφορά",
-    "To send events of type": "Για αποστολή συμβάντων τύπου",
-    "To send messages": "Για αποστολή μηνυμάτων",
     "Turn Markdown off": "Απενεργοποίηση Markdown",
     "Turn Markdown on": "Ενεργοποίηση Markdown",
     "Unable to add email address": "Αδυναμία προσθήκης διεύθυνσης ηλ. αλληλογραφίας",
@@ -574,7 +568,6 @@
     "Some of your messages have not been sent.": "Μερικά από τα μηνύματα σας δεν έχουν αποσταλεί.",
     "This room is not recognised.": "Αυτό το δωμάτιο δεν αναγνωρίζεται.",
     "to favourite": "στα αγαπημένα",
-    "To kick users": "Για να διώξετε χρήστες",
     "to make a room or": "για δημιουργία ενός δωματίου ή",
     "to start a chat with someone": "για να ξεκινήσετε μια συνομιλία με κάποιον",
     "Unable to capture screen": "Αδυναμία σύλληψης οθόνης",
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 87fd6d4364..8873b54091 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -448,21 +448,14 @@
     "This room is not accessible by remote Matrix servers": "This room is not accessible by remote Matrix servers",
     "This room's internal ID is": "This room's internal ID is",
     "times": "times",
-    "To ban users": "To ban users",
     "to browse the directory": "to browse the directory",
-    "To configure the room": "To configure the room",
     "to demote": "to demote",
     "to favourite": "to favourite",
     "To get started, please pick a username!": "To get started, please pick a username!",
-    "To invite users into the room": "To invite users into the room",
-    "To kick users": "To kick users",
     "To link to a room it must have <a>an address</a>.": "To link to a room it must have <a>an address</a>.",
     "to make a room or": "to make a room or",
-    "To remove other users' messages": "To remove other users' messages",
     "To reset your password, enter the email address linked to your account": "To reset your password, enter the email address linked to your account",
     "to restore": "to restore",
-    "To send events of type": "To send events of type",
-    "To send messages": "To send messages",
     "to start a chat with someone": "to start a chat with someone",
     "to tag direct chat": "to tag direct chat",
     "To use it, just wait for autocomplete results to load and tab through them.": "To use it, just wait for autocomplete results to load and tab through them.",
@@ -832,6 +825,13 @@
     "Join an existing group": "Join an existing group",
     "To join an existing group you'll have to know its group identifier; this will look something like <i>+example:matrix.org</i>.": "To join an existing group you'll have to know its group identifier; this will look something like <i>+example:matrix.org</i>.",
     "Featured Rooms:": "Featured Rooms:",
+    "To send messages, you must be a": "To send messages, you must be a",
+    "To invite users into the room, you must be a": "To invite users into the room, you must be a",
+    "To configure the room, you must be a": "To configure the room, you must be a",
+    "To kick users, you must be a": "To kick users, you must be a",
+    "To ban users, you must be a": "To ban users, you must be a",
+    "To remove other users' messages, you must be a": "To remove other users' messages, you must be a",
+    "To send events of type <eventType/>, you must be a": "To send events of type <eventType/>, you must be a",
     "Error whilst fetching joined groups": "Error whilst fetching joined groups",
     "Featured Users:": "Featured Users:",
     "Edit Group": "Edit Group",
diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index 928f1a9d0f..c3b3b6a1bc 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -393,21 +393,14 @@
     "This room is not accessible by remote Matrix servers": "This room is not accessible by remote Matrix servers",
     "This room's internal ID is": "This room's internal ID is",
     "times": "times",
-    "To ban users": "To ban users",
     "to browse the directory": "to browse the directory",
-    "To configure the room": "To configure the room",
     "to demote": "to demote",
     "to favourite": "to favorite",
-    "To invite users into the room": "To invite users into the room",
     "to join the discussion": "to join the discussion",
-    "To kick users": "To kick users",
     "To link to a room it must have": "To link to a room it must have",
     "to make a room or": "to make a room or",
-    "To remove other users' messages": "To remove other users' messages",
     "To reset your password, enter the email address linked to your account": "To reset your password, enter the email address linked to your account",
     "to restore": "to restore",
-    "To send events of type": "To send events of type",
-    "To send messages": "To send messages",
     "to start a chat with someone": "to start a chat with someone",
     "to tag direct chat": "to tag direct chat",
     "To use it, just wait for autocomplete results to load and tab through them.": "To use it, just wait for autocomplete results to load and tab through them.",
@@ -656,6 +649,13 @@
     "Verify...": "Verify...",
     "ex. @bob:example.com": "ex. @bob:example.com",
     "Add User": "Add User",
+    "To send messages, you must be a": "To send messages, you must be a",
+    "To invite users into the room, you must be a": "To invite users into the room, you must be a",
+    "To configure the room, you must be a": "To configure the room, you must be a",
+    "To kick users, you must be a": "To kick users, you must be a",
+    "To ban users, you must be a": "To ban users, you must be a",
+    "To remove other users' messages, you must be a": "To remove other users' messages, you must be a",
+    "To send events of type <eventType/>, you must be a": "To send events of type <eventType/>, you must be a",
     "This Home Server would like to make sure you are not a robot": "This Home Server would like to make sure you are not a robot",
     "Sign in with CAS": "Sign in with CAS",
     "Custom Server Options": "Custom Server Options",
diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index bc2391a5c7..9838b915a4 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -470,16 +470,11 @@
     "This room is not accessible by remote Matrix servers": "Esta sala no es accesible por otros servidores Matrix",
     "This room's internal ID is": "El ID interno de la sala es",
     "times": "veces",
-    "To ban users": "Expulsar usuarios",
     "to browse the directory": "navegar el directorio",
-    "To configure the room": "Configurar la sala",
     "to demote": "degradar",
     "to favourite": "marcar como favorito",
-    "To invite users into the room": "Invitar usuarios a la sala",
-    "To kick users": "Patear usuarios",
     "To link to a room it must have <a>an address</a>.": "Para enlazar una sala, debe tener <a>una dirección</a>.",
     "to make a room or": "hacer una sala o",
-    "To remove other users' messages": "Eliminar los mensajes de otros usuarios",
     "To reset your password, enter the email address linked to your account": "Para reiniciar su contraseña, introduzca el e-mail asociado a su cuenta",
     "to restore": "restaurar",
     "Cancel": "Cancelar",
@@ -505,8 +500,6 @@
     "Authentication check failed: incorrect password?": "La verificación de la autentificación ha fallado: ¿El password es el correcto?",
     "And %(count)s more...": "Y %(count)s más...",
     "Press <StartChatButton> to start a chat with someone": "Pulsa <StartChatButton> para empezar a charlar con alguien",
-    "To send events of type": "Para enviar eventos de tipo",
-    "To send messages": "Para enviar mensajes",
     "to start a chat with someone": "para empezar a charlar con alguien",
     "to tag direct chat": "para etiquetar como charla directa",
     "Add a widget": "Añadir widget",
diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 9f3d06ec52..fb2ec9f7b7 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -464,20 +464,13 @@
     "This room is not accessible by remote Matrix servers": "Gela hau ez dago eskuragarri urruneko zerbitzarietan",
     "This room's internal ID is": "Gela honen barne ID-a:",
     "times": "aldi",
-    "To ban users": "Erabiltzaileak debekatzea",
     "to browse the directory": "direktorioa arakatzea",
-    "To configure the room": "Gela konfiguratzea",
     "to demote": "mailaz jaistea",
     "to favourite": "gogoko egitea",
-    "To invite users into the room": "Erabiltzaileak gela honetara gonbidatzea",
-    "To kick users": "Erabiltzaileak kaleratzea",
     "To link to a room it must have <a>an address</a>.": "Gelara estekatzeko honek <a>helbide bat</a> izan behar du.",
     "to make a room or": "gela bat egitea edo",
-    "To remove other users' messages": "Beste erabiltzaileen mezuak kentzea",
     "To reset your password, enter the email address linked to your account": "Zure pasahitza berrezartzeko, sartu zure kontuarekin lotutako e-mail helbidea",
     "to restore": "berreskuratzea",
-    "To send events of type": "Mota honetako gertaerak bidaltzea:",
-    "To send messages": "Mezuak bidaltzea",
     "to start a chat with someone": "norbaitekin txat bat hastea",
     "to tag direct chat": "txat zuzena etiketatzea",
     "To use it, just wait for autocomplete results to load and tab through them.": "Erabiltzeko, itxaron osatze automatikoaren emaitzak kargatu arte eta gero tabuladorearekin hautatu.",
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 585e47f5a3..8ab78d0436 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -354,21 +354,14 @@
     "This room is not accessible by remote Matrix servers": "Ce salon n’est pas accessible par les serveurs Matrix distants",
     "This room's internal ID is": "L'identifiant interne de ce salon est",
     "times": "fois",
-    "To ban users": "Pour bannir des utilisateurs",
     "to browse the directory": "pour parcourir le répertoire",
-    "To configure the room": "Pour configurer le salon",
     "to demote": "pour réduire la priorité",
     "to favourite": "pour marquer comme favori",
-    "To invite users into the room": "Pour inviter des utilisateurs dans le salon",
     "to join the discussion": "pour rejoindre la discussion",
-    "To kick users": "Pour expulser des utilisateurs",
     "To link to a room it must have": "Pour avoir un lien vers un salon, il doit avoir",
     "to make a room or": "pour créer un salon ou",
-    "To remove other users' messages": "Pour supprimer les messages des autres utilisateurs",
     "To reset your password, enter the email address linked to your account": "Pour réinitialiser votre mot de passe, merci d’entrer l’adresse e-mail liée à votre compte",
     "to restore": "pour restaurer",
-    "To send events of type": "Pour envoyer des évènements du type",
-    "To send messages": "Pour envoyer des messages",
     "to start a chat with someone": "pour démarrer une discussion avec quelqu’un",
     "to tag direct chat": "pour marquer comme conversation directe",
     "To use it, just wait for autocomplete results to load and tab through them.": "Pour l’utiliser, attendez simplement que les résultats de l’auto-complétion s’affichent et défilez avec la touche Tab.",
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 2c34e05b1a..fb295535ca 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -432,19 +432,12 @@
     "This room is not accessible by remote Matrix servers": "Ez a szoba távoli Matrix szerverről nem érhető el",
     "This room's internal ID is": "A szoba belső azonosítója:",
     "times": "alkalommal",
-    "To ban users": "Felhasználó kizárásához",
     "to browse the directory": "a könyvtárban való kereséshez",
-    "To configure the room": "A szoba beállításához",
     "to favourite": "kedvencekhez",
-    "To invite users into the room": "Felhasználó szobába való meghívásához",
-    "To kick users": "Felhasználó kirúgásához",
     "To link to a room it must have <a>an address</a>.": "Szobához való kötéshez szükséges <a>egy cím</a>.",
     "to make a room or": "szoba létrehozásához vagy",
-    "To remove other users' messages": "Más felhasználók üzeneteinek törléséhez",
     "To reset your password, enter the email address linked to your account": "A jelszó alaphelyzetbe állításához add meg a fiókodhoz kötött e-mail címet",
     "to restore": "visszaállításhoz",
-    "To send events of type": "Az alábbi típusú üzenetek küldéséhez",
-    "To send messages": "Üzenetek küldéséhez",
     "to start a chat with someone": "csevegés indításához valakivel",
     "to tag direct chat": "megjelölni közvetlen csevegésnek",
     "To use it, just wait for autocomplete results to load and tab through them.": "A használatához csak várd meg az automatikus kiegészítéshez a találatok betöltését és TAB-bal választhatsz közülük.",
diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json
index 8b6e233437..96655ccf4f 100644
--- a/src/i18n/strings/ko.json
+++ b/src/i18n/strings/ko.json
@@ -434,20 +434,13 @@
     "This room is not accessible by remote Matrix servers": "이 방은 원격 매트릭스 서버에 접근할 수 없어요",
     "This room's internal ID is": "방의 내부 ID",
     "times": "번",
-    "To ban users": "사용자를 차단하기",
     "to browse the directory": "목록에서 찾으려면",
-    "To configure the room": "방을 구성하기",
     "to demote": "우선순위 낮추기",
     "to favourite": "즐겨찾기",
-    "To invite users into the room": "방으로 사용자를 초대하기",
-    "To kick users": "사용자를 내쫓기",
     "To link to a room it must have <a>an address</a>.": "방에 연결하려면 <a>주소</a>가 있어야 해요.",
     "to make a room or": "방을 만들거나 혹은",
-    "To remove other users' messages": "다른 사용자의 메시지를 지우기",
     "To reset your password, enter the email address linked to your account": "비밀번호을 다시 설정하려면, 계정과 연결한 이메일 주소를 입력해주세요",
     "to restore": "복구하려면",
-    "To send events of type": "유형 이벤트 보내기",
-    "To send messages": "메시지 보내기",
     "to start a chat with someone": "다른 사람과 이야기하기",
     "to tag direct chat": "직접 이야기를 지정하려면",
     "To use it, just wait for autocomplete results to load and tab through them.": "이 기능을 사용하시려면, 자동완성 결과가 나오길 기다리신 뒤에 탭으로 움직여주세요.",
diff --git a/src/i18n/strings/lv.json b/src/i18n/strings/lv.json
index 5f58fd9515..fea8065a5f 100644
--- a/src/i18n/strings/lv.json
+++ b/src/i18n/strings/lv.json
@@ -502,20 +502,13 @@
     "This room is not accessible by remote Matrix servers": "Šī istaba nav pieejama no attālinātajiem Matrix serveriem",
     "This room's internal ID is": "Šīs istabas iekšējais ID ir",
     "times": "reizes",
-    "To ban users": "lai banotu lietotājus",
     "to browse the directory": "lai pārlūkotu katalogu",
-    "To configure the room": "Lai konfigurētu istabu",
     "to demote": "lai samazinātu",
     "to favourite": "lai pievienotu favorītiem",
-    "To invite users into the room": "Lai uzaicinātu lietotājus uz istabu",
-    "To kick users": "Lai \"iespertu\" (kicks) lietotājiem",
     "To link to a room it must have <a>an address</a>.": "Lai ieliktu saiti uz istabu, tai ir jābūt piešķirtai <a>adresei</a>.",
     "to make a room or": "lai izveidotu istabu vai",
-    "To remove other users' messages": "Lai dzēstu citu lietotāju ziņas",
     "To reset your password, enter the email address linked to your account": "Lai atiestatītu savu paroli, ievadi tavam kontam piesaistīto epasta adresi",
     "to restore": "lai atjaunotu",
-    "To send events of type": "Lai sūtītu sekojošā tipa notikumus",
-    "To send messages": "Lai nosūtītu ziņas",
     "to start a chat with someone": "lai uzstāktu čatu ar kādu",
     "to tag direct chat": "lai pieliktu birku tiešajam čatam",
     "To use it, just wait for autocomplete results to load and tab through them.": "Lai to izmantotu, vienkārši gaidi, kamēr ielādējas automātiski ieteiktie rezultāti, un pārvietojies caur tiem.",
diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index f770e335cf..10f7f4900e 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -459,20 +459,13 @@
     "This room is not accessible by remote Matrix servers": "Deze ruimte is niet toegankelijk voor afgelegen Matrix-servers",
     "This room's internal ID is": "Het interne ID van deze ruimte is",
     "times": "keer",
-    "To ban users": "om gebruikers te verbannen",
     "to browse the directory": "om de catalogus door te bladeren",
-    "To configure the room": "Om de ruimte te configureren",
     "to demote": "om te degraderen",
     "to favourite": "om aan favorieten toe te voegen",
-    "To invite users into the room": "Om gebruikers in deze ruimte toe te voegen",
-    "To kick users": "Om gebruikers er uit te zetten",
     "To link to a room it must have <a>an address</a>.": "Om naar een ruimte te linken moet het <a>een adres</a> hebben.",
     "to make a room or": "om een ruimte te maken of",
-    "To remove other users' messages": "Om berichten van anderen gebruikers te verwijderen",
     "To reset your password, enter the email address linked to your account": "Voer het e-mailadres dat met je account verbonden is in om je wachtwoord opnieuw in te stellen",
     "to restore": "om te herstellen",
-    "To send events of type": "Om een bepaalde soort gebeurtenissen te sturen",
-    "To send messages": "Om berichten te versturen",
     "to start a chat with someone": "om een gesprek met iemand te starten",
     "to tag direct chat": "als directe chat etiketteren",
     "To use it, just wait for autocomplete results to load and tab through them.": "Om het te gebruiken, wacht tot de automatisch aangevulde resultaten geladen zijn en tab er doorheen.",
diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index bd1e4c5c24..0805c8fb66 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -515,20 +515,13 @@
     "This room is not accessible by remote Matrix servers": "Ten pokój nie jest dostępny na zdalnych serwerach Matrix",
     "This room's internal ID is": "Wewnętrzne ID tego pokoju to",
     "times": "razy",
-    "To ban users": "Żeby zablokować użytkowników",
     "to browse the directory": "żeby przeglądać katalog",
-    "To configure the room": "Żeby skonfigurować pokój",
     "to demote": "żeby zmniejszyć priorytet",
     "To get started, please pick a username!": "Aby rozpocząć, wybierz nazwę użytkownika!",
-    "To invite users into the room": "Żeby zaprosić użytkowników do pokoju",
-    "To kick users": "Żeby usuwać użytkowników",
     "to make a room or": "żeby utworzyć pokój lub",
-    "To remove other users' messages": "Żeby usuwać wiadomości innych użytkowników",
     "To reset your password, enter the email address linked to your account": "Aby zresetować swoje hasło, wpisz adres e-mail powiązany z twoim kontem",
     "to restore": "żeby przywrócić",
-    "To send messages": "Żeby wysyłać wiadomości",
     "to start a chat with someone": "żeby zacząć rozmowę z kimś",
-    "To send events of type": "Żeby wysyłać wydarzenia typu",
     "to tag direct chat": "żeby oznaczyć rozmowę bezpośrednią",
     "Turn Markdown off": "Wyłącz Markdown",
     "Turn Markdown on": "Włącz Markdown",
diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index ba4968b7ad..a1e4cce4e9 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -215,16 +215,10 @@
     "This room is not accessible by remote Matrix servers": "Esta sala não é acessível para servidores Matrix remotos",
     "This room's internal ID is": "O ID interno desta sala é",
     "times": "vezes",
-    "To ban users": "Para banir usuárias/os",
-    "To configure the room": "Para poder configurar a sala",
-    "To invite users into the room": "Para convidar usuárias/os para esta sala",
     "to join the discussion": "para se juntar à conversa",
-    "To kick users": "Para poder remover pessoas da sala",
     "To link to a room it must have": "Para fazer um link para uma sala, ela deve ter",
     "To redact messages": "Para poder apagar mensagens",
     "To reset your password, enter the email address linked to your account": "Para redefinir sua senha, entre com o email da sua conta",
-    "To send events of type": "Para enviar eventos do tipo",
-    "To send messages": "Para enviar mensagens",
     "turned on end-to-end encryption (algorithm": "acionou a encriptação ponta-a-ponta (algoritmo",
     "Unable to add email address": "Não foi possível adicionar endereço de email",
     "Unable to remove contact information": "Não foi possível remover informação de contato",
@@ -365,7 +359,6 @@
     "to demote": "para reduzir prioridade",
     "to favourite": "para favoritar",
     "to make a room or": "para criar uma sala ou",
-    "To remove other users' messages": "Para apagar mensagens de outras pessoas",
     "to restore": "para restaurar",
     "to start a chat with someone": "para iniciar uma conversa com alguém",
     "to tag direct chat": "para marcar a conversa como pessoal",
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index af4804bd85..0cefe77aa6 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -215,16 +215,10 @@
     "This room is not accessible by remote Matrix servers": "Esta sala não é acessível para servidores Matrix remotos",
     "This room's internal ID is": "O ID interno desta sala é",
     "times": "vezes",
-    "To ban users": "Para banir usuárias/os",
-    "To configure the room": "Para poder configurar a sala",
-    "To invite users into the room": "Para convidar usuárias/os para esta sala",
     "to join the discussion": "para se juntar à conversa",
-    "To kick users": "Para poder remover pessoas da sala",
     "To link to a room it must have": "Para fazer um link para uma sala, ela deve ter",
     "To redact messages": "Para poder apagar mensagens",
     "To reset your password, enter the email address linked to your account": "Para redefinir sua senha, entre com o email da sua conta",
-    "To send events of type": "Para enviar eventos do tipo",
-    "To send messages": "Para enviar mensagens",
     "turned on end-to-end encryption (algorithm": "acionou a encriptação ponta-a-ponta (algoritmo",
     "Unable to add email address": "Não foi possível adicionar endereço de email",
     "Unable to remove contact information": "Não foi possível remover informação de contato",
@@ -364,7 +358,6 @@
     "to demote": "para reduzir prioridade",
     "to favourite": "para favoritar",
     "to make a room or": "para criar uma sala ou",
-    "To remove other users' messages": "Para apagar mensagens de outras pessoas",
     "to restore": "para restaurar",
     "to start a chat with someone": "para iniciar uma conversa com alguém",
     "to tag direct chat": "para marcar a conversa como pessoal",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index cfab960e32..3ff06070c3 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -155,8 +155,6 @@
     "Start Chat": "Начать чат",
     "tag as": "tag as",
     "These are experimental features that may break in unexpected ways. Use with caution": "These are experimental features that may break in unexpected ways. Use with caution",
-    "To send events of type": "Чтобы отправить тип события",
-    "To send messages": "Чтобы отправить сообщения",
     "turned on end-to-end encryption (algorithm": "turned on end-to-end encryption (algorithm",
     "Unable to add email address": "Не удается добавить адрес электронной почты",
     "Unable to remove contact information": "Не удалось удалить контактную информацию",
@@ -596,15 +594,10 @@
     "The visibility of existing history will be unchanged": "Видимость существующей истории не изменится",
     "this invitation?": "это приглашение?",
     "This room is not accessible by remote Matrix servers": "Это комната недоступна с удаленных серверов Matrix",
-    "To ban users": "Для блокировки пользователей",
     "to browse the directory": "для просмотра каталога",
-    "To configure the room": "Для настройки комнаты",
-    "To invite users into the room": "Чтобы приглашать пользователей в комнату",
     "to join the discussion": "присоединиться к дискуссии",
-    "To kick users": "Чтобы удалять пользователей",
     "To link to a room it must have": "Для создания ссылки на комнату она должна иметь",
     "to make a room or": "чтобы создать комнату или",
-    "To remove other users' messages": "Чтобы удалить сообщения других пользователей",
     "To reset your password, enter the email address linked to your account": "Чтобы сбросить пароль, введите адрес электронной почты, связанный с вашей учетной записью",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Попытка загрузить выбранный интервал истории чата этой комнаты не удалась, так как у вас нет разрешений на просмотр.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Попытка загрузить выбранный интервал истории чата этой комнаты не удалась, так как запрошенный элемент не найден.",
diff --git a/src/i18n/strings/th.json b/src/i18n/strings/th.json
index d45cb86986..9ff6e5b151 100644
--- a/src/i18n/strings/th.json
+++ b/src/i18n/strings/th.json
@@ -323,7 +323,6 @@
     "The phone number entered looks invalid": "ดูเหมือนว่าหมายเลขโทรศัพท์ที่กรอกรมาไม่ถูกต้อง",
     "The email address linked to your account must be entered.": "กรุณากรอกที่อยู่อีเมลที่เชื่อมกับบัญชีของคุณ",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "ไฟล์ '%(fileName)s' มีขนาดใหญ่เกินจำกัดของเซิร์ฟเวอร์บ้าน",
-    "To send messages": "เพื่อส่งข้อความ",
     "to start a chat with someone": "เพื่อเริ่มแชทกับผู้อื่น",
     "to tag direct chat": "เพื่อแทกว่าแชทตรง",
     "Turn Markdown off": "ปิด markdown",
@@ -488,13 +487,8 @@
     "Otherwise, <a>click here</a> to send a bug report.": "หรือ<a>คลิกที่นี่</a>เพื่อรายงานจุดบกพร่อง",
     "Power level must be positive integer.": "ระดับอำนาจต้องเป็นจำนวนเต็มบวก",
     "%(roomName)s does not exist.": "ไม่มีห้อง %(roomName)s อยู่จริง",
-    "To ban users": "จะแบนผู้ใช้ได้",
-    "To configure the room": "จะตั้งค่าห้องนี้ได้",
     "to browse the directory": "เพื่อเรียกดูไดเรกทอรี",
-    "To invite users into the room": "จะเชิญผู้ใช้เข้าห้องได้",
-    "To kick users": "จะเตะผู้ใช้ได้",
     "To link to a room it must have <a>an address</a>.": "ห้องต้องมี<a>ที่อยู่</a>ก่อน ถึงจะลิงก์ได้",
-    "To remove other users' messages": "จะลบข้อความของผู้ใช้อื่นได้",
     "Enter passphrase": "กรอกรหัสผ่าน",
     "Seen by %(userName)s at %(dateTime)s": "%(userName)s เห็นแล้วเมื่อเวลา %(dateTime)s",
     "to restore": "เพื่อกู้คืน",
diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 23d4e284bc..5c1017d177 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -415,20 +415,13 @@
     "This room is not accessible by remote Matrix servers": "Bu oda uzak Matrix Sunucuları tarafından erişilebilir değil",
     "This room's internal ID is": "Bu odanın Dahili ID'si",
     "times": "kere",
-    "To ban users": "Kullanıcıları yasaklamak(Ban) için",
     "to browse the directory": "Dizine göz atmak için",
-    "To configure the room": "Odayı yapılandırmak için",
     "to demote": "indirgemek için",
     "to favourite": "favorilemek",
-    "To invite users into the room": "Kullanıcıları odaya davet etmek",
-    "To kick users": "Kullanıcıları atmak",
     "To link to a room it must have <a>an address</a>.": "Bir odaya bağlanmak için oda <a> bir adrese </a> sahip olmalı.",
     "to make a room or": "bir oda oluşturmak için ya da",
-    "To remove other users' messages": "Diğer kullanıcıların mesajlarını silmek için",
     "To reset your password, enter the email address linked to your account": "Parolanızı sıfırlamak için hesabınıza bağlı e-posta adresinizi girin",
     "to restore": "yenilemek için",
-    "To send events of type": "Tip olayını göndermek için",
-    "To send messages": "Mesaj göndermek için",
     "to start a chat with someone": "birisiyle sohbet başlatmak için",
     "to tag direct chat": "doğrudan sohbeti etiketlemek için",
     "To use it, just wait for autocomplete results to load and tab through them.": "Kullanmak için , otomatik tamamlama sonuçlarının yüklenmesini ve bitmesini bekleyin.",
diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 596bc55a01..cad8834052 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -483,20 +483,13 @@
     "This room is not accessible by remote Matrix servers": "此房間無法被遠端的 Matrix 伺服器存取",
     "This room's internal ID is": "此房間的內部 ID 為",
     "times": "次數",
-    "To ban users": "要禁止使用者",
     "to browse the directory": "要瀏覽目錄",
-    "To configure the room": "要設定房間",
     "to demote": "要降級",
     "to favourite": "到喜歡",
-    "To invite users into the room": "要邀請使用者進入此房間",
-    "To kick users": "要踢出使用者",
     "To link to a room it must have <a>an address</a>.": "要連結到房間，它必須有<a>地址</a>。",
     "to make a room or": "要開房間或",
-    "To remove other users' messages": "要移除其他使用者的訊息",
     "To reset your password, enter the email address linked to your account": "要重設您的密碼，輸入連結到您的帳號的電子郵件地址",
     "to restore": "要復原",
-    "To send events of type": "要傳送活動類型",
-    "To send messages": "要傳送訊息",
     "to start a chat with someone": "要開始與某人聊天",
     "to tag direct chat": "要標記直接聊天",
     "To use it, just wait for autocomplete results to load and tab through them.": "要使用它，只要等待自動完成的結果載入並在它們上面按 Tab。",

From 614cf950b63fc64a15f51bf1324eb99bc764eda9 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 29 Sep 2017 14:45:00 -0600
Subject: [PATCH 044/123] Supply user-friendly labels for common events

Signed-off-by: Travis Ralston <travpc@gmail.com>
---
 src/components/views/rooms/RoomSettings.js | 15 ++++++++++++++-
 src/i18n/strings/en_EN.json                |  5 +++++
 src/i18n/strings/en_US.json                |  5 +++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js
index 942da9ba06..412f67fc23 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -35,6 +35,16 @@ function parseIntWithDefault(val, def) {
     return isNaN(res) ? def : res;
 }
 
+const plEventsToLabels = {
+    // These will be translated for us later.
+    // TODO: _td() these when https://github.com/matrix-org/matrix-react-sdk/pull/1421 lands
+    "m.room.avatar": "To change the room's avatar, you must be a",
+    "m.room.name": "To change the room's name, you must be a",
+    "m.room.canonical_alias": "To change the room's main address, you must be a",
+    "m.room.history_visibility": "To change the room's history visibility, you must be a",
+    "m.room.power_levels": "To change the permissions in the room, you must be a",
+};
+
 const BannedUser = React.createClass({
     propTypes: {
         canUnban: React.PropTypes.bool,
@@ -885,9 +895,12 @@ module.exports = React.createClass({
                     </div>
 
                     {Object.keys(events_levels).map(function(event_type, i) {
+                        let label = plEventsToLabels[event_type];
+                        if (label) label = _t(label);
+                        else label = _tJsx("To send events of type <eventType/>, you must be a", /<eventType\/>/, () => <code>{ event_type }</code>);
                         return (
                             <div className="mx_RoomSettings_powerLevel" key={event_type}>
-                                <span className="mx_RoomSettings_powerLevelKey">{ _tJsx("To send events of type <eventType/>, you must be a", /<eventType\/>/, () => <code>{ event_type }</code>) } </span>
+                                <span className="mx_RoomSettings_powerLevelKey">{ label } </span>
                                 <PowerSelector ref={"event_levels_"+event_type} value={ events_levels[event_type] } onChange={self.onPowerLevelsChanged}
                                                controlled={false} disabled={!can_change_levels || current_user_level < events_levels[event_type]} />
                             </div>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 8873b54091..6309e60e82 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -832,6 +832,11 @@
     "To ban users, you must be a": "To ban users, you must be a",
     "To remove other users' messages, you must be a": "To remove other users' messages, you must be a",
     "To send events of type <eventType/>, you must be a": "To send events of type <eventType/>, you must be a",
+    "To change the room's avatar, you must be a": "To change the room's avatar, you must be a",
+    "To change the room's name, you must be a": "To change the room's name, you must be a",
+    "To change the room's main address, you must be a": "To change the room's main address, you must be a",
+    "To change the room's history visibility, you must be a": "To change the room's history visibility, you must be a",
+    "To change the permissions in the room, you must be a": "To change the permissions in the room, you must be a",
     "Error whilst fetching joined groups": "Error whilst fetching joined groups",
     "Featured Users:": "Featured Users:",
     "Edit Group": "Edit Group",
diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index c3b3b6a1bc..7f99f7789c 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -656,6 +656,11 @@
     "To ban users, you must be a": "To ban users, you must be a",
     "To remove other users' messages, you must be a": "To remove other users' messages, you must be a",
     "To send events of type <eventType/>, you must be a": "To send events of type <eventType/>, you must be a",
+    "To change the room's avatar, you must be a": "To change the room's avatar, you must be a",
+    "To change the room's name, you must be a": "To change the room's name, you must be a",
+    "To change the room's main address, you must be a": "To change the room's main address, you must be a",
+    "To change the room's history visibility, you must be a": "To change the room's history visibility, you must be a",
+    "To change the permissions in the room, you must be a": "To change the permissions in the room, you must be a",
     "This Home Server would like to make sure you are not a robot": "This Home Server would like to make sure you are not a robot",
     "Sign in with CAS": "Sign in with CAS",
     "Custom Server Options": "Custom Server Options",

From 8ab3d94c1ce3b972a77da331d910189256503996 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 29 Sep 2017 15:11:48 -0600
Subject: [PATCH 045/123] Always show common events in the PL section of room
 settings

Signed-off-by: Travis Ralston <travpc@gmail.com>
---
 src/components/views/rooms/RoomSettings.js | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js
index 412f67fc23..59b05dc4ac 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -45,6 +45,15 @@ const plEventsToLabels = {
     "m.room.power_levels": "To change the permissions in the room, you must be a",
 };
 
+const plEventsToShow = {
+    // If an event is listed here, it will be shown in the PL settings. Defaults will be calculated.
+    "m.room.avatar": {isState: true},
+    "m.room.name": {isState: true},
+    "m.room.canonical_alias": {isState: true},
+    "m.room.history_visibility": {isState: true},
+    "m.room.power_levels": {isState: true},
+}
+
 const BannedUser = React.createClass({
     propTypes: {
         canUnban: React.PropTypes.bool,
@@ -556,6 +565,14 @@ module.exports = React.createClass({
         this.forceUpdate();
     },
 
+    _populateDefaultPlEvents: function(eventsSection, stateLevel, eventsLevel) {
+        for (let desiredEvent of Object.keys(plEventsToShow)) {
+            if (!(desiredEvent in eventsSection)) {
+                eventsSection[desiredEvent] = (plEventsToShow[desiredEvent].isState ? stateLevel : eventsLevel);
+            }
+        }
+    },
+
     _renderEncryptionSection: function() {
         var cli = MatrixClientPeg.get();
         var roomState = this.props.room.currentState;
@@ -626,6 +643,8 @@ module.exports = React.createClass({
         var state_level = power_level_event ? parseIntWithDefault(power_levels.state_default, 50) : 0;
         var default_user_level = parseIntWithDefault(power_levels.users_default, 0);
 
+        this._populateDefaultPlEvents(events_levels, state_level, send_level);
+
         var current_user_level = user_levels[user_id];
         if (current_user_level === undefined) {
             current_user_level = default_user_level;

From 8ee9d39ffa19adb7182d8e61a9831bf2975cea52 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 29 Sep 2017 15:12:05 -0600
Subject: [PATCH 046/123] Expose option for m.room.topic power level

Signed-off-by: Travis Ralston <travpc@gmail.com>
---
 src/components/views/rooms/RoomSettings.js | 2 ++
 src/i18n/strings/en_EN.json                | 1 +
 src/i18n/strings/en_US.json                | 1 +
 3 files changed, 4 insertions(+)

diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js
index 59b05dc4ac..f1dcfbfc64 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -43,6 +43,7 @@ const plEventsToLabels = {
     "m.room.canonical_alias": "To change the room's main address, you must be a",
     "m.room.history_visibility": "To change the room's history visibility, you must be a",
     "m.room.power_levels": "To change the permissions in the room, you must be a",
+    "m.room.topic": "To change the topic, you must be a",
 };
 
 const plEventsToShow = {
@@ -52,6 +53,7 @@ const plEventsToShow = {
     "m.room.canonical_alias": {isState: true},
     "m.room.history_visibility": {isState: true},
     "m.room.power_levels": {isState: true},
+    "m.room.topic": {isState: true},
 }
 
 const BannedUser = React.createClass({
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 6309e60e82..ee1bed814a 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -837,6 +837,7 @@
     "To change the room's main address, you must be a": "To change the room's main address, you must be a",
     "To change the room's history visibility, you must be a": "To change the room's history visibility, you must be a",
     "To change the permissions in the room, you must be a": "To change the permissions in the room, you must be a",
+    "To change the topic, you must be a": "To change the topic, you must be a",
     "Error whilst fetching joined groups": "Error whilst fetching joined groups",
     "Featured Users:": "Featured Users:",
     "Edit Group": "Edit Group",
diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index 7f99f7789c..a1dd9d53cc 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -661,6 +661,7 @@
     "To change the room's main address, you must be a": "To change the room's main address, you must be a",
     "To change the room's history visibility, you must be a": "To change the room's history visibility, you must be a",
     "To change the permissions in the room, you must be a": "To change the permissions in the room, you must be a",
+    "To change the topic, you must be a": "To change the topic, you must be a",
     "This Home Server would like to make sure you are not a robot": "This Home Server would like to make sure you are not a robot",
     "Sign in with CAS": "Sign in with CAS",
     "Custom Server Options": "Custom Server Options",

From 20798dd2fa161d4e24229ef0f8fbf33e3ac08e06 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 29 Sep 2017 15:22:37 -0600
Subject: [PATCH 047/123] Expose power level setting for widgets

Fixes https://github.com/vector-im/riot-web/issues/4866

Signed-off-by: Travis Ralston <travpc@gmail.com>
---
 src/components/views/rooms/RoomSettings.js | 4 ++++
 src/i18n/strings/en_EN.json                | 1 +
 src/i18n/strings/en_US.json                | 1 +
 3 files changed, 6 insertions(+)

diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js
index f1dcfbfc64..e3fe50713b 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -44,6 +44,8 @@ const plEventsToLabels = {
     "m.room.history_visibility": "To change the room's history visibility, you must be a",
     "m.room.power_levels": "To change the permissions in the room, you must be a",
     "m.room.topic": "To change the topic, you must be a",
+
+    "im.vector.modular.widgets": "To modify widgets in the room, you must be a",
 };
 
 const plEventsToShow = {
@@ -54,6 +56,8 @@ const plEventsToShow = {
     "m.room.history_visibility": {isState: true},
     "m.room.power_levels": {isState: true},
     "m.room.topic": {isState: true},
+
+    "im.vector.modular.widgets": {isState: true},
 }
 
 const BannedUser = React.createClass({
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index ee1bed814a..792626ca7c 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -838,6 +838,7 @@
     "To change the room's history visibility, you must be a": "To change the room's history visibility, you must be a",
     "To change the permissions in the room, you must be a": "To change the permissions in the room, you must be a",
     "To change the topic, you must be a": "To change the topic, you must be a",
+    "To modify widgets in the room, you must be a": "To modify widgets in the room, you must be a",
     "Error whilst fetching joined groups": "Error whilst fetching joined groups",
     "Featured Users:": "Featured Users:",
     "Edit Group": "Edit Group",
diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index a1dd9d53cc..8a78a18407 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -662,6 +662,7 @@
     "To change the room's history visibility, you must be a": "To change the room's history visibility, you must be a",
     "To change the permissions in the room, you must be a": "To change the permissions in the room, you must be a",
     "To change the topic, you must be a": "To change the topic, you must be a",
+    "To modify widgets in the room, you must be a": "To modify widgets in the room, you must be a",
     "This Home Server would like to make sure you are not a robot": "This Home Server would like to make sure you are not a robot",
     "Sign in with CAS": "Sign in with CAS",
     "Custom Server Options": "Custom Server Options",

From b202601d650d981103fee66be869c47506a407d1 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 2 Oct 2017 15:10:32 +0100
Subject: [PATCH 048/123] Fix showing 3pid invites in member list

---
 src/components/views/rooms/MemberList.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/rooms/MemberList.js b/src/components/views/rooms/MemberList.js
index 86d44f29d6..d1b456025f 100644
--- a/src/components/views/rooms/MemberList.js
+++ b/src/components/views/rooms/MemberList.js
@@ -372,7 +372,7 @@ module.exports = React.createClass({
     },
 
     _getChildrenInvited: function(start, end) {
-        return this._makeMemberTiles(this.state.filteredInvitedMembers.slice(start, end));
+        return this._makeMemberTiles(this.state.filteredInvitedMembers.slice(start, end), 'invite');
     },
 
     _getChildCountInvited: function() {

From 4361953d6d28091d623361bd4385d9e4e857f2dc Mon Sep 17 00:00:00 2001
From: Silke <silke@slxh.nl>
Date: Sat, 30 Sep 2017 09:37:11 +0000
Subject: [PATCH 049/123] Translated using Weblate (Dutch)

Currently translated at 100.0% (855 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
---
 src/i18n/strings/nl.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index fff3aaa4a5..88557516ed 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -108,7 +108,7 @@
     "Drop here %(toAction)s": "%(toAction)s hier naartoe verplaatsen",
     "Error": "Fout",
     "Failed to forget room %(errCode)s": "Ruimte vergeten mislukt %(errCode)s",
-    "Failed to join the room": "Kamer binnengaan mislukt",
+    "Failed to join the room": "Ruimte toetreden mislukt",
     "Favourite": "Favoriet",
     "Mute": "Dempen",
     "Notifications": "Meldingen",

From 3e34a460a411935ed994c469b8e87e6fa8b2f6d4 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Tue, 3 Oct 2017 10:06:18 +0100
Subject: [PATCH 050/123] Add error dialog for when removing room fails

---
 src/components/views/groups/GroupRoomTile.js | 34 +++++++++++++++-----
 src/i18n/strings/en_EN.json                  |  4 ++-
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/src/components/views/groups/GroupRoomTile.js b/src/components/views/groups/GroupRoomTile.js
index 1081890f40..eeba9d6d8a 100644
--- a/src/components/views/groups/GroupRoomTile.js
+++ b/src/components/views/groups/GroupRoomTile.js
@@ -21,6 +21,7 @@ import PropTypes from 'prop-types';
 import sdk from '../../../index';
 import dis from '../../../dispatcher';
 import { GroupRoomType } from '../../../groups';
+import Modal from '../../../Modal';
 
 const GroupRoomTile = React.createClass({
     displayName: 'GroupRoomTile',
@@ -31,7 +32,19 @@ const GroupRoomTile = React.createClass({
     },
 
     getInitialState: function() {
-        return {};
+        return {
+            name: this.calculateRoomName(this.props.groupRoom),
+        };
+    },
+
+    componentWillReceiveProps: function(newProps) {
+        this.setState({
+            name: this.calculateRoomName(newProps.groupRoom),
+        });
+    },
+
+    calculateRoomName: function(groupRoom) {
+        return groupRoom.name || groupRoom.canonicalAlias || _t("Unnamed Room");
     },
 
     onClick: function(e) {
@@ -52,24 +65,29 @@ const GroupRoomTile = React.createClass({
     onDeleteClick: function(e) {
         e.preventDefault();
         e.stopPropagation();
+        const groupId = this.props.groupId;
+        const roomName = this.state.name;
         this.context.matrixClient
-            .removeRoomFromGroup(this.props.groupId, this.props.groupRoom.roomId);
+            .removeRoomFromGroup(groupId, this.props.groupRoom.roomId)
+            .catch((err) => {
+                const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+                Modal.createTrackedDialog('Failed to remove room from group', '', ErrorDialog, {
+                    title: _t("Failed to remove room from group"),
+                    description: _t("Failed to remove '%(roomName)s' from %(groupId)s", {groupId, roomName}),
+                });
+            });
     },
 
     render: function() {
         const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-
-        const name = this.props.groupRoom.name ||
-            this.props.groupRoom.canonicalAlias ||
-            _t("Unnamed Room");
         const avatarUrl = this.context.matrixClient.mxcUrlToHttp(
             this.props.groupRoom.avatarUrl,
             36, 36, 'crop',
         );
 
         const av = (
-            <BaseAvatar name={name}
+            <BaseAvatar name={this.state.name}
                 width={36} height={36}
                 url={avatarUrl}
             />
@@ -81,7 +99,7 @@ const GroupRoomTile = React.createClass({
                     { av }
                 </div>
                 <div className="mx_GroupRoomTile_name">
-                    { name }
+                    { this.state.name }
                 </div>
                 <AccessibleButton className="mx_GroupRoomTile_delete" onClick={this.onDeleteClick}>
                     <img src="img/cancel-small.svg" />
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 87fd6d4364..10e135fc6e 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -895,5 +895,7 @@
     "Matrix Room ID": "Matrix Room ID",
     "email address": "email address",
     "Try using one of the following valid address types: %(validTypesList)s.": "Try using one of the following valid address types: %(validTypesList)s.",
-    "You have entered an invalid address.": "You have entered an invalid address."
+    "You have entered an invalid address.": "You have entered an invalid address.",
+    "Failed to remove room from group": "Failed to remove room from group",
+    "Failed to remove '%(roomName)s' from %(groupId)s": "Failed to remove '%(roomName)s' from %(groupId)s"
 }

From 0116c4b48681a9ba90348010d7691befcdbcf386 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Tue, 3 Oct 2017 10:14:08 +0100
Subject: [PATCH 051/123] Log the error when failing to removie room from group

---
 src/components/views/groups/GroupRoomTile.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/views/groups/GroupRoomTile.js b/src/components/views/groups/GroupRoomTile.js
index eeba9d6d8a..ea8b5b9993 100644
--- a/src/components/views/groups/GroupRoomTile.js
+++ b/src/components/views/groups/GroupRoomTile.js
@@ -67,9 +67,11 @@ const GroupRoomTile = React.createClass({
         e.stopPropagation();
         const groupId = this.props.groupId;
         const roomName = this.state.name;
+        const roomId = this.props.groupRoom.roomId;
         this.context.matrixClient
-            .removeRoomFromGroup(groupId, this.props.groupRoom.roomId)
+            .removeRoomFromGroup(groupId, roomId)
             .catch((err) => {
+                console.error(`Error whilst removing ${roomId} from ${groupId}`, err);
                 const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                 Modal.createTrackedDialog('Failed to remove room from group', '', ErrorDialog, {
                     title: _t("Failed to remove room from group"),

From 6b834bc72e5bd073e572928e3aa8c0ed3e533123 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Tue, 3 Oct 2017 11:16:22 +0100
Subject: [PATCH 052/123] Add confirmation dialog for removing room from group

---
 src/components/views/groups/GroupRoomTile.js | 42 ++++++++++++++------
 src/i18n/strings/en_EN.json                  |  4 +-
 2 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/src/components/views/groups/GroupRoomTile.js b/src/components/views/groups/GroupRoomTile.js
index ea8b5b9993..b6bdb9735b 100644
--- a/src/components/views/groups/GroupRoomTile.js
+++ b/src/components/views/groups/GroupRoomTile.js
@@ -47,6 +47,22 @@ const GroupRoomTile = React.createClass({
         return groupRoom.name || groupRoom.canonicalAlias || _t("Unnamed Room");
     },
 
+    removeRoomFromGroup: function() {
+        const groupId = this.props.groupId;
+        const roomName = this.state.name;
+        const roomId = this.props.groupRoom.roomId;
+        this.context.matrixClient
+            .removeRoomFromGroup(groupId, roomId)
+            .catch((err) => {
+                console.error(`Error whilst removing ${roomId} from ${groupId}`, err);
+                const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+                Modal.createTrackedDialog('Failed to remove room from group', '', ErrorDialog, {
+                    title: _t("Failed to remove room from group"),
+                    description: _t("Failed to remove '%(roomName)s' from %(groupId)s", {groupId, roomName}),
+                });
+            });
+    },
+
     onClick: function(e) {
         let roomId;
         let roomAlias;
@@ -63,21 +79,21 @@ const GroupRoomTile = React.createClass({
     },
 
     onDeleteClick: function(e) {
-        e.preventDefault();
-        e.stopPropagation();
         const groupId = this.props.groupId;
         const roomName = this.state.name;
-        const roomId = this.props.groupRoom.roomId;
-        this.context.matrixClient
-            .removeRoomFromGroup(groupId, roomId)
-            .catch((err) => {
-                console.error(`Error whilst removing ${roomId} from ${groupId}`, err);
-                const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                Modal.createTrackedDialog('Failed to remove room from group', '', ErrorDialog, {
-                    title: _t("Failed to remove room from group"),
-                    description: _t("Failed to remove '%(roomName)s' from %(groupId)s", {groupId, roomName}),
-                });
-            });
+        e.preventDefault();
+        e.stopPropagation();
+        const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
+        Modal.createTrackedDialog('Confirm removal of group from room', '', QuestionDialog, {
+            title: _t("Are you sure you want to remove '%(roomName)s' from %(groupId)s?", {roomName, groupId}),
+            description: _t("Removing a room from the group will also remove it from the group page."),
+            button: _t("Remove"),
+            onFinished: (success) => {
+                if (success) {
+                    this.removeRoomFromGroup();
+                }
+            },
+        });
     },
 
     render: function() {
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 10e135fc6e..bc377d8359 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -897,5 +897,7 @@
     "Try using one of the following valid address types: %(validTypesList)s.": "Try using one of the following valid address types: %(validTypesList)s.",
     "You have entered an invalid address.": "You have entered an invalid address.",
     "Failed to remove room from group": "Failed to remove room from group",
-    "Failed to remove '%(roomName)s' from %(groupId)s": "Failed to remove '%(roomName)s' from %(groupId)s"
+    "Failed to remove '%(roomName)s' from %(groupId)s": "Failed to remove '%(roomName)s' from %(groupId)s",
+    "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Are you sure you want to remove '%(roomName)s' from %(groupId)s?",
+    "Removing a room from the group will also remove it from the group page.": "Removing a room from the group will also remove it from the group page."
 }

From fa0a87ae398e2bad81d0f7a6fa69e1b8f0556cee Mon Sep 17 00:00:00 2001
From: Pitchaya Boonsarngsuk <brian.mwit@gmail.com>
Date: Mon, 2 Oct 2017 14:35:15 +0000
Subject: [PATCH 053/123] Translated using Weblate (Thai)

Currently translated at 61.4% (525 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/th/
---
 src/i18n/strings/th.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/th.json b/src/i18n/strings/th.json
index b7d2140f60..9a484dfd1a 100644
--- a/src/i18n/strings/th.json
+++ b/src/i18n/strings/th.json
@@ -226,7 +226,7 @@
     "Markdown is enabled": "เปิดใช้งาน Markdown แล้ว",
     "Missing user_id in request": "ไม่พบ user_id ในคำขอ",
     "Moderator": "ผู้ช่วยดูแล",
-    "my Matrix ID": "Matrix ID ของฉัน",
+    "my Matrix ID": "ID Matrix ของฉัน",
     "New address (e.g. #foo:%(localDomain)s)": "ที่อยู่ใหม่ (เช่น #foo:%(localDomain)s)",
     "New password": "รหัสผ่านใหม่",
     "New passwords don't match": "รหัสผ่านใหม่ไม่ตรงกัน",
@@ -457,7 +457,7 @@
     "This allows you to use this app with an existing Matrix account on a different home server.": "ทั้งนี่เพื่อให้คุณสามารถใช้ Riot กับบัญชี Matrix ที่มีอยู่แล้วบนเซิร์ฟเวอร์บ้านอื่น ๆ ได้",
     "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "คุณอาจเลือกเซิร์ฟเวอร์ระบุตัวตนเองด้วยก็ได้ แต่คุณจะไม่สามารถเชิญผู้ใช้อื่นด้วยที่อยู่อีเมล หรือรับคำเชิญจากผู้ใช้อื่นทางที่อยู่อีเมลได้",
     "Default server": "เซิร์ฟเวอร์เริ่มต้น",
-    "Custom server": "เซิร์ฟเวอร์ที่กำหนดเอง",
+    "Custom server": "กำหนดเซิร์ฟเวอร์เอง",
     "Home server URL": "URL เซิร์ฟเวอร์บ้าน",
     "Identity server URL": "URL เซิร์ฟเวอร์ระบุตัวตน",
     "%(severalUsers)sleft %(repeats)s times": "%(severalUsers)sออกจากห้อง %(repeats)s ครั้ง",

From 8243c39d830bfc6366fbe68b2856ea2c2277c29b Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Wed, 4 Oct 2017 10:00:01 +0100
Subject: [PATCH 054/123] Factor out EditableItemList from AliasSettings

Such that we can reuse the same UI elsewhere, namely when editing related groups of a room (which is an upcoming feature).
---
 .../views/elements/EditableItemList.js        | 162 ++++++++++++++++++
 .../views/room_settings/AliasSettings.js      | 116 +++++--------
 2 files changed, 204 insertions(+), 74 deletions(-)
 create mode 100644 src/components/views/elements/EditableItemList.js

diff --git a/src/components/views/elements/EditableItemList.js b/src/components/views/elements/EditableItemList.js
new file mode 100644
index 0000000000..1d269f26e2
--- /dev/null
+++ b/src/components/views/elements/EditableItemList.js
@@ -0,0 +1,162 @@
+/*
+Copyright 2017 New Vector Ltd.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import PropTypes from 'prop-types';
+import sdk from '../../../index';
+import {_t} from '../../../languageHandler.js';
+
+const EditableItem = React.createClass({
+    displayName: 'EditableItem',
+
+    propTypes: {
+        initialValue: PropTypes.string,
+        index: PropTypes.number,
+        placeholder: PropTypes.string,
+
+        onChange: PropTypes.func,
+        onRemove: PropTypes.func,
+        onAdd: PropTypes.func,
+    },
+
+    onChange: function(value) {
+        this.setState({ value });
+        if (this.props.onChange) this.props.onChange(value, this.props.index);
+    },
+
+    onRemove: function() {
+        this.props.onRemove(this.props.index);
+    },
+
+    onAdd: function() {
+        this.props.onAdd(this.state.value);
+    },
+
+    render: function() {
+        const EditableText = sdk.getComponent('elements.EditableText');
+        return <div className="mx_EditableItem">
+            <EditableText
+                className="mx_EditableItem_editable"
+                placeholderClassName="mx_EditableItem_editablePlaceholder"
+                placeholder={this.props.placeholder}
+                blurToCancel={false}
+                editable={true}
+                initialValue={this.props.initialValue}
+                onValueChanged={this.onChange} />
+            { this.props.onAdd ?
+                <div className="mx_EditableItem_addButton">
+                    <img className="mx_filterFlipColor"
+                        src="img/plus.svg" width="14" height="14"
+                        alt={_t("Add")} onClick={this.onAdd} />
+                </div>
+                :
+                <div className="mx_EditableItem_removeButton">
+                    <img className="mx_filterFlipColor"
+                        src="img/cancel-small.svg" width="14" height="14"
+                        alt={_t("Delete")} onClick={this.onRemove} />
+                </div>
+            }
+        </div>;
+    },
+});
+
+module.exports = React.createClass({
+    displayName: 'EditableItemList',
+
+    propTypes: {
+        items: PropTypes.arrayOf(PropTypes.string).isRequired,
+        onNewItemChanged: PropTypes.func,
+        onItemAdded: PropTypes.func,
+        onItemEdited: PropTypes.func,
+        onItemRemoved: PropTypes. func,
+    },
+
+    getDefaultProps: function() {
+        return {
+            onItemAdded: () => {},
+            onItemEdited: () => {},
+            onItemRemoved: () => {},
+        };
+    },
+
+    getInitialState: function() {
+        return {};
+    },
+
+    componentWillReceiveProps: function(nextProps) {
+    },
+
+    componentWillMount: function() {
+    },
+
+    componentDidMount: function() {
+    },
+
+    onItemAdded: function(value) {
+        console.info('onItemAdded', value);
+        this.props.onItemAdded(value);
+    },
+
+    onItemEdited: function(value, index) {
+        console.info('onItemEdited', value, index);
+        if (value.length === 0) {
+            this.onItemRemoved(index);
+        } else {
+            this.onItemEdited(value, index);
+        }
+    },
+
+    onItemRemoved: function(index) {
+        console.info('onItemRemoved', index);
+        this.props.onItemRemoved(index);
+    },
+
+    onNewItemChanged: function(value) {
+        this.props.onNewItemChanged(value);
+    },
+
+    render: function() {
+        const editableItems = this.props.items.map((item, index) => {
+            return <EditableItem
+                key={index}
+                index={index}
+                initialValue={item}
+                onChange={this.onItemEdited}
+                onRemove={this.onItemRemoved}
+                placeholder={this.props.placeholder}
+            />;
+        });
+
+        const label = this.props.items.length > 0 ?
+            this.props.itemsLabel : this.props.noItemsLabel;
+
+        console.info('New item:', this.props.newItem);
+
+        return (<div className="mx_EditableItemList">
+            <div className="mx_EditableItemList_label">
+                { label }
+            </div>
+            { editableItems }
+            <EditableItem
+                key={-1}
+                initialValue={this.props.newItem}
+                onAdd={this.onItemAdded}
+                onChange={this.onNewItemChanged}
+                placeholder={this.props.placeholder}
+            />
+        </div>);
+    },
+});
diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index f37bd4271a..8a6abec35d 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -136,24 +136,25 @@ module.exports = React.createClass({
         return ObjectUtils.getKeyValueArrayDiffs(oldAliases, this.state.domainToAliases);
     },
 
-    onAliasAdded: function(alias) {
+    onNewAliasChanged: function(value) {
+        this.setState({newAlias: value});
+    },
+
+    onLocalAliasAdded: function(alias) {
         if (!alias || alias.length === 0) return; // ignore attempts to create blank aliases
 
-        if (this.isAliasValid(alias)) {
-            // add this alias to the domain to aliases dict
-            var domain = alias.replace(/^.*?:/, '');
-            // XXX: do we need to deep copy aliases before editing it?
-            this.state.domainToAliases[domain] = this.state.domainToAliases[domain] || [];
-            this.state.domainToAliases[domain].push(alias);
-            this.setState({
-                domainToAliases: this.state.domainToAliases
-            });
+        const localDomain = MatrixClientPeg.get().getDomain();
+        if (this.isAliasValid(alias) && alias.endsWith(localDomain)) {
+            this.state.domainToAliases[localDomain] = this.state.domainToAliases[localDomain] || [];
+            this.state.domainToAliases[localDomain].push(alias);
 
-            // reset the add field
-            this.refs.add_alias.setValue(''); // FIXME
-        }
-        else {
-            var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+            this.setState({
+                domainToAliases: this.state.domainToAliases,
+                // Reset the add field
+                newAlias: "",
+            });
+        } else {
+            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             Modal.createTrackedDialog('Invalid alias format', '', ErrorDialog, {
                 title: _t('Invalid alias format'),
                 description: _t('\'%(alias)s\' is not a valid format for an alias', { alias: alias }),
@@ -161,15 +162,13 @@ module.exports = React.createClass({
         }
     },
 
-    onAliasChanged: function(domain, index, alias) {
+    onLocalAliasChanged: function(alias, index) {
         if (alias === "") return; // hit the delete button to delete please
-        var oldAlias;
-        if (this.isAliasValid(alias)) {
-            oldAlias = this.state.domainToAliases[domain][index];
-            this.state.domainToAliases[domain][index] = alias;
-        }
-        else {
-            var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+        const localDomain = MatrixClientPeg.get().getDomain();
+        if (this.isAliasValid(alias) && alias.endsWith(localDomain)) {
+            this.state.domainToAliases[localDomain][index] = alias;
+        } else {
+            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             Modal.createTrackedDialog('Invalid address format', '', ErrorDialog, {
                 title: _t('Invalid address format'),
                 description: _t('\'%(alias)s\' is not a valid format for an address', { alias: alias }),
@@ -177,15 +176,16 @@ module.exports = React.createClass({
         }
     },
 
-    onAliasDeleted: function(domain, index) {
+    onLocalAliasDeleted: function(index) {
+        const localDomain = MatrixClientPeg.get().getDomain();
         // It's a bit naughty to directly manipulate this.state, and React would
         // normally whine at you, but it can't see us doing the splice.  Given we
         // promptly setState anyway, it's just about acceptable.  The alternative
         // would be to arbitrarily deepcopy to a temp variable and then setState
         // that, but why bother when we can cut this corner.
-        var alias = this.state.domainToAliases[domain].splice(index, 1);
+        this.state.domainToAliases[localDomain].splice(index, 1);
         this.setState({
-            domainToAliases: this.state.domainToAliases
+            domainToAliases: this.state.domainToAliases,
         });
     },
 
@@ -198,6 +198,7 @@ module.exports = React.createClass({
     render: function() {
         var self = this;
         var EditableText = sdk.getComponent("elements.EditableText");
+        var EditableItemList = sdk.getComponent("elements.EditableItemList");
         var localDomain = MatrixClientPeg.get().getDomain();
 
         var canonical_alias_section;
@@ -257,58 +258,25 @@ module.exports = React.createClass({
                 <div className="mx_RoomSettings_aliasLabel">
                     { _t('The main address for this room is') }: { canonical_alias_section }
                 </div>
-                <div className="mx_RoomSettings_aliasLabel">
-                    { (this.state.domainToAliases[localDomain] &&
-                        this.state.domainToAliases[localDomain].length > 0)
-                      ? _t('Local addresses for this room:')
-                      : _t('This room has no local addresses') }
-                </div>
-                <div className="mx_RoomSettings_aliasesTable">
-                    { (this.state.domainToAliases[localDomain] || []).map((alias, i) => {
-                        var deleteButton;
-                        if (this.props.canSetAliases) {
-                            deleteButton = (
-                                <img src="img/cancel-small.svg" width="14" height="14"
-                                    alt={ _t('Delete') } onClick={ self.onAliasDeleted.bind(self, localDomain, i) } />
-                            );
-                        }
-                        return (
-                            <div className="mx_RoomSettings_aliasesTableRow" key={ i }>
-                                <EditableText
-                                    className="mx_RoomSettings_alias mx_RoomSettings_editable"
-                                    placeholderClassName="mx_RoomSettings_aliasPlaceholder"
-                                    placeholder={ _t('New address (e.g. #foo:%(localDomain)s)', { localDomain: localDomain}) }
-                                    blurToCancel={ false }
-                                    onValueChanged={ self.onAliasChanged.bind(self, localDomain, i) }
-                                    editable={ self.props.canSetAliases }
-                                    initialValue={ alias } />
-                                <div className="mx_RoomSettings_deleteAlias mx_filterFlipColor">
-                                     { deleteButton }
-                                </div>
-                            </div>
-                        );
-                    })}
 
-                    { this.props.canSetAliases ?
-                        <div className="mx_RoomSettings_aliasesTableRow" key="new">
-                            <EditableText
-                                ref="add_alias"
-                                className="mx_RoomSettings_alias mx_RoomSettings_editable"
-                                placeholderClassName="mx_RoomSettings_aliasPlaceholder"
-                                placeholder={ _t('New address (e.g. #foo:%(localDomain)s)', { localDomain: localDomain}) }
-                                blurToCancel={ false }
-                                onValueChanged={ self.onAliasAdded } />
-                            <div className="mx_RoomSettings_addAlias mx_filterFlipColor">
-                                 <img src="img/plus.svg" width="14" height="14" alt="Add"
-                                      onClick={ self.onAliasAdded.bind(self, undefined) }/>
-                            </div>
-                        </div> : ""
-                    }
-                </div>
+                <EditableItemList
+                    className={"mx_RoomSettings_localAliases"}
+                    items={this.state.domainToAliases[localDomain] || []}
+                    newItem={this.state.newAlias}
+                    onNewItemChanged={onNewAliasChanged}
+                    onItemAdded={this.onLocalAliasAdded}
+                    onItemEdited={this.onLocalAliasChanged}
+                    onItemRemoved={this.onLocalAliasDeleted}
+                    itemsLabel={_t('Local addresses for this room:')}
+                    noItemsLabel={_t('This room has no local addresses')}
+                    placeholder={_t(
+                        'New address (e.g. #foo:%(localDomain)s)', {localDomain: localDomain},
+                    )}
+                />
 
                 { remote_aliases_section }
 
             </div>
         );
-    }
+    },
 });

From 00a89f8263ca68abb4c89698bc7a7150677b5812 Mon Sep 17 00:00:00 2001
From: Danilo Resende <danilo.isr@gmail.com>
Date: Tue, 3 Oct 2017 22:14:16 +0000
Subject: [PATCH 055/123] Translated using Weblate (Portuguese (Brazil))

Currently translated at 92.3% (790 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt_BR/
---
 src/i18n/strings/pt_BR.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index a52281c7c6..ad2811074b 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -772,7 +772,7 @@
     "Create new room": "Criar nova sala",
     "Welcome page": "Página de boas vindas",
     "Room directory": "Lista pública de salas",
-    "Start chat": "Iniciar conversa pessoal",
+    "Start chat": "Iniciar conversa",
     "New Password": "Nova senha",
     "Start chatting": "Iniciar a conversa",
     "Start Chatting": "Iniciar a conversa",

From a9a2b60dfc80dbaaca09d13bcf0cd3640e79df5a Mon Sep 17 00:00:00 2001
From: Walter <studinsky@gmail.com>
Date: Tue, 3 Oct 2017 12:35:30 +0000
Subject: [PATCH 056/123] Translated using Weblate (Russian)

Currently translated at 100.0% (855 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
---
 src/i18n/strings/ru.json | 48 ++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 48a070f066..8f317031be 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -3,7 +3,7 @@
     "accepted an invitation": "принял приглашение",
     "accepted the invitation for": "принял приглашение на",
     "Account": "Аккаунт",
-    "Add email address": "Добавить адрес электронной почты",
+    "Add email address": "Добавить адрес эл. почты",
     "Add phone number": "Добавить номер телефона",
     "Admin": "Администратор",
     "Advanced": "Дополнительно",
@@ -79,7 +79,7 @@
     "Failed to forget room": "Не удалось забыть комнату",
     "Failed to leave room": "Не удалось выйти из комнаты",
     "Failed to reject invitation": "Не удалось отклонить приглашение",
-    "Failed to send email": "Ошибка отправки электронной почты",
+    "Failed to send email": "Ошибка отправки эл. почты",
     "Failed to unban": "Не удалось разблокировать",
     "Failed to upload file": "Не удалось отправить файл",
     "Favourite": "Избранное",
@@ -95,9 +95,9 @@
     "Historical": "Архив",
     "Homeserver is": "Домашний сервер это",
     "Identity Server is": "Сервер идентификации это",
-    "I have verified my email address": "Я подтвердил свой адрес электронной почты",
+    "I have verified my email address": "Я подтвердил свой адрес эл. почты",
     "Import E2E room keys": "Импорт ключей сквозного шифрования",
-    "Invalid Email Address": "Недопустимый адрес электронной почты",
+    "Invalid Email Address": "Недопустимый адрес эл. почты",
     "invited": "invited",
     "Invite new room members": "Пригласить новых участников в комнату",
     "Invites": "Приглашает",
@@ -165,9 +165,9 @@
     "To send events of type": "Чтобы отправить тип события",
     "To send messages": "Чтобы отправить сообщения",
     "turned on end-to-end encryption (algorithm": "turned on end-to-end encryption (algorithm",
-    "Unable to add email address": "Не удается добавить адрес электронной почты",
+    "Unable to add email address": "Не удается добавить адрес эл. почты",
     "Unable to remove contact information": "Не удалось удалить контактную информацию",
-    "Unable to verify email address.": "Не удалось проверить адрес электронной почты.",
+    "Unable to verify email address.": "Не удалось проверить адрес эл. почты.",
     "Unban": "Разблокировать",
     "Unencrypted room": "Незашифрованная комната",
     "unencrypted": "без шифрования",
@@ -239,7 +239,7 @@
     "Failed to lookup current room": "Не удалось выполнить поиск текущий комнаты",
     "Failed to send request.": "Не удалось отправить запрос.",
     "Failed to set up conference call": "Не удалось настроить групповой вызов",
-    "Failed to verify email address: make sure you clicked the link in the email": "Не удалось проверить адрес электронной почты: убедитесь, что вы перешли по ссылке в письме",
+    "Failed to verify email address: make sure you clicked the link in the email": "Не удалось проверить адрес эл. почты: убедитесь, что вы перешли по ссылке в письме",
     "Failure to create room": "Не удалось создать комнату",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s с %(fromPowerLevel)s на %(toPowerLevel)s",
     "Guest users can't create new rooms. Please register to create room and start a chat.": "Гости не могут создавать новые комнаты. Зарегистрируйтесь, чтобы создать комнату и начать чат.",
@@ -267,7 +267,7 @@
     "Set a display name:": "Введите отображаемое имя:",
     "Passwords don't match.": "Пароли не совпадают.",
     "Password too short (min %(MIN_PASSWORD_LENGTH)s).": "Пароль слишком короткий (мин. %(MIN_PASSWORD_LENGTH)s).",
-    "This doesn't look like a valid email address.": "Это не похоже на допустимый адрес электронной почты.",
+    "This doesn't look like a valid email address.": "Это не похоже на допустимый адрес эл. почты.",
     "This server does not support authentication with a phone number.": "Этот сервер не поддерживает аутентификацию с помощью номера телефона.",
     "User names may only contain letters, numbers, dots, hyphens and underscores.": "Имена пользователей могут содержать только буквы, цифры, точки, дефисы и символы подчеркивания.",
     "An unknown error occurred.": "Произошла неизвестная ошибка.",
@@ -314,7 +314,7 @@
     "Thu": "Чт",
     "Fri": "Пт",
     "Sat": "Сб",
-    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Ваш адрес электронной почты, кажется, не связан с Matrix ID на этом домашнем сервере.",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Ваш адрес эл. почты, кажется, не связан с Matrix ID на этом домашнем сервере.",
     "to start a chat with someone": "чтобы начать чат с кем-то",
     "to tag direct chat": "отметить прямой чат",
     "To use it, just wait for autocomplete results to load and tab through them.": "Для того, чтобы использовать эту функцию, просто подождите автозаполнения результатов, а затем используйте клавишу TAB для прокрутки.",
@@ -366,7 +366,7 @@
     "Command error": "Ошибка команды",
     "Confirm password": "Подтвердите пароль",
     "Current password": "Текущий пароль",
-    "Email": "Электронная почта",
+    "Email": "Эл. почта",
     "Failed to kick": "Не удалось выгнать",
     "Failed to load timeline position": "Не удалось загрузить метку из хронологии",
     "Failed to mute user": "Не удалось заглушить пользователя",
@@ -452,15 +452,15 @@
     "The default role for new room members is": "Роль по умолчанию для новых участников комнаты",
     "The main address for this room is": "Основной адрес для этой комнаты",
     "This action cannot be performed by a guest user. Please register to be able to do this.": "Это действие не может быть выполнено гостем. Пожалуйста, зарегистрируйтесь, чтобы получить возможность сделать то что вы хотите.",
-    "This email address is already in use": "Этот адрес электронной почты уже используется",
-    "This email address was not found": "Этот адрес электронной почты не найден",
-    "The email address linked to your account must be entered.": "Необходимо ввести адрес электронной почты, связанный с вашей учетной записью.",
+    "This email address is already in use": "Этот адрес эл. почты уже используется",
+    "This email address was not found": "Этот адрес эл. почты не найден",
+    "The email address linked to your account must be entered.": "Необходимо ввести адрес эл. почты, связанный с вашей учетной записью.",
     "The file '%(fileName)s' failed to upload": "Не удалось отправить файл '%(fileName)s'",
     "The remote side failed to pick up": "Вызываемый абонент не ответил",
     "This room has no local addresses": "В этой комнате нет локальных адресов",
     "This room is not recognised.": "Эта комната не опознана.",
     "These are experimental features that may break in unexpected ways": "Это экспериментальные функции, которые могут себя вести неожиданным образом",
-    "This doesn't appear to be a valid email address": "Похоже, это недействительный адрес электронной почты",
+    "This doesn't appear to be a valid email address": "Похоже, это недействительный адрес эл. почты",
     "This is a preview of this room. Room interactions have been disabled": "Это предпросмотр комнаты. Взаимодействие с комнатой отключено",
     "This phone number is already in use": "Этот номер телефона уже используется",
     "This room's internal ID is": "Внутренний ID этой комнаты",
@@ -567,8 +567,8 @@
     "Device key:": "Ключ устройства:",
     "disabled": "отключено",
     "Disable markdown formatting": "Отключить Markdown-форматирование",
-    "Email address": "Адрес электронной почты",
-    "Email address (optional)": "Адрес электронной почты (необязательно)",
+    "Email address": "Адрес эл. почты",
+    "Email address (optional)": "Адрес эл. почты (необязательно)",
     "enabled": "включено",
     "Error decrypting attachment": "Ошибка при расшифровке вложения",
     "Export": "Экспорт",
@@ -608,7 +608,7 @@
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Предоставленный ключ подписи соответствует ключу, полученному от %(userId)s с устройства %(deviceId)s. Устройство помечено как проверенное.",
     "%(actionVerb)s this person?": "%(actionVerb)s этот человек?",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "Файл '%(fileName)s' превышает предельный размер, допустимый к отправке на этом домашнем сервере",
-    "This Home Server does not support login using email address.": "Этот домашний сервер не поддерживает авторизацию с использованием адреса электронной почты.",
+    "This Home Server does not support login using email address.": "Этот домашний сервер не поддерживает авторизацию с использованием адреса эл. почты.",
     "There was a problem logging in.": "Возникла проблема при авторизации.",
     "The visibility of existing history will be unchanged": "Видимость существующей истории не изменится",
     "this invitation?": "это приглашение?",
@@ -622,7 +622,7 @@
     "To link to a room it must have": "Для создания ссылки на комнату она должна иметь",
     "to make a room or": "чтобы создать комнату или",
     "To remove other users' messages": "Чтобы удалить сообщения других пользователей",
-    "To reset your password, enter the email address linked to your account": "Чтобы сбросить пароль, введите адрес электронной почты, связанный с вашей учетной записью",
+    "To reset your password, enter the email address linked to your account": "Чтобы сбросить пароль, введите адрес эл. почты, связанный с вашей учетной записью",
     "to tag as %(tagName)s": "пометить как %(tagName)s",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Попытка загрузить выбранный интервал истории чата этой комнаты не удалась, так как у вас нет разрешений на просмотр.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Попытка загрузить выбранный интервал истории чата этой комнаты не удалась, так как запрошенный элемент не найден.",
@@ -636,7 +636,7 @@
     "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "ВНИМАНИЕ: ОШИБКА ПРОВЕРКИ КЛЮЧЕЙ! Ключ подписи пользователя %(userId)s на устройстве %(deviceId)s — \"%(fprint)s\", и он не соответствует предоставленному ключу \"%(fingerprint)s\". Это может означать, что ваше общение перехватывается!",
     "You have <a>disabled</a> URL previews by default.": "Предварительный просмотр ссылок <a>отключен</a> по-умолчанию.",
     "You have <a>enabled</a> URL previews by default.": "Предварительный просмотр ссылок <a>включен</a> по-умолчанию.",
-    "You have entered an invalid contact. Try using their Matrix ID or email address.": "Вы ввели недопустимый контакт. Попробуйте использовать Matrix ID или адрес электронной почты.",
+    "You have entered an invalid contact. Try using their Matrix ID or email address.": "Вы ввели недопустимый контакт. Попробуйте использовать Matrix ID или адрес эл. почты.",
     "You need to enter a user name.": "Необходимо ввести имя пользователя.",
     "You seem to be in a call, are you sure you want to quit?": "Звонок не завершен, вы уверены, что хотите выйти?",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Вы не сможете отменить это изменение, так как этот пользователь получит уровень доступа, аналогичный вашему.",
@@ -699,12 +699,12 @@
     "Sign in with CAS": "Войти с помощью CAS",
     "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "Вы можете использовать настраиваемые параметры сервера для входа на другие серверы Matrix, указав другой URL-адрес домашнего сервера.",
     "This allows you to use this app with an existing Matrix account on a different home server.": "Это позволяет использовать это приложение с существующей учетной записью Matrix на другом домашнем сервере.",
-    "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "Вы также можете установить другой сервер идентификации, но это, как правило, будет препятствовать взаимодействию с пользователями на основе адреса электронной почты.",
+    "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "Вы также можете установить другой сервер идентификации, но это, как правило, будет препятствовать взаимодействию с пользователями на основе адреса эл. почты.",
     "Please check your email to continue registration.": "Проверьте электронную почту, чтобы продолжить регистрацию.",
     "Token incorrect": "Неверный токен",
     "A text message has been sent to": "Текстовое сообщение отправлено",
     "Please enter the code it contains:": "Введите полученный код:",
-    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Если адрес электронной почты не указан, сброс пароля будет невозможным. Уверены?",
+    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Если адрес эл. почты не указан, сброс пароля будет невозможным. Уверены?",
     "You are registering with %(SelectedTeamName)s": "Вы регистрируетесь на %(SelectedTeamName)s",
     "Default server": "Сервер по умолчанию",
     "Custom server": "Пользовательский сервер",
@@ -807,7 +807,7 @@
     "Seen by %(userName)s at %(dateTime)s": "Просмотрено %(userName)s в %(dateTime)s",
     "Send anyway": "Отправить в любом случае",
     "Show Text Formatting Toolbar": "Показать панель инструментов форматирования текста",
-    "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:": "Это приглашение было отправлено на адрес эл. почты, не связанный с этой учетной записью:",
     "To link to a room it must have <a>an address</a>.": "Чтобы связаться с комнатой, она должна иметь <a> адрес</a>.",
     "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "Не удалось установить соответствует ли адрес, по которому этому приглашение было послано, вашей учетной записи.",
     "Undecryptable": "Невозможно расшифровать",
@@ -824,7 +824,7 @@
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Не удается подключиться к домашнему серверу - проверьте подключение, убедитесь, что ваш <a>SSL-сертификат домашнего сервера</a> является доверенным и что расширение браузера не блокирует запросы.",
     "You have been banned from %(roomName)s by %(userName)s.": "%(userName)s заблокировал вас в %(roomName)s.",
     "You have been kicked from %(roomName)s by %(userName)s.": "%(userName)s выгнал вас из %(roomName)s.",
-    "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.": "При желании вы можете войти в систему с другой учетной записью или добавить этот адрес эл. почты в эту учетную запись.",
     "Your home server does not support device management.": "Ваш домашний сервер не поддерживает управление устройствами.",
     "(could not connect media)": "(подключение к СМИ не может быть установлено)",
     "(no answer)": "(нет ответа)",
@@ -833,7 +833,7 @@
     "Not a valid Riot keyfile": "Недействительный файл ключа Riot",
     "Your browser does not support the required cryptography extensions": "Ваш браузер не поддерживает требуемые криптографические расширения",
     "Authentication check failed: incorrect password?": "Ошибка аутентификации: неправильный пароль?",
-    "Do you want to set an email address?": "Хотите указать адрес электронной почты?",
+    "Do you want to set an email address?": "Хотите указать адрес эл. почты?",
     "This will allow you to reset your password and receive notifications.": "Это позволит при необходимости сбросить пароль и получать уведомления.",
     "Press <StartChatButton> to start a chat with someone": "Нажмите <StartChatButton> для начала чата с кем-либо",
     "You're not in any rooms yet! Press <CreateRoomButton> to make a room or <RoomDirectoryButton> to browse the directory": "Вы еще не вошли ни в одну из комнат! Нажмите <CreateRoomButton>, чтобы создать комнату или <RoomDirectoryButton> для просмотра каталога",

From 5abf30f37358a3c39cd510c446a9846582fc92fd Mon Sep 17 00:00:00 2001
From: Walter <studinsky@gmail.com>
Date: Tue, 3 Oct 2017 12:47:27 +0000
Subject: [PATCH 057/123] Translated using Weblate (Ukrainian)

Currently translated at 13.6% (117 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
---
 src/i18n/strings/uk.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json
index 27b36b8da5..25827a77db 100644
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -110,5 +110,10 @@
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s змінив(ла) рівень доступу для %(powerLevelDiffText)s.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s змінив(ла) назву кімнати на %(roomName)s.",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s видалив ім'я кімнати.",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s змінив тему на %(topic)s."
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s змінив тему на %(topic)s.",
+    "Email": "е-почта",
+    "Email address": "Адреса е-почти",
+    "Email address (optional)": "Адреса е-почти (не обов'язково)",
+    "Email, name or matrix ID": "Е-почта, ім'я або matrix ID",
+    "Failed to send email": "Помилка відправки  е-почти"
 }

From d25ebfb8447385d53a37aaaaceca31798003808a Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Wed, 4 Oct 2017 10:15:44 +0100
Subject: [PATCH 058/123] Remove cruft from EIL

---
 .../views/elements/EditableItemList.js        | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/src/components/views/elements/EditableItemList.js b/src/components/views/elements/EditableItemList.js
index 1d269f26e2..6675e162c4 100644
--- a/src/components/views/elements/EditableItemList.js
+++ b/src/components/views/elements/EditableItemList.js
@@ -89,29 +89,15 @@ module.exports = React.createClass({
             onItemAdded: () => {},
             onItemEdited: () => {},
             onItemRemoved: () => {},
+            onNewItemChanged: () => {},
         };
     },
 
-    getInitialState: function() {
-        return {};
-    },
-
-    componentWillReceiveProps: function(nextProps) {
-    },
-
-    componentWillMount: function() {
-    },
-
-    componentDidMount: function() {
-    },
-
     onItemAdded: function(value) {
-        console.info('onItemAdded', value);
         this.props.onItemAdded(value);
     },
 
     onItemEdited: function(value, index) {
-        console.info('onItemEdited', value, index);
         if (value.length === 0) {
             this.onItemRemoved(index);
         } else {
@@ -120,7 +106,6 @@ module.exports = React.createClass({
     },
 
     onItemRemoved: function(index) {
-        console.info('onItemRemoved', index);
         this.props.onItemRemoved(index);
     },
 
@@ -143,8 +128,6 @@ module.exports = React.createClass({
         const label = this.props.items.length > 0 ?
             this.props.itemsLabel : this.props.noItemsLabel;
 
-        console.info('New item:', this.props.newItem);
-
         return (<div className="mx_EditableItemList">
             <div className="mx_EditableItemList_label">
                 { label }

From 407a632a8d51add81d4fd9df97f93406170618a8 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Wed, 4 Oct 2017 10:26:43 +0100
Subject: [PATCH 059/123] Fix typo

---
 src/components/views/room_settings/AliasSettings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index 8a6abec35d..8bccac0f93 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -263,7 +263,7 @@ module.exports = React.createClass({
                     className={"mx_RoomSettings_localAliases"}
                     items={this.state.domainToAliases[localDomain] || []}
                     newItem={this.state.newAlias}
-                    onNewItemChanged={onNewAliasChanged}
+                    onNewItemChanged={this.onNewAliasChanged}
                     onItemAdded={this.onLocalAliasAdded}
                     onItemEdited={this.onLocalAliasChanged}
                     onItemRemoved={this.onLocalAliasDeleted}

From 4e9694be6d4f7817d7f39536b55349c127c59765 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Wed, 4 Oct 2017 10:28:26 +0100
Subject: [PATCH 060/123] Maintain "blur to add" function to match previous UX

---
 src/components/views/elements/EditableItemList.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/views/elements/EditableItemList.js b/src/components/views/elements/EditableItemList.js
index 6675e162c4..267244759a 100644
--- a/src/components/views/elements/EditableItemList.js
+++ b/src/components/views/elements/EditableItemList.js
@@ -30,19 +30,22 @@ const EditableItem = React.createClass({
         onChange: PropTypes.func,
         onRemove: PropTypes.func,
         onAdd: PropTypes.func,
+
+        addOnChange: PropTypes.bool,
     },
 
     onChange: function(value) {
         this.setState({ value });
         if (this.props.onChange) this.props.onChange(value, this.props.index);
+        if (this.props.addOnChange && this.props.onAdd) this.props.onAdd(value);
     },
 
     onRemove: function() {
-        this.props.onRemove(this.props.index);
+        if (this.props.onRemove) this.props.onRemove(this.props.index);
     },
 
     onAdd: function() {
-        this.props.onAdd(this.state.value);
+        if (this.props.onAdd) this.props.onAdd(this.state.value);
     },
 
     render: function() {
@@ -138,6 +141,7 @@ module.exports = React.createClass({
                 initialValue={this.props.newItem}
                 onAdd={this.onItemAdded}
                 onChange={this.onNewItemChanged}
+                addOnChange={true}
                 placeholder={this.props.placeholder}
             />
         </div>);

From 9e3954865a2de182503422c19f93648c35c5eccf Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Wed, 4 Oct 2017 13:15:38 +0100
Subject: [PATCH 061/123] Fix a couple of bugs with EditableItemList

 - fix entering the same thing twice (which had the bug of not emptying the "new" field)
 - fix editing items in the list (which would stack overflow because of typo)
---
 src/components/views/elements/EditableItemList.js | 2 +-
 src/components/views/elements/EditableText.js     | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/views/elements/EditableItemList.js b/src/components/views/elements/EditableItemList.js
index 267244759a..35e207daef 100644
--- a/src/components/views/elements/EditableItemList.js
+++ b/src/components/views/elements/EditableItemList.js
@@ -104,7 +104,7 @@ module.exports = React.createClass({
         if (value.length === 0) {
             this.onItemRemoved(index);
         } else {
-            this.onItemEdited(value, index);
+            this.props.onItemEdited(value, index);
         }
     },
 
diff --git a/src/components/views/elements/EditableText.js b/src/components/views/elements/EditableText.js
index 3ce8c90447..b6a0ec1d5c 100644
--- a/src/components/views/elements/EditableText.js
+++ b/src/components/views/elements/EditableText.js
@@ -65,7 +65,9 @@ module.exports = React.createClass({
     },
 
     componentWillReceiveProps: function(nextProps) {
-        if (nextProps.initialValue !== this.props.initialValue) {
+        if (nextProps.initialValue !== this.props.initialValue ||
+            nextProps.initialValue !== this.value
+        ) {
             this.value = nextProps.initialValue;
             if (this.refs.editable_div) {
                 this.showPlaceholder(!this.value);

From 7be5e685f74be2e79b341a1e61a8be478d05d2f6 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Wed, 4 Oct 2017 13:19:57 +0100
Subject: [PATCH 062/123] Implement UI for editing related groups of a room

(using the new EditableItemList)
---
 .../room_settings/RelatedGroupSettings.js     | 130 ++++++++++++++++++
 src/components/views/rooms/RoomSettings.js    |  14 ++
 src/i18n/strings/en_EN.json                   |   6 +-
 3 files changed, 149 insertions(+), 1 deletion(-)
 create mode 100644 src/components/views/room_settings/RelatedGroupSettings.js

diff --git a/src/components/views/room_settings/RelatedGroupSettings.js b/src/components/views/room_settings/RelatedGroupSettings.js
new file mode 100644
index 0000000000..942251e54b
--- /dev/null
+++ b/src/components/views/room_settings/RelatedGroupSettings.js
@@ -0,0 +1,130 @@
+/*
+Copyright 2017 New Vector Ltd.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// import Promise from 'bluebird';
+import React from 'react';
+import {MatrixEvent, MatrixClient} from 'matrix-js-sdk';
+// var ObjectUtils = require("../../../ObjectUtils");
+// var MatrixClientPeg = require('../../../MatrixClientPeg');
+import sdk from '../../../index';
+import { _t } from '../../../languageHandler';
+import Modal from '../../../Modal';
+
+const GROUP_ID_REGEX = /\+\S+\:\S+/;
+
+module.exports = React.createClass({
+    displayName: 'RelatedGroupSettings',
+
+    propTypes: {
+        roomId: React.PropTypes.string.isRequired,
+        canSetRelatedRooms: React.PropTypes.bool.isRequired,
+        relatedGroupsEvent: React.PropTypes.instanceOf(MatrixEvent),
+    },
+
+    contextTypes: {
+        matrixClient: React.PropTypes.instanceOf(MatrixClient),
+    },
+
+    getDefaultProps: function() {
+        return {
+            canSetRelatedRooms: false,
+        };
+    },
+
+    getInitialState: function() {
+        return {
+            newGroupsList: this.props.relatedGroupsEvent ?
+                (this.props.relatedGroupsEvent.getContent().groups || []) : [],
+            newGroupId: null,
+        };
+    },
+
+    saveSettings: function() {
+        return this.context.matrixClient.sendStateEvent(
+            this.props.roomId,
+            'm.room.related_groups',
+            {
+                groups: this.state.newGroupsList,
+            },
+            '',
+        );
+    },
+
+    validateGroupId: function(groupId) {
+        const localDomain = this.context.matrixClient.getDomain();
+        if (!GROUP_ID_REGEX.test(groupId) || !groupId.endsWith(localDomain)) {
+            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+            Modal.createTrackedDialog('Invalid related group ID', '', ErrorDialog, {
+                title: _t('Invalid group ID'),
+                description: _t('\'%(groupId)s\' is not a valid group ID', { groupId }),
+            });
+            return false;
+        }
+        return true;
+    },
+
+    onNewGroupChanged: function(newGroupId) {
+        this.setState({ newGroupId });
+    },
+
+    onGroupAdded: function(groupId) {
+        if (groupId.length === 0 || !this.validateGroupId(groupId)) {
+            return;
+        }
+        this.setState({
+            newGroupsList: this.state.newGroupsList.concat([groupId]),
+            newGroupId: '',
+        });
+    },
+
+    onGroupEdited: function(groupId, index) {
+        if (groupId.length === 0 || !this.validateGroupId(groupId)) {
+            return;
+        }
+        this.setState({
+            newGroupsList: Object.assign(this.state.newGroupsList, {[index]: groupId}),
+        });
+    },
+
+    onGroupDeleted: function(index) {
+        const newGroupsList = this.state.newGroupsList.slice();
+        newGroupsList.splice(index, 1),
+        this.setState({ newGroupsList });
+    },
+
+    render: function() {
+        const localDomain = this.context.matrixClient.getDomain();
+        const EditableItemList = sdk.getComponent('elements.EditableItemList');
+        console.info(this.state.newGroupsList);
+        return (<div>
+            <h3>{ _t('Related Groups') }</h3>
+            <EditableItemList
+                items={this.state.newGroupsList}
+                className={"mx_RelatedGroupSettings"}
+                newItem={this.state.newGroupId}
+                onNewItemChanged={this.onNewGroupChanged}
+                onItemAdded={this.onGroupAdded}
+                onItemEdited={this.onGroupEdited}
+                onItemRemoved={this.onGroupDeleted}
+                itemsLabel={_t('Related groups for this room:')}
+                noItemsLabel={_t('This room has no related groups')}
+                placeholder={_t(
+                    'New group ID (e.g. +foo:%(localDomain)s)', {localDomain},
+                )}
+            />
+        </div>);
+    },
+});
diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js
index 0fea50d2fa..d1d32d8c71 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -287,6 +287,9 @@ module.exports = React.createClass({
             promises.push(ps);
         }
 
+        // related groups
+        promises.push(this.saveRelatedGroups());
+
         // encryption
         p = this.saveEnableEncryption();
         if (!p.isFulfilled()) {
@@ -304,6 +307,11 @@ module.exports = React.createClass({
         return this.refs.alias_settings.saveSettings();
     },
 
+    saveRelatedGroups: function() {
+        if (!this.refs.related_groups) { return Promise.resolve(); }
+        return this.refs.related_groups.saveSettings();
+    },
+
     saveColor: function() {
         if (!this.refs.color_settings) { return Promise.resolve(); }
         return this.refs.color_settings.saveSettings();
@@ -590,6 +598,7 @@ module.exports = React.createClass({
         var AliasSettings = sdk.getComponent("room_settings.AliasSettings");
         var ColorSettings = sdk.getComponent("room_settings.ColorSettings");
         var UrlPreviewSettings = sdk.getComponent("room_settings.UrlPreviewSettings");
+        var RelatedGroupSettings = sdk.getComponent("room_settings.RelatedGroupSettings");
         var EditableText = sdk.getComponent('elements.EditableText');
         var PowerSelector = sdk.getComponent('elements.PowerSelector');
         var Loader = sdk.getComponent("elements.Spinner");
@@ -846,6 +855,11 @@ module.exports = React.createClass({
                     canonicalAliasEvent={this.props.room.currentState.getStateEvents('m.room.canonical_alias', '')}
                     aliasEvents={this.props.room.currentState.getStateEvents('m.room.aliases')} />
 
+                <RelatedGroupSettings ref="related_groups"
+                    roomId={this.props.room.roomId}
+                    canSetRelatedGroups={roomState.mayClientSendStateEvent("m.room.related_groups", cli)}
+                    relatedGroupsEvent={this.props.room.currentState.getStateEvents('m.room.related_groups', '')} />
+
                 <UrlPreviewSettings ref="url_preview_settings" room={this.props.room} />
 
                 <h3>{ _t('Permissions') }</h3>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 6a8c848f14..6acaba9fae 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -902,5 +902,9 @@
     "Failed to remove room from group": "Failed to remove room from group",
     "Failed to remove '%(roomName)s' from %(groupId)s": "Failed to remove '%(roomName)s' from %(groupId)s",
     "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Are you sure you want to remove '%(roomName)s' from %(groupId)s?",
-    "Removing a room from the group will also remove it from the group page.": "Removing a room from the group will also remove it from the group page."
+    "Removing a room from the group will also remove it from the group page.": "Removing a room from the group will also remove it from the group page.",
+    "Related Groups": "Related Groups",
+    "Related groups for this room:": "Related groups for this room:",
+    "This room has no related groups": "This room has no related groups",
+    "New group ID (e.g. +foo:%(localDomain)s)": "New group ID (e.g. +foo:%(localDomain)s)"
 }

From 8d46b199168ec54c373317e7e53a51dbfe0409d9 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Wed, 4 Oct 2017 14:06:49 +0100
Subject: [PATCH 063/123] Restrict Flair in the timeline to related groups of
 the room

---
 src/components/views/elements/Flair.js        | 30 +++++++++++++++++++
 .../views/messages/SenderProfile.js           |  8 ++++-
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/src/components/views/elements/Flair.js b/src/components/views/elements/Flair.js
index 61df660fd5..84c0c2a187 100644
--- a/src/components/views/elements/Flair.js
+++ b/src/components/views/elements/Flair.js
@@ -183,10 +183,12 @@ export default class Flair extends React.Component {
         this.state = {
             profiles: [],
         };
+        this.onRoomStateEvents = this.onRoomStateEvents.bind(this);
     }
 
     componentWillUnmount() {
         this._unmounted = true;
+        this.context.matrixClient.removeListener('RoomState.events', this.onRoomStateEvents);
     }
 
     componentWillMount() {
@@ -194,6 +196,13 @@ export default class Flair extends React.Component {
         if (UserSettingsStore.isFeatureEnabled('feature_groups') && groupSupport) {
             this._generateAvatars();
         }
+        this.context.matrixClient.on('RoomState.events', this.onRoomStateEvents);
+    }
+
+    onRoomStateEvents(event) {
+        if (event.getType() === 'm.room.related_groups' && groupSupport) {
+            this._generateAvatars();
+        }
     }
 
     async _getGroupProfiles(groups) {
@@ -224,6 +233,21 @@ export default class Flair extends React.Component {
             }
             console.error('Could not get groups for user', this.props.userId, err);
         }
+        if (this.props.roomId && this.props.showRelated) {
+            const relatedGroupsEvent = this.context.matrixClient
+                .getRoom(this.props.roomId)
+                .currentState
+                .getStateEvents('m.room.related_groups', '');
+            const relatedGroups = relatedGroupsEvent ?
+                relatedGroupsEvent.getContent().groups || [] : [];
+            if (relatedGroups && relatedGroups.length > 0) {
+                groups = groups.filter((groupId) => {
+                    return relatedGroups.includes(groupId);
+                });
+            } else {
+                groups = [];
+            }
+        }
         if (!groups || groups.length === 0) {
             return;
         }
@@ -250,6 +274,12 @@ export default class Flair extends React.Component {
 
 Flair.propTypes = {
     userId: PropTypes.string,
+
+    // Whether to show only the flair associated with related groups of the given room,
+    // or all flair associated with a user.
+    showRelated: PropTypes.bool,
+    // The room that this flair will be displayed in. Optional. Only applies when showRelated = true.
+    roomId: PropTypes.string,
 };
 
 // TODO: We've decided that all components should follow this pattern, which means removing withMatrixClient and using
diff --git a/src/components/views/messages/SenderProfile.js b/src/components/views/messages/SenderProfile.js
index 0311239e7a..63e3144115 100644
--- a/src/components/views/messages/SenderProfile.js
+++ b/src/components/views/messages/SenderProfile.js
@@ -33,7 +33,13 @@ export default function SenderProfile(props) {
     return (
         <div className="mx_SenderProfile" dir="auto" onClick={props.onClick}>
             <EmojiText className="mx_SenderProfile_name">{ name || '' }</EmojiText>
-            { props.enableFlair ? <Flair userId={mxEvent.getSender()} /> : null }
+            { props.enableFlair ?
+                <Flair
+                    userId={mxEvent.getSender()}
+                    roomId={mxEvent.getRoomId()}
+                    showRelated={true} />
+                : null
+            }
             { props.aux ? <EmojiText className="mx_SenderProfile_aux"> { props.aux }</EmojiText> : null }
         </div>
     );

From 02e7287123b9fe70e2baef9bd581e5ab2132077c Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Wed, 4 Oct 2017 14:08:31 +0100
Subject: [PATCH 064/123] Remove constraint on groups being local, remove
 logging

---
 src/components/views/room_settings/RelatedGroupSettings.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/views/room_settings/RelatedGroupSettings.js b/src/components/views/room_settings/RelatedGroupSettings.js
index 942251e54b..d3be2c88b5 100644
--- a/src/components/views/room_settings/RelatedGroupSettings.js
+++ b/src/components/views/room_settings/RelatedGroupSettings.js
@@ -64,8 +64,7 @@ module.exports = React.createClass({
     },
 
     validateGroupId: function(groupId) {
-        const localDomain = this.context.matrixClient.getDomain();
-        if (!GROUP_ID_REGEX.test(groupId) || !groupId.endsWith(localDomain)) {
+        if (!GROUP_ID_REGEX.test(groupId)) {
             const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             Modal.createTrackedDialog('Invalid related group ID', '', ErrorDialog, {
                 title: _t('Invalid group ID'),
@@ -108,7 +107,6 @@ module.exports = React.createClass({
     render: function() {
         const localDomain = this.context.matrixClient.getDomain();
         const EditableItemList = sdk.getComponent('elements.EditableItemList');
-        console.info(this.state.newGroupsList);
         return (<div>
             <h3>{ _t('Related Groups') }</h3>
             <EditableItemList

From 0c6b5776ecd5b50419021e1f55d2088be9f8a301 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Wed, 4 Oct 2017 14:09:51 +0100
Subject: [PATCH 065/123] Remove commented imports

---
 src/components/views/room_settings/RelatedGroupSettings.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/components/views/room_settings/RelatedGroupSettings.js b/src/components/views/room_settings/RelatedGroupSettings.js
index d3be2c88b5..60bdbf1481 100644
--- a/src/components/views/room_settings/RelatedGroupSettings.js
+++ b/src/components/views/room_settings/RelatedGroupSettings.js
@@ -14,11 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// import Promise from 'bluebird';
 import React from 'react';
 import {MatrixEvent, MatrixClient} from 'matrix-js-sdk';
-// var ObjectUtils = require("../../../ObjectUtils");
-// var MatrixClientPeg = require('../../../MatrixClientPeg');
 import sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';

From ed74ac394bfa5d44240ac0cedfccda22576edddb Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Wed, 4 Oct 2017 14:35:13 +0100
Subject: [PATCH 066/123] Put related groups UI behind groups labs flag

---
 src/components/views/rooms/RoomSettings.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js
index d1d32d8c71..b542dbaf55 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -631,6 +631,14 @@ module.exports = React.createClass({
 
         var self = this;
 
+        let relatedGroupsSection;
+        if (UserSettingsStore.isFeatureEnabled('feature_groups')) {
+            relatedGroupsSection = <RelatedGroupSettings ref="related_groups"
+                roomId={this.props.room.roomId}
+                canSetRelatedGroups={roomState.mayClientSendStateEvent("m.room.related_groups", cli)}
+                relatedGroupsEvent={this.props.room.currentState.getStateEvents('m.room.related_groups', '')} />;
+        }
+
         var userLevelsSection;
         if (Object.keys(user_levels).length) {
             userLevelsSection =
@@ -855,10 +863,7 @@ module.exports = React.createClass({
                     canonicalAliasEvent={this.props.room.currentState.getStateEvents('m.room.canonical_alias', '')}
                     aliasEvents={this.props.room.currentState.getStateEvents('m.room.aliases')} />
 
-                <RelatedGroupSettings ref="related_groups"
-                    roomId={this.props.room.roomId}
-                    canSetRelatedGroups={roomState.mayClientSendStateEvent("m.room.related_groups", cli)}
-                    relatedGroupsEvent={this.props.room.currentState.getStateEvents('m.room.related_groups', '')} />
+                { relatedGroupsSection }
 
                 <UrlPreviewSettings ref="url_preview_settings" room={this.props.room} />
 

From 4017fa7f1d4581423feff35cdf070bcddfe0b5e2 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Wed, 4 Oct 2017 16:56:35 +0100
Subject: [PATCH 067/123] Factor-out GroupStore and create GroupStoreCache

In order to provide feedback when adding a room to a group, the group summarry store needs to be extended to store the list of rooms in a group. This commit is the first step required.

The next step is to get the GroupRoomList listening to updates from GroupStore and expose the list of rooms from GroupStore.

(We're running out of words to describe the hierachy of things that store things)
---
 src/GroupAddressPicker.js                     |  6 ++-
 src/components/structures/GroupView.js        | 49 +++++++++----------
 .../{GroupSummaryStore.js => GroupStore.js}   | 10 +++-
 src/stores/GroupStoreCache.js                 | 37 ++++++++++++++
 4 files changed, 73 insertions(+), 29 deletions(-)
 rename src/stores/{GroupSummaryStore.js => GroupStore.js} (89%)
 create mode 100644 src/stores/GroupStoreCache.js

diff --git a/src/GroupAddressPicker.js b/src/GroupAddressPicker.js
index 00eed78f76..cfd2590780 100644
--- a/src/GroupAddressPicker.js
+++ b/src/GroupAddressPicker.js
@@ -19,6 +19,7 @@ import sdk from './';
 import MultiInviter from './utils/MultiInviter';
 import { _t } from './languageHandler';
 import MatrixClientPeg from './MatrixClientPeg';
+import GroupStoreCache from './stores/GroupStoreCache';
 
 export function showGroupInviteDialog(groupId) {
     const AddressPickerDialog = sdk.getComponent("dialogs.AddressPickerDialog");
@@ -86,10 +87,11 @@ function _onGroupInviteFinished(groupId, addrs) {
 }
 
 function _onGroupAddRoomFinished(groupId, addrs) {
+    const groupStore = GroupStoreCache.getGroupStore(MatrixClientPeg.get(), groupId);
     const errorList = [];
     return Promise.all(addrs.map((addr) => {
-        return MatrixClientPeg.get()
-            .addRoomToGroup(groupId, addr.address)
+        return groupStore
+            .addRoomToGroup(addr.address)
             .catch(() => { errorList.push(addr.address); })
             .reflect();
     })).then(() => {
diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 5381f9add3..337ac6ab75 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -27,7 +27,8 @@ import AccessibleButton from '../views/elements/AccessibleButton';
 import Modal from '../../Modal';
 import classnames from 'classnames';
 
-import GroupSummaryStore from '../../stores/GroupSummaryStore';
+import GroupStoreCache from '../../stores/GroupStoreCache';
+import GroupStore from '../../stores/GroupStore';
 
 const RoomSummaryType = PropTypes.shape({
     room_id: PropTypes.string.isRequired,
@@ -78,7 +79,7 @@ const CategoryRoomList = React.createClass({
                 if (!success) return;
                 const errorList = [];
                 Promise.all(addrs.map((addr) => {
-                    return this.context.groupSummaryStore
+                    return this.context.groupStore
                         .addRoomToGroupSummary(addr.address)
                         .catch(() => { errorList.push(addr.address); })
                         .reflect();
@@ -157,7 +158,7 @@ const FeaturedRoom = React.createClass({
     onDeleteClicked: function(e) {
         e.preventDefault();
         e.stopPropagation();
-        this.context.groupSummaryStore.removeRoomFromGroupSummary(
+        this.context.groupStore.removeRoomFromGroupSummary(
             this.props.summaryInfo.room_id,
         ).catch((err) => {
             console.error('Error whilst removing room from group summary', err);
@@ -252,7 +253,7 @@ const RoleUserList = React.createClass({
                 if (!success) return;
                 const errorList = [];
                 Promise.all(addrs.map((addr) => {
-                    return this.context.groupSummaryStore
+                    return this.context.groupStore
                         .addUserToGroupSummary(addr.address)
                         .catch(() => { errorList.push(addr.address); })
                         .reflect();
@@ -327,7 +328,7 @@ const FeaturedUser = React.createClass({
     onDeleteClicked: function(e) {
         e.preventDefault();
         e.stopPropagation();
-        this.context.groupSummaryStore.removeUserFromGroupSummary(
+        this.context.groupStore.removeUserFromGroupSummary(
             this.props.summaryInfo.user_id,
         ).catch((err) => {
             console.error('Error whilst removing user from group summary', err);
@@ -373,14 +374,14 @@ const FeaturedUser = React.createClass({
     },
 });
 
-const GroupSummaryContext = {
-    groupSummaryStore: React.PropTypes.instanceOf(GroupSummaryStore).isRequired,
+const GroupContext = {
+    groupStore: React.PropTypes.instanceOf(GroupStore).isRequired,
 };
 
-CategoryRoomList.contextTypes = GroupSummaryContext;
-FeaturedRoom.contextTypes = GroupSummaryContext;
-RoleUserList.contextTypes = GroupSummaryContext;
-FeaturedUser.contextTypes = GroupSummaryContext;
+CategoryRoomList.contextTypes = GroupContext;
+FeaturedRoom.contextTypes = GroupContext;
+RoleUserList.contextTypes = GroupContext;
+FeaturedUser.contextTypes = GroupContext;
 
 export default React.createClass({
     displayName: 'GroupView',
@@ -390,12 +391,12 @@ export default React.createClass({
     },
 
     childContextTypes: {
-        groupSummaryStore: React.PropTypes.instanceOf(GroupSummaryStore),
+        groupStore: React.PropTypes.instanceOf(GroupStore),
     },
 
     getChildContext: function() {
         return {
-            groupSummaryStore: this._groupSummaryStore,
+            groupStore: this._groupStore,
         };
     },
 
@@ -413,14 +414,14 @@ export default React.createClass({
 
     componentWillMount: function() {
         this._changeAvatarComponent = null;
-        this._initGroupSummaryStore(this.props.groupId);
+        this._initGroupStore(this.props.groupId);
 
         MatrixClientPeg.get().on("Group.myMembership", this._onGroupMyMembership);
     },
 
     componentWillUnmount: function() {
         MatrixClientPeg.get().removeListener("Group.myMembership", this._onGroupMyMembership);
-        this._groupSummaryStore.removeAllListeners();
+        this._groupStore.removeAllListeners();
     },
 
     componentWillReceiveProps: function(newProps) {
@@ -429,7 +430,7 @@ export default React.createClass({
                 summary: null,
                 error: null,
             }, () => {
-                this._initGroupSummaryStore(newProps.groupId);
+                this._initGroupStore(newProps.groupId);
             });
         }
     },
@@ -440,17 +441,15 @@ export default React.createClass({
         this.setState({membershipBusy: false});
     },
 
-    _initGroupSummaryStore: function(groupId) {
-        this._groupSummaryStore = new GroupSummaryStore(
-            MatrixClientPeg.get(), this.props.groupId,
-        );
-        this._groupSummaryStore.on('update', () => {
+    _initGroupStore: function(groupId) {
+        this._groupStore = GroupStoreCache.getGroupStore(MatrixClientPeg.get(), groupId);
+        this._groupStore.on('update', () => {
             this.setState({
-                summary: this._groupSummaryStore.getSummary(),
+                summary: this._groupStore.getSummary(),
                 error: null,
             });
         });
-        this._groupSummaryStore.on('error', (err) => {
+        this._groupStore.on('error', (err) => {
             this.setState({
                 summary: null,
                 error: err,
@@ -527,7 +526,7 @@ export default React.createClass({
                 editing: false,
                 summary: null,
             });
-            this._initGroupSummaryStore(this.props.groupId);
+            this._initGroupStore(this.props.groupId);
         }).catch((e) => {
             this.setState({
                 saving: false,
@@ -606,7 +605,7 @@ export default React.createClass({
         this.setState({
             publicityBusy: true,
         });
-        this._groupSummaryStore.setGroupPublicity(publicity).then(() => {
+        this._groupStore.setGroupPublicity(publicity).then(() => {
             this.setState({
                 publicityBusy: false,
             });
diff --git a/src/stores/GroupSummaryStore.js b/src/stores/GroupStore.js
similarity index 89%
rename from src/stores/GroupSummaryStore.js
rename to src/stores/GroupStore.js
index aa6e74529b..cffffd8b2e 100644
--- a/src/stores/GroupSummaryStore.js
+++ b/src/stores/GroupStore.js
@@ -17,9 +17,10 @@ limitations under the License.
 import EventEmitter from 'events';
 
 /**
- * Stores the group summary for a room and provides an API to change it
+ * Stores the group summary for a room and provides an API to change it and
+ * other useful group APIs may have an effect on the group summary.
  */
-export default class GroupSummaryStore extends EventEmitter {
+export default class GroupStore extends EventEmitter {
     constructor(matrixClient, groupId) {
         super();
         this._groupId = groupId;
@@ -45,6 +46,11 @@ export default class GroupSummaryStore extends EventEmitter {
         return this._summary;
     }
 
+    addRoomToGroup(roomId) {
+        return this._matrixClient
+            .addRoomToGroup(this._groupId, roomId);
+    }
+
     addRoomToGroupSummary(roomId, categoryId) {
         return this._matrixClient
             .addRoomToGroupSummary(this._groupId, roomId, categoryId)
diff --git a/src/stores/GroupStoreCache.js b/src/stores/GroupStoreCache.js
new file mode 100644
index 0000000000..ade0445e97
--- /dev/null
+++ b/src/stores/GroupStoreCache.js
@@ -0,0 +1,37 @@
+/*
+Copyright 2017 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import GroupStore from './GroupStore';
+
+class GroupStoreCache {
+    constructor() {
+        this.groupStores = {};
+    }
+
+    getGroupStore(matrixClient, groupId) {
+        if (!this.groupStores[groupId]) {
+            this.groupStores[groupId] = new GroupStore(matrixClient, groupId);
+        }
+        return this.groupStores[groupId];
+    }
+}
+
+
+let singletonGroupStoreCache = null;
+if (!singletonGroupStoreCache) {
+    singletonGroupStoreCache = new GroupStoreCache();
+}
+module.exports = singletonGroupStoreCache;

From b16eb1713e3ad231d9b578d9b3259813d8cff60e Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Wed, 4 Oct 2017 17:01:44 +0100
Subject: [PATCH 068/123] Typo

---
 src/stores/GroupStore.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/stores/GroupStore.js b/src/stores/GroupStore.js
index cffffd8b2e..f15561bbb0 100644
--- a/src/stores/GroupStore.js
+++ b/src/stores/GroupStore.js
@@ -18,7 +18,7 @@ import EventEmitter from 'events';
 
 /**
  * Stores the group summary for a room and provides an API to change it and
- * other useful group APIs may have an effect on the group summary.
+ * other useful group APIs that may have an effect on the group summary.
  */
 export default class GroupStore extends EventEmitter {
     constructor(matrixClient, groupId) {

From c1318e91024323fe466a3092f2d664dc7716b8f7 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Wed, 4 Oct 2017 17:51:38 +0100
Subject: [PATCH 069/123] Only maintain one GroupStore in the GroupStoreCache

So that the group store data is up-to-date and to prevent group stores hanging around in memory
---
 src/stores/GroupStore.js      | 16 ++++++++--------
 src/stores/GroupStoreCache.js | 12 +++++++-----
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/stores/GroupStore.js b/src/stores/GroupStore.js
index f15561bbb0..941f4c8ec2 100644
--- a/src/stores/GroupStore.js
+++ b/src/stores/GroupStore.js
@@ -23,14 +23,14 @@ import EventEmitter from 'events';
 export default class GroupStore extends EventEmitter {
     constructor(matrixClient, groupId) {
         super();
-        this._groupId = groupId;
+        this.groupId = groupId;
         this._matrixClient = matrixClient;
         this._summary = {};
         this._fetchSummary();
     }
 
     _fetchSummary() {
-        this._matrixClient.getGroupSummary(this._groupId).then((resp) => {
+        this._matrixClient.getGroupSummary(this.groupId).then((resp) => {
             this._summary = resp;
             this._notifyListeners();
         }).catch((err) => {
@@ -48,36 +48,36 @@ export default class GroupStore extends EventEmitter {
 
     addRoomToGroup(roomId) {
         return this._matrixClient
-            .addRoomToGroup(this._groupId, roomId);
+            .addRoomToGroup(this.groupId, roomId);
     }
 
     addRoomToGroupSummary(roomId, categoryId) {
         return this._matrixClient
-            .addRoomToGroupSummary(this._groupId, roomId, categoryId)
+            .addRoomToGroupSummary(this.groupId, roomId, categoryId)
             .then(this._fetchSummary.bind(this));
     }
 
     addUserToGroupSummary(userId, roleId) {
         return this._matrixClient
-            .addUserToGroupSummary(this._groupId, userId, roleId)
+            .addUserToGroupSummary(this.groupId, userId, roleId)
             .then(this._fetchSummary.bind(this));
     }
 
     removeRoomFromGroupSummary(roomId) {
         return this._matrixClient
-            .removeRoomFromGroupSummary(this._groupId, roomId)
+            .removeRoomFromGroupSummary(this.groupId, roomId)
             .then(this._fetchSummary.bind(this));
     }
 
     removeUserFromGroupSummary(userId) {
         return this._matrixClient
-            .removeUserFromGroupSummary(this._groupId, userId)
+            .removeUserFromGroupSummary(this.groupId, userId)
             .then(this._fetchSummary.bind(this));
     }
 
     setGroupPublicity(isPublished) {
         return this._matrixClient
-            .setGroupPublicity(this._groupId, isPublished)
+            .setGroupPublicity(this.groupId, isPublished)
             .then(this._fetchSummary.bind(this));
     }
 }
diff --git a/src/stores/GroupStoreCache.js b/src/stores/GroupStoreCache.js
index ade0445e97..fbe456f5dc 100644
--- a/src/stores/GroupStoreCache.js
+++ b/src/stores/GroupStoreCache.js
@@ -18,18 +18,20 @@ import GroupStore from './GroupStore';
 
 class GroupStoreCache {
     constructor() {
-        this.groupStores = {};
+        this.groupStore = null;
     }
 
     getGroupStore(matrixClient, groupId) {
-        if (!this.groupStores[groupId]) {
-            this.groupStores[groupId] = new GroupStore(matrixClient, groupId);
+        if (!this.groupStore || this.groupStore._groupId !== groupId) {
+            // This effectively throws away the reference to any previous GroupStore,
+            // allowing it to be GCd once the components referencing it have stopped
+            // referencing it.
+            this.groupStore = new GroupStore(matrixClient, groupId);
         }
-        return this.groupStores[groupId];
+        return this.groupStore;
     }
 }
 
-
 let singletonGroupStoreCache = null;
 if (!singletonGroupStoreCache) {
     singletonGroupStoreCache = new GroupStoreCache();

From cbb36b163b3d2dbd6f9a95bae1fab994287d0721 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Wed, 4 Oct 2017 18:05:40 +0100
Subject: [PATCH 070/123] Typo

---
 src/stores/GroupStoreCache.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/stores/GroupStoreCache.js b/src/stores/GroupStoreCache.js
index fbe456f5dc..bf340521b5 100644
--- a/src/stores/GroupStoreCache.js
+++ b/src/stores/GroupStoreCache.js
@@ -22,7 +22,7 @@ class GroupStoreCache {
     }
 
     getGroupStore(matrixClient, groupId) {
-        if (!this.groupStore || this.groupStore._groupId !== groupId) {
+        if (!this.groupStore || this.groupStore.groupId !== groupId) {
             // This effectively throws away the reference to any previous GroupStore,
             // allowing it to be GCd once the components referencing it have stopped
             // referencing it.

From 38de4ae1524bb34e3d54b0c12f802ac2f4c95097 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 5 Oct 2017 08:00:22 +0100
Subject: [PATCH 071/123] delint

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/dialogs/CreateRoomDialog.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/components/views/dialogs/CreateRoomDialog.js b/src/components/views/dialogs/CreateRoomDialog.js
index 20eeb5b591..d5a99dd4bf 100644
--- a/src/components/views/dialogs/CreateRoomDialog.js
+++ b/src/components/views/dialogs/CreateRoomDialog.js
@@ -48,21 +48,21 @@ export default React.createClass({
             >
                 <div className="mx_Dialog_content">
                     <div className="mx_CreateRoomDialog_label">
-                        <label htmlFor="textinput"> {_t('Room name (optional)')} </label>
+                        <label htmlFor="textinput"> { _t('Room name (optional)') } </label>
                     </div>
                     <div>
-                        <input id="textinput" ref="textinput" className="mx_CreateRoomDialog_input" autoFocus={true} size="64" onKeyDown={this.onKeyDown}/>
+                        <input id="textinput" ref="textinput" className="mx_CreateRoomDialog_input" autoFocus={true} size="64" onKeyDown={this.onKeyDown} />
                     </div>
-                    <br/>
+                    <br />
 
                     <details className="mx_CreateRoomDialog_details">
                         <summary className="mx_CreateRoomDialog_details_summary">{ _t('Advanced options') }</summary>
                         <div>
-                            <input type="checkbox" id="checkbox" ref="checkbox" defaultChecked={this.defaultNoFederate}/>
+                            <input type="checkbox" id="checkbox" ref="checkbox" defaultChecked={this.defaultNoFederate} />
                             <label htmlFor="checkbox">
-                                {_t('Block users on other matrix homeservers from joining this room')}
-                                <br/>
-                                ({_t('This setting cannot be changed later!')})
+                                { _t('Block users on other matrix homeservers from joining this room') }
+                                <br />
+                                ({ _t('This setting cannot be changed later!') })
                             </label>
                         </div>
                     </details>

From c115980f21c83c598786f4deed375a1b469b6b53 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 5 Oct 2017 08:08:39 +0100
Subject: [PATCH 072/123] remove redundant&stale onKeyDown

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/dialogs/CreateRoomDialog.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/dialogs/CreateRoomDialog.js b/src/components/views/dialogs/CreateRoomDialog.js
index d5a99dd4bf..f7be47b3eb 100644
--- a/src/components/views/dialogs/CreateRoomDialog.js
+++ b/src/components/views/dialogs/CreateRoomDialog.js
@@ -51,7 +51,7 @@ export default React.createClass({
                         <label htmlFor="textinput"> { _t('Room name (optional)') } </label>
                     </div>
                     <div>
-                        <input id="textinput" ref="textinput" className="mx_CreateRoomDialog_input" autoFocus={true} size="64" onKeyDown={this.onKeyDown} />
+                        <input id="textinput" ref="textinput" className="mx_CreateRoomDialog_input" autoFocus={true} size="64" />
                     </div>
                     <br />
 

From a8231f7bf9b8a0d3bdaf7fc1d6ce6ee1d61df4dc Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 5 Oct 2017 08:26:57 +0100
Subject: [PATCH 073/123] Remove redundant stale onKeyDown

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/dialogs/TextInputDialog.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/dialogs/TextInputDialog.js b/src/components/views/dialogs/TextInputDialog.js
index c924da7745..5ea4191e5e 100644
--- a/src/components/views/dialogs/TextInputDialog.js
+++ b/src/components/views/dialogs/TextInputDialog.js
@@ -68,7 +68,7 @@ export default React.createClass({
                         <label htmlFor="textinput"> { this.props.description } </label>
                     </div>
                     <div>
-                        <input id="textinput" ref="textinput" className="mx_TextInputDialog_input" defaultValue={this.props.value} autoFocus={this.props.focus} size="64" onKeyDown={this.onKeyDown} />
+                        <input id="textinput" ref="textinput" className="mx_TextInputDialog_input" defaultValue={this.props.value} autoFocus={this.props.focus} size="64" />
                     </div>
                 </div>
                 <div className="mx_Dialog_buttons">

From 917957c1dcb8911c2013fa8862a885a26227f3c1 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Thu, 5 Oct 2017 14:30:04 +0100
Subject: [PATCH 074/123] Modify the group store to include group rooms

and modify components to use this new part of the store such that feedback can be given
when adding or removing a room from the room list.
---
 .../views/dialogs/AddressPickerDialog.js      | 42 ++++++++-----------
 src/components/views/groups/GroupRoomList.js  | 39 +++++++++--------
 src/components/views/groups/GroupRoomTile.js  |  5 ++-
 src/stores/GroupStore.js                      | 26 +++++++++++-
 src/stores/GroupStoreCache.js                 |  1 +
 5 files changed, 68 insertions(+), 45 deletions(-)

diff --git a/src/components/views/dialogs/AddressPickerDialog.js b/src/components/views/dialogs/AddressPickerDialog.js
index 6a027ac034..2637f9d466 100644
--- a/src/components/views/dialogs/AddressPickerDialog.js
+++ b/src/components/views/dialogs/AddressPickerDialog.js
@@ -23,6 +23,7 @@ import MatrixClientPeg from '../../../MatrixClientPeg';
 import AccessibleButton from '../elements/AccessibleButton';
 import Promise from 'bluebird';
 import { addressTypes, getAddressType } from '../../../UserAddress.js';
+import GroupStoreCache from '../../../stores/GroupStoreCache';
 
 const TRUNCATE_QUERY_LIST = 40;
 const QUERY_USER_DIRECTORY_DEBOUNCE_MS = 200;
@@ -241,32 +242,25 @@ module.exports = React.createClass({
 
     _doNaiveGroupRoomSearch: function(query) {
         const lowerCaseQuery = query.toLowerCase();
-        MatrixClientPeg.get().getGroupRooms(this.props.groupId).then((resp) => {
-            const results = [];
-            resp.chunk.forEach((r) => {
-                const nameMatch = (r.name || '').toLowerCase().includes(lowerCaseQuery);
-                const topicMatch = (r.topic || '').toLowerCase().includes(lowerCaseQuery);
-                const aliasMatch = (r.canonical_alias || '').toLowerCase().includes(lowerCaseQuery);
-                if (!(nameMatch || topicMatch || aliasMatch)) {
-                    return;
-                }
-                results.push({
-                    room_id: r.room_id,
-                    avatar_url: r.avatar_url,
-                    name: r.name || r.canonical_alias,
-                });
-            });
-            this._processResults(results, query);
-        }).catch((err) => {
-            console.error('Error whilst searching group users: ', err);
-            this.setState({
-                searchError: err.errcode ? err.message : _t('Something went wrong!'),
-            });
-        }).done(() => {
-            this.setState({
-                busy: false,
+        const groupStore = GroupStoreCache.getGroupStore(MatrixClientPeg.get(), this.props.groupId);
+        const results = [];
+        groupStore.getGroupRooms().forEach((r) => {
+            const nameMatch = (r.name || '').toLowerCase().includes(lowerCaseQuery);
+            const topicMatch = (r.topic || '').toLowerCase().includes(lowerCaseQuery);
+            const aliasMatch = (r.canonical_alias || '').toLowerCase().includes(lowerCaseQuery);
+            if (!(nameMatch || topicMatch || aliasMatch)) {
+                return;
+            }
+            results.push({
+                room_id: r.room_id,
+                avatar_url: r.avatar_url,
+                name: r.name || r.canonical_alias,
             });
         });
+        this._processResults(results, query);
+        this.setState({
+            busy: false,
+        });
     },
 
     _doRoomSearch: function(query) {
diff --git a/src/components/views/groups/GroupRoomList.js b/src/components/views/groups/GroupRoomList.js
index 39ff3e4a07..4ff68a7f4d 100644
--- a/src/components/views/groups/GroupRoomList.js
+++ b/src/components/views/groups/GroupRoomList.js
@@ -17,6 +17,7 @@ import React from 'react';
 import { _t } from '../../../languageHandler';
 import sdk from '../../../index';
 import { groupRoomFromApiObject } from '../../../groups';
+import GroupStoreCache from '../../../stores/GroupStoreCache';
 import GeminiScrollbar from 'react-gemini-scrollbar';
 import PropTypes from 'prop-types';
 import {MatrixClient} from 'matrix-js-sdk';
@@ -34,7 +35,6 @@ export default React.createClass({
 
     getInitialState: function() {
         return {
-            fetching: false,
             rooms: null,
             truncateAt: INITIAL_LOAD_NUM_ROOMS,
             searchQuery: "",
@@ -43,21 +43,29 @@ export default React.createClass({
 
     componentWillMount: function() {
         this._unmounted = false;
+        this._initGroupStore(this.props.groupId);
+    },
+
+    _initGroupStore: function(groupId) {
+        this._groupStore = GroupStoreCache.getGroupStore(this.context.matrixClient, groupId);
+        this._groupStore.on('update', () => {
+            this._fetchRooms();
+        });
+        this._groupStore.on('error', (err) => {
+            console.error('Error in group store (listened to by GroupRoomList)', err);
+            this.setState({
+                rooms: null,
+            });
+        });
         this._fetchRooms();
     },
 
     _fetchRooms: function() {
-        this.setState({fetching: true});
-        this.context.matrixClient.getGroupRooms(this.props.groupId).then((result) => {
-            this.setState({
-                rooms: result.chunk.map((apiRoom) => {
-                    return groupRoomFromApiObject(apiRoom);
-                }),
-                fetching: false,
-            });
-        }).catch((e) => {
-            this.setState({fetching: false});
-            console.error("Failed to get group room list: ", e);
+        if (this._unmounted) return;
+        this.setState({
+            rooms: this._groupStore.getGroupRooms().map((apiRoom) => {
+                return groupRoomFromApiObject(apiRoom);
+            }),
         });
     },
 
@@ -110,12 +118,7 @@ export default React.createClass({
     },
 
     render: function() {
-        if (this.state.fetching) {
-            const Spinner = sdk.getComponent("elements.Spinner");
-            return (<div className="mx_GroupRoomList">
-                <Spinner />
-            </div>);
-        } else if (this.state.rooms === null) {
+        if (this.state.rooms === null) {
             return null;
         }
 
diff --git a/src/components/views/groups/GroupRoomTile.js b/src/components/views/groups/GroupRoomTile.js
index b6bdb9735b..bb0fdb03f4 100644
--- a/src/components/views/groups/GroupRoomTile.js
+++ b/src/components/views/groups/GroupRoomTile.js
@@ -21,6 +21,7 @@ import PropTypes from 'prop-types';
 import sdk from '../../../index';
 import dis from '../../../dispatcher';
 import { GroupRoomType } from '../../../groups';
+import GroupStoreCache from '../../../stores/GroupStoreCache';
 import Modal from '../../../Modal';
 
 const GroupRoomTile = React.createClass({
@@ -49,10 +50,10 @@ const GroupRoomTile = React.createClass({
 
     removeRoomFromGroup: function() {
         const groupId = this.props.groupId;
+        const groupStore = GroupStoreCache.getGroupStore(this.context.matrixClient, groupId);
         const roomName = this.state.name;
         const roomId = this.props.groupRoom.roomId;
-        this.context.matrixClient
-            .removeRoomFromGroup(groupId, roomId)
+        groupStore.removeRoomFromGroup(roomId)
             .catch((err) => {
                 console.error(`Error whilst removing ${roomId} from ${groupId}`, err);
                 const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
diff --git a/src/stores/GroupStore.js b/src/stores/GroupStore.js
index 941f4c8ec2..73118993f9 100644
--- a/src/stores/GroupStore.js
+++ b/src/stores/GroupStore.js
@@ -26,7 +26,9 @@ export default class GroupStore extends EventEmitter {
         this.groupId = groupId;
         this._matrixClient = matrixClient;
         this._summary = {};
+        this._rooms = [];
         this._fetchSummary();
+        this._fetchRooms();
     }
 
     _fetchSummary() {
@@ -38,6 +40,15 @@ export default class GroupStore extends EventEmitter {
         });
     }
 
+    _fetchRooms() {
+        this._matrixClient.getGroupRooms(this.groupId).then((resp) => {
+            this._rooms = resp.chunk;
+            this._notifyListeners();
+        }).catch((err) => {
+            this.emit('error', err);
+        });
+    }
+
     _notifyListeners() {
         this.emit('update');
     }
@@ -46,9 +57,22 @@ export default class GroupStore extends EventEmitter {
         return this._summary;
     }
 
+    getGroupRooms() {
+        return this._rooms;
+    }
+
     addRoomToGroup(roomId) {
         return this._matrixClient
-            .addRoomToGroup(this.groupId, roomId);
+            .addRoomToGroup(this.groupId, roomId)
+            .then(this._fetchRooms.bind(this));
+    }
+
+    removeRoomFromGroup(roomId) {
+        return this._matrixClient
+            .removeRoomFromGroup(this.groupId, roomId)
+            // Room might be in the summary, refresh just in case
+            .then(this._fetchSummary.bind(this))
+            .then(this._fetchRooms.bind(this));
     }
 
     addRoomToGroupSummary(roomId, categoryId) {
diff --git a/src/stores/GroupStoreCache.js b/src/stores/GroupStoreCache.js
index bf340521b5..551b155615 100644
--- a/src/stores/GroupStoreCache.js
+++ b/src/stores/GroupStoreCache.js
@@ -28,6 +28,7 @@ class GroupStoreCache {
             // referencing it.
             this.groupStore = new GroupStore(matrixClient, groupId);
         }
+        this.groupStore._fetchSummary();
         return this.groupStore;
     }
 }

From 6a4e3792d4aa563c521eadfd1bc858a343894742 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 6 Oct 2017 12:07:38 +0100
Subject: [PATCH 075/123] split handlers into state and non-states

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/TextForEvent.js | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index a21eb5c251..fa8efe028f 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -291,12 +291,15 @@ function textForWidgetEvent(event) {
 
 const handlers = {
     'm.room.message': textForMessageEvent,
-    'm.room.name': textForRoomNameEvent,
-    'm.room.topic': textForTopicEvent,
-    'm.room.member': textForMemberEvent,
     'm.call.invite': textForCallInviteEvent,
     'm.call.answer': textForCallAnswerEvent,
     'm.call.hangup': textForCallHangupEvent,
+};
+
+const stateHandlers = {
+    'm.room.name': textForRoomNameEvent,
+    'm.room.topic': textForTopicEvent,
+    'm.room.member': textForMemberEvent,
     'm.room.third_party_invite': textForThreePidInviteEvent,
     'm.room.history_visibility': textForHistoryVisibilityEvent,
     'm.room.encryption': textForEncryptionEvent,
@@ -307,8 +310,8 @@ const handlers = {
 
 module.exports = {
     textForEvent: function(ev) {
-        const hdlr = handlers[ev.getType()];
-        if (!hdlr) return '';
-        return hdlr(ev);
+        const handler = ev.isState() ? stateHandlers[ev.getType()] : handlers[ev.getType()];
+        if (handler) return handler(ev);
+        return '';
     },
 };

From 91ba939e23eef52634a5618041008cbe30c73e2b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 6 Oct 2017 12:10:07 +0100
Subject: [PATCH 076/123] tiny bit of de-lint for consistency

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/TextForEvent.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index fa8efe028f..ccb4c29a9c 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -243,7 +243,7 @@ function textForPowerEvent(event) {
         if (to !== from) {
             diff.push(
                 _t('%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s', {
-                    userId: userId,
+                    userId,
                     fromPowerLevel: Roles.textualPowerLevel(from, userDefault),
                     toPowerLevel: Roles.textualPowerLevel(to, userDefault),
                 }),
@@ -254,7 +254,7 @@ function textForPowerEvent(event) {
         return '';
     }
     return _t('%(senderName)s changed the power level of %(powerLevelDiffText)s.', {
-        senderName: senderName,
+        senderName,
         powerLevelDiffText: diff.join(", "),
     });
 }

From 152499a17d0683a565608a7f019ae99740a29b97 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 6 Oct 2017 12:16:54 +0100
Subject: [PATCH 077/123] DRY map lookup

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/TextForEvent.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index ccb4c29a9c..6345403f09 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -310,7 +310,7 @@ const stateHandlers = {
 
 module.exports = {
     textForEvent: function(ev) {
-        const handler = ev.isState() ? stateHandlers[ev.getType()] : handlers[ev.getType()];
+        const handler = (ev.isState() ? stateHandlers : handlers)[ev.getType()];
         if (handler) return handler(ev);
         return '';
     },

From 8855a5e30acb078bdd56721613b8b7b1f5da456a Mon Sep 17 00:00:00 2001
From: "Iru Cai (vimacs)" <mytbk920423@gmail.com>
Date: Sat, 7 Oct 2017 11:44:25 +0000
Subject: [PATCH 078/123] Translated using Weblate (Chinese (Simplified))

Currently translated at 89.7% (767 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
---
 src/i18n/strings/zh_Hans.json | 51 ++++++++++++++++++++++++++++++-----
 1 file changed, 45 insertions(+), 6 deletions(-)

diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index 1a19ecf2ed..5b1964f37a 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -32,7 +32,7 @@
     "Encrypted room": "加密聊天室",
     "%(senderName)s ended the call.": "%(senderName)s 结束了通话。.",
     "End-to-end encryption information": "端到端加密信息",
-    "End-to-end encryption is in beta and may not be reliable": "端到端加密现为测试版，不一定可靠",
+    "End-to-end encryption is in beta and may not be reliable": "端到端加密现为 beta 版，不一定可靠",
     "Enter Code": "输入代码",
     "Error": "错误",
     "Error decrypting attachment": "解密附件时出错",
@@ -87,7 +87,7 @@
     "Homeserver is": "主服务器是",
     "Identity Server is": "身份认证服务器是",
     "I have verified my email address": "我已经验证了我的邮箱地址",
-    "Import E2E room keys": "导入聊天室端对端加密密钥",
+    "Import E2E room keys": "导入聊天室端到端加密密钥",
     "Incorrect verification code": "验证码错误",
     "Interface Language": "界面语言",
     "Invalid alias format": "别名格式错误",
@@ -236,7 +236,7 @@
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s 把话题修改为 “%(topic)s”。",
     "Changes to who can read history will only apply to future messages in this room": "修改阅读历史的权限仅对此聊天室以后的消息有效",
     "Changes your display nickname": "修改昵称",
-    "Changing password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "目前，修改密码会导致所有设备上的端对端密钥被重置，使得加密的聊天记录不再可读。除非你事先导出聊天室密钥，修改密码后再导入。这个问题未来会改善。",
+    "Changing password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "目前，修改密码会导致所有设备上的端到端密钥被重置，使得加密的聊天记录不再可读。除非你事先导出聊天室密钥，修改密码后再导入。这个问题未来会改善。",
     "Clear Cache and Reload": "清除缓存并刷新",
     "Clear Cache": "清除缓存",
     "<a>Click here</a> to join the discussion!": "<a>点此</a> 加入讨论！",
@@ -292,7 +292,7 @@
     "Invites user with given id to current room": "邀请指定 ID 的用户加入当前聊天室",
     "'%(alias)s' is not a valid format for an address": "'%(alias)s' 不是一个合法的电子邮件地址格式",
     "'%(alias)s' is not a valid format for an alias": "'%(alias)s' 不是一个合法的昵称格式",
-    "%(displayName)s is typing": "%(displayName)s 正在输入",
+    "%(displayName)s is typing": "%(displayName)s 正在打字",
     "Sign in with": "第三方登录",
     "Message not sent due to unknown devices being present": "消息未发送，因为有未知的设备存在",
     "Missing room_id in request": "请求中没有 room_id",
@@ -562,7 +562,7 @@
     "%(senderName)s made future room history visible to": "%(senderName)s 设定历史浏览功能为",
     "AM": "上午",
     "PM": "下午",
-    "NOTE: Apps are not end-to-end encrypted": "提示：APP不支持端对端加密",
+    "NOTE: Apps are not end-to-end encrypted": "提示：APP不支持端到端加密",
     "People": "联系人",
     "Press": "点击",
     "Profile": "个人配置",
@@ -730,5 +730,44 @@
     "Verifies a user, device, and pubkey tuple": "验证一个用户、设备和密钥元组",
     "We encountered an error trying to restore your previous session. If you continue, you will need to log in again, and encrypted chat history will be unreadable.": "我们在尝试恢复你之前的会话时遇到了一个错误。如果你继续，你将需要重新登录，加密的聊天历史将会不可读。",
     "Unknown devices": "未知设备",
-    "Unknown Address": "未知地址"
+    "Unknown Address": "未知地址",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s 删除了他们的昵称 (%(oldDisplayName)s).",
+    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "你提供的签名密钥和你从 %(userId)s 的设备 (deviceId)s 收到的签名密钥匹配。设备被标记为已验证。",
+    "These are experimental features that may break in unexpected ways": "这些是可能以意外的方式坏掉的实验性的特性",
+    "The visibility of existing history will be unchanged": "现有历史记录的可见性不会被改变",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s 打开了端到端加密 (算法 %(algorithm)s).",
+    "Unable to remove contact information": "无法移除联系人信息",
+    "<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.": "现在 <a>重发全部</a> 或者 <a>取消全部</a>。你也可以选择重发或取消单独的消息。",
+    "were invited %(repeats)s times": "被邀请 %(repeats)s 次",
+    "was invited %(repeats)s times": "被邀请 %(repeats)s 次",
+    "Riot collects anonymous analytics to allow us to improve the application.": "Riot 收集匿名的分析数据来允许我们改善这个应用。",
+    "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" 包含你以前没见过的设备。",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "你可以使用自定义的服务器选项来通过指定一个不同的主服务器 URL 来登录其他 Matrix 服务器。",
+    "This allows you to use this app with an existing Matrix account on a different home server.": "这允许你用一个已有在不同主服务器的 Matrix 账户使用这个应用。",
+    "Please check your email to continue registration.": "请查看你的电子邮件以继续注册。",
+    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "如果你不指定一个电子邮箱地址，你将不能重置你的密码。你确定吗？",
+    "Home server URL": "主服务器 URL",
+    "Identity server URL": "身份服务器 URL",
+    "What does this mean?": "这是什么意思？",
+    "Image '%(Body)s' cannot be displayed.": "图像 '%(Body)s' 无法显示。",
+    "This image cannot be displayed.": "图像无法显示。",
+    "Add an Integration": "添加一个集成",
+    "Removed or unknown message type": "被移除或未知的消息类型",
+    "Disable URL previews by default for participants in this room": "对这个聊天室的参与者默认禁用 URL 预览",
+    "Enable URL previews for this room (affects only you)": "在这个聊天室启用 URL 预览（只影响你）",
+    "Ongoing conference call%(supportedText)s.": "正在进行的会议通话 %(supportedText)s.",
+    "$senderDisplayName changed the room avatar to <img/>": "$senderDisplayName 把聊天室的头像改为了 <img/>",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s 修改了 %(roomName)s 的头像",
+    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "这将会成为你在 <span></span> 主服务器上的账户名，或者你可以选择一个 <a>不同的服务器</a>。",
+    "Your browser does not support the required cryptography extensions": "你的浏览器不支持所需的密码学扩展",
+    "Authentication check failed: incorrect password?": "身份验证失败：密码错误？",
+    "This will allow you to reset your password and receive notifications.": "这将允许你重置你的密码和接收通知。",
+    "Share without verifying": "不验证就分享",
+    "You added a new device '%(displayName)s', which is requesting encryption keys.": "你添加了一个新的设备 '%(displayName)s'，它正在请求加密密钥。",
+    "Your unverified device '%(displayName)s' is requesting encryption keys.": "你的未验证的设备 '%(displayName)s' 正在请求加密密钥。",
+    "Encryption key request": "加密密钥请求",
+    "Autocomplete Delay (ms):": "自动完成延迟（毫秒）：",
+    "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s 小组建被 %(senderName)s 添加",
+    "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s 小组建被 %(senderName)s 移除",
+    "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s 小组建被 %(senderName)s 修改"
 }

From 92be3af990ecd96cfa1bbef3bc2cdab3554b819b Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 10 Oct 2017 19:16:42 +0100
Subject: [PATCH 079/123] Make it clearer which HS you're logging into

Otherwise there's no indication without clicking 'custom server'
---
 src/components/structures/login/Login.js    |  1 +
 src/components/views/elements/Dropdown.js   | 10 ++++++++++
 src/components/views/login/PasswordLogin.js | 14 +++++++++++++-
 src/i18n/strings/en_EN.json                 |  3 ++-
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/login/Login.js b/src/components/structures/login/Login.js
index a6c0a70c66..b88aa094dc 100644
--- a/src/components/structures/login/Login.js
+++ b/src/components/structures/login/Login.js
@@ -290,6 +290,7 @@ module.exports = React.createClass({
                         onPhoneNumberChanged={this.onPhoneNumberChanged}
                         onForgotPasswordClick={this.props.onForgotPasswordClick}
                         loginIncorrect={this.state.loginIncorrect}
+                        hsUrl={this.state.enteredHomeserverUrl}
                     />
                 );
             case 'm.login.cas':
diff --git a/src/components/views/elements/Dropdown.js b/src/components/views/elements/Dropdown.js
index c049c38a68..1b2117bb6a 100644
--- a/src/components/views/elements/Dropdown.js
+++ b/src/components/views/elements/Dropdown.js
@@ -26,6 +26,12 @@ class MenuOption extends React.Component {
         this._onClick = this._onClick.bind(this);
     }
 
+    getDefaultProps() {
+        return {
+            disabled: false,
+        }
+    }
+
     _onMouseEnter() {
         this.props.onMouseEnter(this.props.dropdownKey);
     }
@@ -153,6 +159,8 @@ export default class Dropdown extends React.Component {
     }
 
     _onInputClick(ev) {
+        if (this.props.disabled) return;
+
         if (!this.state.expanded) {
             this.setState({
                 expanded: true,
@@ -329,4 +337,6 @@ Dropdown.propTypes = {
     // in the dropped-down menu.
     getShortOption: React.PropTypes.func,
     value: React.PropTypes.string,
+    // negative for consistency with HTML
+    disabled: React.PropTypes.bool,
 }
diff --git a/src/components/views/login/PasswordLogin.js b/src/components/views/login/PasswordLogin.js
index 9f855616fc..4e37e30f65 100644
--- a/src/components/views/login/PasswordLogin.js
+++ b/src/components/views/login/PasswordLogin.js
@@ -186,6 +186,17 @@ class PasswordLogin extends React.Component {
 
         const loginField = this.renderLoginField(this.state.loginType);
 
+        let matrixIdText = '';
+        if (this.props.hsUrl) {
+            try {
+                const parsedHsUrl = new URL(this.props.hsUrl);
+                matrixIdText = _t('%(serverName)s Matrix ID', {serverName: parsedHsUrl.hostname});
+            } catch (e) {
+                console.log(e);
+                // pass
+            }
+        }
+
         return (
             <div>
                 <form onSubmit={this.onSubmitForm}>
@@ -194,8 +205,9 @@ class PasswordLogin extends React.Component {
                     <Dropdown
                         className="mx_Login_type_dropdown"
                         value={this.state.loginType}
+                        disabled={matrixIdText === ''}
                         onOptionChange={this.onLoginTypeChange}>
-                            <span key={PasswordLogin.LOGIN_FIELD_MXID}>{ _t('my Matrix ID') }</span>
+                            <span key={PasswordLogin.LOGIN_FIELD_MXID}>{matrixIdText}</span>
                             <span key={PasswordLogin.LOGIN_FIELD_EMAIL}>{ _t('Email address') }</span>
                             <span key={PasswordLogin.LOGIN_FIELD_PHONE}>{ _t('Phone') }</span>
                     </Dropdown>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 6acaba9fae..8ec975987c 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -906,5 +906,6 @@
     "Related Groups": "Related Groups",
     "Related groups for this room:": "Related groups for this room:",
     "This room has no related groups": "This room has no related groups",
-    "New group ID (e.g. +foo:%(localDomain)s)": "New group ID (e.g. +foo:%(localDomain)s)"
+    "New group ID (e.g. +foo:%(localDomain)s)": "New group ID (e.g. +foo:%(localDomain)s)",
+    "%(serverName)s Matrix ID": "%(serverName)s Matrix ID"
 }

From 80ad7d4ad670f23e8c7ae3e6d8146df5f50541f9 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 10 Oct 2017 19:27:51 +0100
Subject: [PATCH 080/123] Update translations

---
 src/i18n/strings/de_DE.json   | 2 +-
 src/i18n/strings/el.json      | 1 -
 src/i18n/strings/en_EN.json   | 1 -
 src/i18n/strings/en_US.json   | 1 -
 src/i18n/strings/es.json      | 2 +-
 src/i18n/strings/eu.json      | 1 -
 src/i18n/strings/fi.json      | 2 +-
 src/i18n/strings/fr.json      | 2 +-
 src/i18n/strings/hu.json      | 2 +-
 src/i18n/strings/id.json      | 1 -
 src/i18n/strings/ko.json      | 1 -
 src/i18n/strings/lv.json      | 2 +-
 src/i18n/strings/nl.json      | 2 +-
 src/i18n/strings/pl.json      | 2 +-
 src/i18n/strings/pt.json      | 1 -
 src/i18n/strings/pt_BR.json   | 1 -
 src/i18n/strings/ru.json      | 2 +-
 src/i18n/strings/sv.json      | 2 +-
 src/i18n/strings/th.json      | 1 -
 src/i18n/strings/tr.json      | 1 -
 src/i18n/strings/zh_Hans.json | 1 -
 src/i18n/strings/zh_Hant.json | 1 -
 22 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index aa114e241d..71adaba704 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -146,7 +146,7 @@
     "Members only": "Nur Mitglieder",
     "Mobile phone number": "Mobiltelefonnummer",
     "Moderator": "Moderator",
-    "my Matrix ID": "meiner Matrix-ID",
+    "%(serverName)s Matrix ID": "%(serverName)s Matrix-ID",
     "Never send encrypted messages to unverified devices from this device": "Niemals verschlüsselte Nachrichten an unverifizierte Geräte von diesem Gerät aus versenden",
     "Never send encrypted messages to unverified devices in this room from this device": "Niemals verschlüsselte Nachrichten an unverifizierte Geräte in diesem Raum von diesem Gerät aus senden",
     "New password": "Neues Passwort",
diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json
index bc45e6da9e..2a51f6cae5 100644
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -188,7 +188,6 @@
     "Failure to create room": "Δεν ήταν δυνατή η δημιουργία δωματίου",
     "Join Room": "Είσοδος σε δωμάτιο",
     "Moderator": "Συντονιστής",
-    "my Matrix ID": "το Matrix ID μου",
     "Name": "Όνομα",
     "New address (e.g. #foo:%(localDomain)s)": "Νέα διεύθυνση (e.g. #όνομα:%(localDomain)s)",
     "New password": "Νέος κωδικός πρόσβασης",
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 8ec975987c..37c7655ed6 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -295,7 +295,6 @@
     "Moderator": "Moderator",
     "Must be viewing a room": "Must be viewing a room",
     "Mute": "Mute",
-    "my Matrix ID": "my Matrix ID",
     "Name": "Name",
     "Never send encrypted messages to unverified devices from this device": "Never send encrypted messages to unverified devices from this device",
     "Never send encrypted messages to unverified devices in this room": "Never send encrypted messages to unverified devices in this room",
diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index 928f1a9d0f..3954b2b6fa 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -262,7 +262,6 @@
     "Moderator": "Moderator",
     "Must be viewing a room": "Must be viewing a room",
     "Mute": "Mute",
-    "my Matrix ID": "my Matrix ID",
     "Name": "Name",
     "Never send encrypted messages to unverified devices from this device": "Never send encrypted messages to unverified devices from this device",
     "Never send encrypted messages to unverified devices in this room": "Never send encrypted messages to unverified devices in this room",
diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index bc2391a5c7..68f27c23e9 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -379,7 +379,7 @@
     "Moderator": "Moderador",
     "Must be viewing a room": "Debe estar viendo una sala",
     "Mute": "Silenciar",
-    "my Matrix ID": "Mi ID de Matrix",
+    "%(serverName)s Matrix ID": "%(serverName)s ID de Matrix",
     "Name": "Nombre",
     "Never send encrypted messages to unverified devices from this device": "No enviar nunca mensajes cifrados, desde este dispositivo, a dispositivos sin verificar",
     "Never send encrypted messages to unverified devices in this room": "No enviar nunca mensajes cifrados a dispositivos no verificados, en esta sala",
diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 9f3d06ec52..9ef02d7b9b 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -346,7 +346,6 @@
     "Missing room_id in request": "Gelaren ID-a falta da eskaeran",
     "Missing user_id in request": "Erabiltzailearen ID-a falta da eskaeran",
     "Mobile phone number": "Mugikorraren telefono zenbakia",
-    "my Matrix ID": "Nire Matrix ID-a",
     "Never send encrypted messages to unverified devices in this room": "Ez bidali inoiz zifratutako mezuak egiaztatu gabeko gailuetara gela honetan",
     "Never send encrypted messages to unverified devices in this room from this device": "Ez bidali inoiz zifratutako mezuak egiaztatu gabeko gailuetara gela honetan gailu honetatik",
     "New address (e.g. #foo:%(localDomain)s)": "Helbide berria (adib. #foo:%(localDomain)s)",
diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index a59e5b1edd..7ffbf39e8e 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -245,7 +245,7 @@
     "Mobile phone number": "Matkapuhelinnumero",
     "Mobile phone number (optional)": "Matkapuhelinnumero (valinnainen)",
     "Moderator": "Moderaattori",
-    "my Matrix ID": "minun Matrix tunniste",
+    "%(serverName)s Matrix ID": "%(serverName)s Matrix tunniste",
     "Name": "Nimi",
     "New password": "Uusi salasana",
     "New passwords don't match": "Uudet salasanat eivät täsmää",
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 585e47f5a3..51c496ab96 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -224,7 +224,7 @@
     "Mobile phone number": "Numéro de téléphone mobile",
     "Moderator": "Modérateur",
     "Must be viewing a room": "Doit être en train de visualiser un salon",
-    "my Matrix ID": "mon identifiant Matrix",
+    "%(serverName)s Matrix ID": "%(serverName)s identifiant Matrix",
     "Name": "Nom",
     "Never send encrypted messages to unverified devices from this device": "Ne jamais envoyer de message chiffré aux appareils non-vérifiés depuis cet appareil",
     "Never send encrypted messages to unverified devices in this room": "Ne jamais envoyer de message chiffré aux appareils non-vérifiés dans ce salon",
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 2c34e05b1a..edf0a83ac6 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -293,7 +293,7 @@
     "Mobile phone number (optional)": "Mobill telefonszám (opcionális)",
     "Moderator": "Moderátor",
     "Must be viewing a room": "Meg kell nézni a szobát",
-    "my Matrix ID": "Matrix azonosítóm",
+    "%(serverName)s Matrix ID": "%(serverName)s Matrix azonosítóm",
     "Name": "Név",
     "Never send encrypted messages to unverified devices from this device": "Soha ne küldj titkosított üzenetet ellenőrizetlen eszközre erről az eszközről",
     "Never send encrypted messages to unverified devices in this room": "Soha ne küldj titkosított üzenetet ebből a szobából ellenőrizetlen eszközre",
diff --git a/src/i18n/strings/id.json b/src/i18n/strings/id.json
index dc057c2a95..27bcc41dc8 100644
--- a/src/i18n/strings/id.json
+++ b/src/i18n/strings/id.json
@@ -78,7 +78,6 @@
     "Members only": "Hanya anggota",
     "Mobile phone number": "Nomor telpon seluler",
     "Mute": "Bisu",
-    "my Matrix ID": "ID Matrix saya",
     "Name": "Nama",
     "New password": "Password Baru",
     "New passwords don't match": "Password baru tidak cocok",
diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json
index 8b6e233437..5933b6abc2 100644
--- a/src/i18n/strings/ko.json
+++ b/src/i18n/strings/ko.json
@@ -293,7 +293,6 @@
     "Mobile phone number (optional)": "휴대 전화번호 (선택)",
     "Moderator": "조정자",
     "Must be viewing a room": "방을 둘러봐야만 해요",
-    "my Matrix ID": "내 매트릭스 ID",
     "Name": "이름",
     "Never send encrypted messages to unverified devices from this device": "이 장치에서 인증받지 않은 장치로 암호화한 메시지를 보내지 마세요",
     "Never send encrypted messages to unverified devices in this room": "이 방에서 인증받지 않은 장치로 암호화한 메시지를 보내지 마세요",
diff --git a/src/i18n/strings/lv.json b/src/i18n/strings/lv.json
index 5f58fd9515..424a831ac5 100644
--- a/src/i18n/strings/lv.json
+++ b/src/i18n/strings/lv.json
@@ -274,7 +274,7 @@
     "Moderator": "Moderators",
     "Must be viewing a room": "Jāapskata istaba",
     "Mute": "Apklusināt",
-    "my Matrix ID": "mans Matrix ID",
+    "%(serverName)s Matrix ID": "%(serverName)s Matrix ID",
     "Name": "Vārds",
     "Never send encrypted messages to unverified devices from this device": "Nekad nesūti no šīs ierīces šifrētas ziņas uz neverificētām ierīcēm",
     "Never send encrypted messages to unverified devices in this room": "Nekad nesūti šifrētas ziņas uz neverificētām ierīcēm šajā istabā",
diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index f770e335cf..67fa97a5d7 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -126,7 +126,7 @@
     "disabled": "uitgeschakeld",
     "Moderator": "Moderator",
     "Must be viewing a room": "Moet een ruimte weergeven",
-    "my Matrix ID": "mijn Matrix-ID",
+    "%(serverName)s Matrix ID": "%(serverName)s Matrix-ID",
     "Name": "Naam",
     "New password": "Nieuw wachtwoord",
     "none": "geen",
diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index bd1e4c5c24..a3e2af956f 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -363,7 +363,7 @@
     "Mobile phone number": "Numer telefonu komórkowego",
     "Mobile phone number (optional)": "Numer telefonu komórkowego (opcjonalne)",
     "Moderator": "Moderator",
-    "my Matrix ID": "mój Matrix ID",
+    "%(serverName)s Matrix ID": "%(serverName)s Matrix ID",
     "Name": "Imię",
     "Never send encrypted messages to unverified devices from this device": "Nigdy nie wysyłaj zaszyfrowanych wiadomości do niezweryfikowanych urządzeń z tego urządzenia",
     "Never send encrypted messages to unverified devices in this room": "Nigdy nie wysyłaj zaszyfrowanych wiadomości do niezweryfikowanych urządzeń w tym pokoju",
diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index ba4968b7ad..1bf7fd00b1 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -127,7 +127,6 @@
     "Members only": "Apenas integrantes da sala",
     "Mobile phone number": "Telefone celular",
     "Moderator": "Moderador/a",
-    "my Matrix ID": "com meu ID do Matrix",
     "Name": "Nome",
     "Never send encrypted messages to unverified devices from this device": "Nunca envie mensagens criptografada para um dispositivo não verificado a partir deste dispositivo",
     "Never send encrypted messages to unverified devices in this room from this device": "Nunca envie mensagens criptografadas para dispositivos não verificados nesta sala a partir deste dispositivo",
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index af4804bd85..116142c29c 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -127,7 +127,6 @@
     "Members only": "Apenas integrantes da sala",
     "Mobile phone number": "Telefone celular",
     "Moderator": "Moderador/a",
-    "my Matrix ID": "com meu ID do Matrix",
     "Name": "Nome",
     "Never send encrypted messages to unverified devices from this device": "Nunca envie mensagens criptografada para um dispositivo não verificado a partir deste dispositivo",
     "Never send encrypted messages to unverified devices in this room from this device": "Nunca envie mensagens criptografadas para dispositivos não verificados nesta sala a partir deste dispositivo",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index cfab960e32..8dc2d80001 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -117,7 +117,7 @@
     "Members only": "Только участники",
     "Mobile phone number": "Номер мобильного телефона",
     "Moderator": "Модератор",
-    "my Matrix ID": "мой Matrix ID",
+    "%(serverName)s Matrix ID": "%(serverName)s Matrix ID",
     "Name": "Имя",
     "Never send encrypted messages to unverified devices from this device": "Никогда не отправлять зашифрованные сообщения на непроверенные устройства с этого устройства",
     "Never send encrypted messages to unverified devices in this room from this device": "Никогда не отправлять зашифрованные сообщения на непроверенные устройства в этой комнате с этого устройства",
diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index fb7257ecf9..fd15771cec 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -273,7 +273,7 @@
     "Moderator": "Moderator",
     "Must be viewing a room": "Du måste ha ett öppet rum",
     "Mute": "Dämpa",
-    "my Matrix ID": "mitt Matrix-ID",
+    "%(serverName)s Matrix ID": "%(serverName)s Matrix-ID",
     "Name": "Namn",
     "Never send encrypted messages to unverified devices from this device": "Skicka aldrig krypterade meddelanden till overifierade enheter från den här enheten",
     "Never send encrypted messages to unverified devices in this room": "Skicka aldrig krypterade meddelanden till overifierade enheter i det här rummet",
diff --git a/src/i18n/strings/th.json b/src/i18n/strings/th.json
index d45cb86986..47a5fd3049 100644
--- a/src/i18n/strings/th.json
+++ b/src/i18n/strings/th.json
@@ -219,7 +219,6 @@
     "Markdown is enabled": "เปิดใช้งาน Markdown แล้ว",
     "Missing user_id in request": "ไม่พบ user_id ในคำขอ",
     "Moderator": "ผู้ช่วยดูแล",
-    "my Matrix ID": "Matrix ID ของฉัน",
     "New address (e.g. #foo:%(localDomain)s)": "ที่อยู่ใหม่ (เช่น #foo:%(localDomain)s)",
     "New password": "รหัสผ่านใหม่",
     "New passwords don't match": "รหัสผ่านใหม่ไม่ตรงกัน",
diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 23d4e284bc..6e8e4f25f8 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -269,7 +269,6 @@
     "Moderator": "Moderatör",
     "Must be viewing a room": "Bir oda görüntülemeli olmalı",
     "Mute": "Sessiz",
-    "my Matrix ID": "Benim Matrix ID'm",
     "Name": "İsim",
     "Never send encrypted messages to unverified devices from this device": "Bu cihazdan doğrulanmamış cihazlara asla şifrelenmiş mesajlar göndermeyin",
     "Never send encrypted messages to unverified devices in this room": "Bu odada doğrulanmamış cihazlara asla şifreli mesajlar göndermeyin",
diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index 69ba19ca27..f185640572 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -289,7 +289,6 @@
     "Mobile phone number (optional)": "手机号码 (可选)",
     "Moderator": "管理员",
     "Mute": "静音",
-    "my Matrix ID": "我的 Matrix ID",
     "Name": "姓名",
     "Never send encrypted messages to unverified devices from this device": "不要从此设备向未验证的设备发送消息",
     "Never send encrypted messages to unverified devices in this room": "不要在此聊天室里向未验证的设备发送消息",
diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 596bc55a01..49890005a1 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -403,7 +403,6 @@
     "Mobile phone number (optional)": "行動電話號碼（選擇性）",
     "Moderator": "仲裁者",
     "Must be viewing a room": "必須檢視房間",
-    "my Matrix ID": "我的 Matrix ID",
     "Name": "名稱",
     "Never send encrypted messages to unverified devices from this device": "從不自此裝置傳送加密的訊息到未驗證的裝置",
     "Never send encrypted messages to unverified devices in this room": "從不在此房間傳送加密的訊息到未驗證的裝置",

From 8266286e99240058df7d2c5d727c362e990c4164 Mon Sep 17 00:00:00 2001
From: Stefan Parviainen <pafcu@iki.fi>
Date: Wed, 11 Oct 2017 08:39:46 +0200
Subject: [PATCH 081/123] Ignore VS16 char in RTE

Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
---
 src/RichText.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/RichText.js b/src/RichText.js
index cbd3b9ae18..dca14813f2 100644
--- a/src/RichText.js
+++ b/src/RichText.js
@@ -67,8 +67,14 @@ function unicodeToEmojiUri(str) {
             // if the unicodeChar doesnt exist just return the entire match
             return unicodeChar;
         } else {
+            // Remove variant selector VS16 (explicitly emoji) as it is unnecessary and leads to an incorrect URL below
+            if(unicodeChar.length == 2 && unicodeChar[1] == '\ufe0f') {
+                unicodeChar = unicodeChar[0];
+            }
+
             // get the unicode codepoint from the actual char
             unicode = emojione.jsEscapeMap[unicodeChar];
+
             return emojione.imagePathSVG+unicode+'.svg'+emojione.cacheBustParam;
         }
     });

From ce607d18b924d25d90bb4d63e42c856fef35c815 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miloslav=20Nenad=C3=A1l?= <nenadalm@gmail.com>
Date: Sun, 8 Oct 2017 20:57:44 +0000
Subject: [PATCH 082/123] Translated using Weblate (Czech)

Currently translated at 59.0% (505 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
---
 src/i18n/strings/cs.json | 100 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 99 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index 31a52593b0..0100711b2e 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -405,5 +405,103 @@
     "Updates": "Aktualizace",
     "Check for update": "Zkontrolovat aktualizace",
     "Start chatting": "Začít chatovat",
-    "Start Chatting": "Začít chatovat"
+    "Start Chatting": "Začít chatovat",
+    "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Textová zpráva byla odeslána na +%(msisdn)s. Prosím vložte ověřovací kód z dané zprávy",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s přijmul/a pozvánku pro %(displayName)s.",
+    "Active call (%(roomName)s)": "Probíhající hovor (%(roomName)s)",
+    "An email has been sent to": "Email byl odeslán odeslán na",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s zablokoval/a %(targetName)s.",
+    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Nelze se připojit k homeserveru přes HTTP pokud je v adresním řádku HTTPS. Buď použijte HTTPS nebo <a>povolte nebezpečné scripty</a>.",
+    "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s změnil/a zobrazované jméno z %(oldDisplayName)s na %(displayName)s.",
+    "Click here to fix": "Klikněte zde pro opravu",
+    "Click to mute video": "Klikněte pro zakázání videa",
+    "click to reveal": "klikněte pro odhalení",
+    "Click to unmute video": "Klikněte pro povolení videa",
+    "Click to unmute audio": "Klikněte pro povolení zvuku",
+    "demote": "degradovat",
+    "Devices will not yet be able to decrypt history from before they joined the room": "Zařízení nebudou schopna dešifrovat historii před tím než se připojila k místnosti",
+    "Disable markdown formatting": "Zakázat formátování v markdownu",
+    "Displays action": "Zobrazí akci",
+    "Do you want to load widget from URL:": "Chcete načíst widget z URL:",
+    "Ed25519 fingerprint": "Ed25519 otisk",
+    "favourite": "oblíbené",
+    "Fill screen": "Vyplnit obrazovku",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s z %(fromPowerLevel)s na %(toPowerLevel)s",
+    "This doesn't appear to be a valid email address": "Emailová adresa se zdá být nevalidní",
+    "This is a preview of this room. Room interactions have been disabled": "Toto je náhled místnosti. Interakce byly zakázány",
+    "This phone number is already in use": "Tohle číslo už se používá",
+    "This room is not accessible by remote Matrix servers": "Tahle místnost není přístupná vzdálenými Matrix servery",
+    "This room's internal ID is": "Vnitřní ID místnosti je",
+    "times": "krát",
+    "To ban users": "Zablokovat uživatele",
+    "to browse the directory": "prohlížet adresář",
+    "To configure the room": "Nastavit místnost",
+    "To invite users into the room": "Pozvat uživatele do místnosti",
+    "To kick users": "Vyhodit uživatele",
+    "to make a room or": "vytvořit místnost nebo",
+    "To remove other users' messages": "Smazat zprávy ostatních uživatelů",
+    "To reset your password, enter the email address linked to your account": "K resetování hesla, vložte emailovou adresu spojenou s vaším účtem",
+    "to restore": "obnovit",
+    "To send events of type": "Odeslat události typu",
+    "To send messages": "Odeslat zprávy",
+    "to start a chat with someone": "začít chat s někým",
+    "to tag as %(tagName)s": "oštítkovat jako %(tagName)s",
+    "to tag direct chat": "oštítkovat přímý chat",
+    "To use it, just wait for autocomplete results to load and tab through them.": "Pro použití vyčkejte k načtení automatického doplňování a tabem přeskakujte mezi výsledky.",
+    "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Nemáte práva k zobrazení zprávy v daném časovém úseku.",
+    "Tried to load a specific point in this room's timeline, but was unable to find it.": "Zpráva v daném časovém úsaku nenalezena.",
+    "Turn Markdown off": "Vypnout Markdown",
+    "Turn Markdown on": "Zapnout Markdown",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s zapnul end-to-end šifrování (algoritmus %(algorithm)s).",
+    "Unable to add email address": "Nepodařilo se přidat emailovou adresu",
+    "Unable to create widget.": "Nepodařilo se vytvořit widget.",
+    "Unable to remove contact information": "Nepodařilo se smazat kontaktní údaje",
+    "Unable to restore previous session": "Nepodařilo se obnovit předchozí sezení",
+    "Unable to verify email address.": "Nepodařilo se ověřit emailovou adresu.",
+    "Unban": "Odblokovat",
+    "Unbans user with given id": "Odblokuje uživatele s daným id",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s odblokoval/a %(targetName)s.",
+    "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "Nepodařilo se prokázat že adresa na kterou byla tato pozvánka odeslána se shoduje s adresou přiřazenou Vašemu účtu.",
+    "Unable to capture screen": "Nepodařilo se zachytit obrazovku",
+    "Unable to enable Notifications": "Nepodařilo se povolit Notifikace",
+    "Unable to load device list": "Nepodařilo se načíst list zařízení",
+    "Undecryptable": "Nerozšifrovatelné",
+    "unencrypted": "nešifrované",
+    "Unencrypted message": "Nešifrovaná zpráva",
+    "unknown caller": "neznámý volající",
+    "unknown device": "neznámé zařízení",
+    "Unknown room %(roomId)s": "Neznámá místnost %(roomId)s",
+    "Unknown (user, device) pair:": "Neznámý pár (uživatel, zařízení):",
+    "unknown": "neznámý",
+    "Unmute": "Povolit",
+    "Unnamed Room": "Nepojmenovaná Místnost",
+    "Unrecognised command:": "Nerozpoznaný příkaz:",
+    "Unrecognised room alias:": "Nerozpoznaný alias místnosti:",
+    "Unverified": "Neověřený",
+    "Uploading %(filename)s and %(count)s others|zero": "Nahrávám %(filename)s",
+    "Uploading %(filename)s and %(count)s others|one": "Nahrávám %(filename)s a %(count)s další",
+    "Uploading %(filename)s and %(count)s others|other": "Nahrávám %(filename)s a %(count)s další",
+    "Upload Failed": "Nahrávání Selhalo",
+    "Upload Files": "Nahrát Soubory",
+    "Upload file": "Nahrát soubor",
+    "Upload new:": "Nahrát nový:",
+    "Usage": "Použití",
+    "Use compact timeline layout": "Použít kompaktní rozvržení timeline",
+    "Use with caution": "Používejte s opatrností",
+    "User ID": "Uživatelské ID",
+    "User Interface": "Uživatelské rozhraní",
+    "%(user)s is a": "%(user)s je",
+    "User name": "Uživatelské jméno",
+    "Username invalid: %(errMessage)s": "Nevalidní uživatelské jméno: %(errMessage)s",
+    "Users": "Uživatelé",
+    "User": "Uživatel",
+    "Verification Pending": "Čeká na ověření",
+    "Verification": "Ověření",
+    "verified": "ověreno",
+    "Verified": "Ověřeno",
+    "Verified key": "Ověřen klíč",
+    "(no answer)": "(žádná odpověď)",
+    "(unknown failure: %(reason)s)": "(neznámá chyba: %(reason)s)",
+    "(warning: cannot be disabled again!)": "(varování: nemůže být opět zakázáno!)",
+    "WARNING: Device already verified, but keys do NOT MATCH!": "VAROVÁNÍ: Zařízení ověřeno, ale klíče se NESHODUJÍ!"
 }

From 9cee2b3662adbded6cdc62a996d3b6dec112d450 Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Mon, 9 Oct 2017 19:13:50 +0000
Subject: [PATCH 083/123] Translated using Weblate (Russian)

Currently translated at 100.0% (855 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
---
 src/i18n/strings/ru.json | 48 ++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 8f317031be..2bbf72f87c 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -3,7 +3,7 @@
     "accepted an invitation": "принял приглашение",
     "accepted the invitation for": "принял приглашение на",
     "Account": "Аккаунт",
-    "Add email address": "Добавить адрес эл. почты",
+    "Add email address": "Добавить адрес email",
     "Add phone number": "Добавить номер телефона",
     "Admin": "Администратор",
     "Advanced": "Дополнительно",
@@ -79,7 +79,7 @@
     "Failed to forget room": "Не удалось забыть комнату",
     "Failed to leave room": "Не удалось выйти из комнаты",
     "Failed to reject invitation": "Не удалось отклонить приглашение",
-    "Failed to send email": "Ошибка отправки эл. почты",
+    "Failed to send email": "Ошибка отправки email",
     "Failed to unban": "Не удалось разблокировать",
     "Failed to upload file": "Не удалось отправить файл",
     "Favourite": "Избранное",
@@ -95,9 +95,9 @@
     "Historical": "Архив",
     "Homeserver is": "Домашний сервер это",
     "Identity Server is": "Сервер идентификации это",
-    "I have verified my email address": "Я подтвердил свой адрес эл. почты",
+    "I have verified my email address": "Я подтвердил свой адрес email",
     "Import E2E room keys": "Импорт ключей сквозного шифрования",
-    "Invalid Email Address": "Недопустимый адрес эл. почты",
+    "Invalid Email Address": "Недопустимый адрес email",
     "invited": "invited",
     "Invite new room members": "Пригласить новых участников в комнату",
     "Invites": "Приглашает",
@@ -165,9 +165,9 @@
     "To send events of type": "Чтобы отправить тип события",
     "To send messages": "Чтобы отправить сообщения",
     "turned on end-to-end encryption (algorithm": "turned on end-to-end encryption (algorithm",
-    "Unable to add email address": "Не удается добавить адрес эл. почты",
+    "Unable to add email address": "Не удается добавить адрес email",
     "Unable to remove contact information": "Не удалось удалить контактную информацию",
-    "Unable to verify email address.": "Не удалось проверить адрес эл. почты.",
+    "Unable to verify email address.": "Не удалось проверить адрес email.",
     "Unban": "Разблокировать",
     "Unencrypted room": "Незашифрованная комната",
     "unencrypted": "без шифрования",
@@ -239,7 +239,7 @@
     "Failed to lookup current room": "Не удалось выполнить поиск текущий комнаты",
     "Failed to send request.": "Не удалось отправить запрос.",
     "Failed to set up conference call": "Не удалось настроить групповой вызов",
-    "Failed to verify email address: make sure you clicked the link in the email": "Не удалось проверить адрес эл. почты: убедитесь, что вы перешли по ссылке в письме",
+    "Failed to verify email address: make sure you clicked the link in the email": "Не удалось проверить адрес email: убедитесь, что вы перешли по ссылке в письме",
     "Failure to create room": "Не удалось создать комнату",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s с %(fromPowerLevel)s на %(toPowerLevel)s",
     "Guest users can't create new rooms. Please register to create room and start a chat.": "Гости не могут создавать новые комнаты. Зарегистрируйтесь, чтобы создать комнату и начать чат.",
@@ -267,7 +267,7 @@
     "Set a display name:": "Введите отображаемое имя:",
     "Passwords don't match.": "Пароли не совпадают.",
     "Password too short (min %(MIN_PASSWORD_LENGTH)s).": "Пароль слишком короткий (мин. %(MIN_PASSWORD_LENGTH)s).",
-    "This doesn't look like a valid email address.": "Это не похоже на допустимый адрес эл. почты.",
+    "This doesn't look like a valid email address.": "Это не похоже на допустимый адрес email.",
     "This server does not support authentication with a phone number.": "Этот сервер не поддерживает аутентификацию с помощью номера телефона.",
     "User names may only contain letters, numbers, dots, hyphens and underscores.": "Имена пользователей могут содержать только буквы, цифры, точки, дефисы и символы подчеркивания.",
     "An unknown error occurred.": "Произошла неизвестная ошибка.",
@@ -314,7 +314,7 @@
     "Thu": "Чт",
     "Fri": "Пт",
     "Sat": "Сб",
-    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Ваш адрес эл. почты, кажется, не связан с Matrix ID на этом домашнем сервере.",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Ваш адрес email, кажется, не связан с Matrix ID на этом домашнем сервере.",
     "to start a chat with someone": "чтобы начать чат с кем-то",
     "to tag direct chat": "отметить прямой чат",
     "To use it, just wait for autocomplete results to load and tab through them.": "Для того, чтобы использовать эту функцию, просто подождите автозаполнения результатов, а затем используйте клавишу TAB для прокрутки.",
@@ -366,7 +366,7 @@
     "Command error": "Ошибка команды",
     "Confirm password": "Подтвердите пароль",
     "Current password": "Текущий пароль",
-    "Email": "Эл. почта",
+    "Email": "Электронная почта",
     "Failed to kick": "Не удалось выгнать",
     "Failed to load timeline position": "Не удалось загрузить метку из хронологии",
     "Failed to mute user": "Не удалось заглушить пользователя",
@@ -452,15 +452,15 @@
     "The default role for new room members is": "Роль по умолчанию для новых участников комнаты",
     "The main address for this room is": "Основной адрес для этой комнаты",
     "This action cannot be performed by a guest user. Please register to be able to do this.": "Это действие не может быть выполнено гостем. Пожалуйста, зарегистрируйтесь, чтобы получить возможность сделать то что вы хотите.",
-    "This email address is already in use": "Этот адрес эл. почты уже используется",
-    "This email address was not found": "Этот адрес эл. почты не найден",
-    "The email address linked to your account must be entered.": "Необходимо ввести адрес эл. почты, связанный с вашей учетной записью.",
+    "This email address is already in use": "Этот адрес email уже используется",
+    "This email address was not found": "Этот адрес email не найден",
+    "The email address linked to your account must be entered.": "Необходимо ввести адрес email, связанный с вашей учетной записью.",
     "The file '%(fileName)s' failed to upload": "Не удалось отправить файл '%(fileName)s'",
     "The remote side failed to pick up": "Вызываемый абонент не ответил",
     "This room has no local addresses": "В этой комнате нет локальных адресов",
     "This room is not recognised.": "Эта комната не опознана.",
     "These are experimental features that may break in unexpected ways": "Это экспериментальные функции, которые могут себя вести неожиданным образом",
-    "This doesn't appear to be a valid email address": "Похоже, это недействительный адрес эл. почты",
+    "This doesn't appear to be a valid email address": "Похоже, это недействительный адрес email",
     "This is a preview of this room. Room interactions have been disabled": "Это предпросмотр комнаты. Взаимодействие с комнатой отключено",
     "This phone number is already in use": "Этот номер телефона уже используется",
     "This room's internal ID is": "Внутренний ID этой комнаты",
@@ -567,8 +567,8 @@
     "Device key:": "Ключ устройства:",
     "disabled": "отключено",
     "Disable markdown formatting": "Отключить Markdown-форматирование",
-    "Email address": "Адрес эл. почты",
-    "Email address (optional)": "Адрес эл. почты (необязательно)",
+    "Email address": "Адрес email",
+    "Email address (optional)": "Адрес email (необязательно)",
     "enabled": "включено",
     "Error decrypting attachment": "Ошибка при расшифровке вложения",
     "Export": "Экспорт",
@@ -608,7 +608,7 @@
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Предоставленный ключ подписи соответствует ключу, полученному от %(userId)s с устройства %(deviceId)s. Устройство помечено как проверенное.",
     "%(actionVerb)s this person?": "%(actionVerb)s этот человек?",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "Файл '%(fileName)s' превышает предельный размер, допустимый к отправке на этом домашнем сервере",
-    "This Home Server does not support login using email address.": "Этот домашний сервер не поддерживает авторизацию с использованием адреса эл. почты.",
+    "This Home Server does not support login using email address.": "Этот домашний сервер не поддерживает авторизацию с использованием адреса email.",
     "There was a problem logging in.": "Возникла проблема при авторизации.",
     "The visibility of existing history will be unchanged": "Видимость существующей истории не изменится",
     "this invitation?": "это приглашение?",
@@ -622,7 +622,7 @@
     "To link to a room it must have": "Для создания ссылки на комнату она должна иметь",
     "to make a room or": "чтобы создать комнату или",
     "To remove other users' messages": "Чтобы удалить сообщения других пользователей",
-    "To reset your password, enter the email address linked to your account": "Чтобы сбросить пароль, введите адрес эл. почты, связанный с вашей учетной записью",
+    "To reset your password, enter the email address linked to your account": "Чтобы сбросить пароль, введите адрес email, связанный с вашей учетной записью",
     "to tag as %(tagName)s": "пометить как %(tagName)s",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Попытка загрузить выбранный интервал истории чата этой комнаты не удалась, так как у вас нет разрешений на просмотр.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Попытка загрузить выбранный интервал истории чата этой комнаты не удалась, так как запрошенный элемент не найден.",
@@ -636,7 +636,7 @@
     "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "ВНИМАНИЕ: ОШИБКА ПРОВЕРКИ КЛЮЧЕЙ! Ключ подписи пользователя %(userId)s на устройстве %(deviceId)s — \"%(fprint)s\", и он не соответствует предоставленному ключу \"%(fingerprint)s\". Это может означать, что ваше общение перехватывается!",
     "You have <a>disabled</a> URL previews by default.": "Предварительный просмотр ссылок <a>отключен</a> по-умолчанию.",
     "You have <a>enabled</a> URL previews by default.": "Предварительный просмотр ссылок <a>включен</a> по-умолчанию.",
-    "You have entered an invalid contact. Try using their Matrix ID or email address.": "Вы ввели недопустимый контакт. Попробуйте использовать Matrix ID или адрес эл. почты.",
+    "You have entered an invalid contact. Try using their Matrix ID or email address.": "Вы ввели недопустимый контакт. Попробуйте использовать Matrix ID или адрес email.",
     "You need to enter a user name.": "Необходимо ввести имя пользователя.",
     "You seem to be in a call, are you sure you want to quit?": "Звонок не завершен, вы уверены, что хотите выйти?",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Вы не сможете отменить это изменение, так как этот пользователь получит уровень доступа, аналогичный вашему.",
@@ -699,12 +699,12 @@
     "Sign in with CAS": "Войти с помощью CAS",
     "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "Вы можете использовать настраиваемые параметры сервера для входа на другие серверы Matrix, указав другой URL-адрес домашнего сервера.",
     "This allows you to use this app with an existing Matrix account on a different home server.": "Это позволяет использовать это приложение с существующей учетной записью Matrix на другом домашнем сервере.",
-    "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "Вы также можете установить другой сервер идентификации, но это, как правило, будет препятствовать взаимодействию с пользователями на основе адреса эл. почты.",
+    "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "Вы также можете установить другой сервер идентификации, но это, как правило, будет препятствовать взаимодействию с пользователями на основе адреса email.",
     "Please check your email to continue registration.": "Проверьте электронную почту, чтобы продолжить регистрацию.",
     "Token incorrect": "Неверный токен",
     "A text message has been sent to": "Текстовое сообщение отправлено",
     "Please enter the code it contains:": "Введите полученный код:",
-    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Если адрес эл. почты не указан, сброс пароля будет невозможным. Уверены?",
+    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Если адрес email не указан, сброс пароля будет невозможным. Уверены?",
     "You are registering with %(SelectedTeamName)s": "Вы регистрируетесь на %(SelectedTeamName)s",
     "Default server": "Сервер по умолчанию",
     "Custom server": "Пользовательский сервер",
@@ -807,7 +807,7 @@
     "Seen by %(userName)s at %(dateTime)s": "Просмотрено %(userName)s в %(dateTime)s",
     "Send anyway": "Отправить в любом случае",
     "Show Text Formatting Toolbar": "Показать панель инструментов форматирования текста",
-    "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:": "Это приглашение было отправлено на адрес email, не связанный с этой учетной записью:",
     "To link to a room it must have <a>an address</a>.": "Чтобы связаться с комнатой, она должна иметь <a> адрес</a>.",
     "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "Не удалось установить соответствует ли адрес, по которому этому приглашение было послано, вашей учетной записи.",
     "Undecryptable": "Невозможно расшифровать",
@@ -824,7 +824,7 @@
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Не удается подключиться к домашнему серверу - проверьте подключение, убедитесь, что ваш <a>SSL-сертификат домашнего сервера</a> является доверенным и что расширение браузера не блокирует запросы.",
     "You have been banned from %(roomName)s by %(userName)s.": "%(userName)s заблокировал вас в %(roomName)s.",
     "You have been kicked from %(roomName)s by %(userName)s.": "%(userName)s выгнал вас из %(roomName)s.",
-    "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.": "При желании вы можете войти в систему с другой учетной записью или добавить этот адрес email в эту учетную запись.",
     "Your home server does not support device management.": "Ваш домашний сервер не поддерживает управление устройствами.",
     "(could not connect media)": "(подключение к СМИ не может быть установлено)",
     "(no answer)": "(нет ответа)",
@@ -833,7 +833,7 @@
     "Not a valid Riot keyfile": "Недействительный файл ключа Riot",
     "Your browser does not support the required cryptography extensions": "Ваш браузер не поддерживает требуемые криптографические расширения",
     "Authentication check failed: incorrect password?": "Ошибка аутентификации: неправильный пароль?",
-    "Do you want to set an email address?": "Хотите указать адрес эл. почты?",
+    "Do you want to set an email address?": "Хотите указать адрес email?",
     "This will allow you to reset your password and receive notifications.": "Это позволит при необходимости сбросить пароль и получать уведомления.",
     "Press <StartChatButton> to start a chat with someone": "Нажмите <StartChatButton> для начала чата с кем-либо",
     "You're not in any rooms yet! Press <CreateRoomButton> to make a room or <RoomDirectoryButton> to browse the directory": "Вы еще не вошли ни в одну из комнат! Нажмите <CreateRoomButton>, чтобы создать комнату или <RoomDirectoryButton> для просмотра каталога",

From b4d6d654ca20d40f37162e92cbcf4b4ec6c8900d Mon Sep 17 00:00:00 2001
From: Pitchaya Boonsarngsuk <brian.mwit@gmail.com>
Date: Thu, 5 Oct 2017 00:10:05 +0000
Subject: [PATCH 084/123] Translated using Weblate (Thai)

Currently translated at 61.4% (525 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/th/
---
 src/i18n/strings/th.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/th.json b/src/i18n/strings/th.json
index 9a484dfd1a..4a08e3d1eb 100644
--- a/src/i18n/strings/th.json
+++ b/src/i18n/strings/th.json
@@ -525,7 +525,7 @@
     "Verified": "ตรวจสอบแล้ว",
     "You are already in a call.": "คุณอยู่ในสายแล้ว",
     "You cannot place a call with yourself.": "คุณไม่สามารถโทรหาตัวเองได้",
-    "Unverify": "ถอนการตรวสอบ",
+    "Unverify": "ถอนการตรวจสอบ",
     "Verify...": "ตรวจสอบ...",
     "What does this mean?": "นี่แปลว่าอะไร?",
     "Error decrypting audio": "เกิดข้อผิดพลาดในการถอดรหัสเสียง",

From fa24b4bd2de325154cc32d0237b9fe5904c794cd Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 11 Oct 2017 09:48:12 +0100
Subject: [PATCH 085/123] Remove this log - it's not an error worth logging

---
 src/components/views/login/PasswordLogin.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/views/login/PasswordLogin.js b/src/components/views/login/PasswordLogin.js
index 4e37e30f65..7e78de3f54 100644
--- a/src/components/views/login/PasswordLogin.js
+++ b/src/components/views/login/PasswordLogin.js
@@ -192,7 +192,6 @@ class PasswordLogin extends React.Component {
                 const parsedHsUrl = new URL(this.props.hsUrl);
                 matrixIdText = _t('%(serverName)s Matrix ID', {serverName: parsedHsUrl.hostname});
             } catch (e) {
-                console.log(e);
                 // pass
             }
         }

From 6ad0f2d8f8f77b96d07a38bf280f599eb0c550e3 Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Wed, 11 Oct 2017 10:50:03 +0000
Subject: [PATCH 086/123] Translated using Weblate (Russian)

Currently translated at 100.0% (855 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
---
 src/i18n/strings/ru.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 2bbf72f87c..d1449ae7c1 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -262,7 +262,7 @@
     "Connectivity to the server has been lost.": "Связь с сервером потеряна.",
     "Sent messages will be stored until your connection has returned.": "Отправленные сообщения будут сохранены, пока соединение не восстановится.",
     "There are no visible files in this room": "В этой комнате нет видимых файлов",
-    "This doesn't look like a valid phone number.": "Это не похоже на допустимый телефонный номер.",
+    "This doesn't look like a valid phone number.": "Недопустимый номер телефона.",
     "Missing password.": "Отсутствует пароль.",
     "Set a display name:": "Введите отображаемое имя:",
     "Passwords don't match.": "Пароли не совпадают.",

From 0f84216a9fea9c0cf38d6ae1ab30e0062bf707a1 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 11 Oct 2017 14:05:34 +0100
Subject: [PATCH 087/123] Grey out login form when no valid HS

---
 src/components/views/elements/Dropdown.js     |  1 +
 src/components/views/login/CountryDropdown.js |  3 +-
 src/components/views/login/PasswordLogin.js   | 46 +++++++++++++------
 3 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/src/components/views/elements/Dropdown.js b/src/components/views/elements/Dropdown.js
index 1b2117bb6a..0fb5a37414 100644
--- a/src/components/views/elements/Dropdown.js
+++ b/src/components/views/elements/Dropdown.js
@@ -302,6 +302,7 @@ export default class Dropdown extends React.Component {
 
         const dropdownClasses = {
             mx_Dropdown: true,
+            mx_Dropdown_disabled: this.props.disabled,
         };
         if (this.props.className) {
             dropdownClasses[this.props.className] = true;
diff --git a/src/components/views/login/CountryDropdown.js b/src/components/views/login/CountryDropdown.js
index 7024db339c..56ab962d98 100644
--- a/src/components/views/login/CountryDropdown.js
+++ b/src/components/views/login/CountryDropdown.js
@@ -123,7 +123,7 @@ export default class CountryDropdown extends React.Component {
         return <Dropdown className={this.props.className + " left_aligned"}
             onOptionChange={this._onOptionChange} onSearchChange={this._onSearchChange}
             menuWidth={298} getShortOption={this._getShortOption}
-            value={value} searchEnabled={true}
+            value={value} searchEnabled={true} disabled={this.props.disabled}
         >
             {options}
         </Dropdown>;
@@ -137,4 +137,5 @@ CountryDropdown.propTypes = {
     showPrefix: React.PropTypes.bool,
     onOptionChange: React.PropTypes.func.isRequired,
     value: React.PropTypes.string,
+    disabled: React.PropTypes.bool,
 };
diff --git a/src/components/views/login/PasswordLogin.js b/src/components/views/login/PasswordLogin.js
index 7e78de3f54..d532c400bc 100644
--- a/src/components/views/login/PasswordLogin.js
+++ b/src/components/views/login/PasswordLogin.js
@@ -116,11 +116,17 @@ class PasswordLogin extends React.Component {
         this.props.onPasswordChanged(ev.target.value);
     }
 
-    renderLoginField(loginType) {
+    renderLoginField(loginType, disabled) {
+        const classes = {
+            mx_Login_field: true,
+            mx_Login_field_disabled: disabled,
+        };
+
         switch(loginType) {
             case PasswordLogin.LOGIN_FIELD_EMAIL:
+                classes.mx_Login_email = true;
                 return <input
-                    className="mx_Login_field mx_Login_email"
+                    className={classNames(classes)}
                     key="email_input"
                     type="text"
                     name="username" // make it a little easier for browser's remember-password
@@ -128,10 +134,12 @@ class PasswordLogin extends React.Component {
                     placeholder="joe@example.com"
                     value={this.state.username}
                     autoFocus
+                    disabled={disabled}
                 />;
             case PasswordLogin.LOGIN_FIELD_MXID:
+                classes.mx_Login_username = true;
                 return <input
-                    className="mx_Login_field mx_Login_username"
+                    className={classNames(classes)}
                     key="username_input"
                     type="text"
                     name="username" // make it a little easier for browser's remember-password
@@ -139,9 +147,12 @@ class PasswordLogin extends React.Component {
                     placeholder={_t('User name')}
                     value={this.state.username}
                     autoFocus
+                    disabled={disabled}
                 />;
             case PasswordLogin.LOGIN_FIELD_PHONE:
                 const CountryDropdown = sdk.getComponent('views.login.CountryDropdown');
+                classes.mx_Login_phoneNumberField = true;
+                classes.mx_Login_field_has_prefix = true;
                 return <div className="mx_Login_phoneSection">
                     <CountryDropdown
                         className="mx_Login_phoneCountry mx_Login_field_prefix"
@@ -150,9 +161,10 @@ class PasswordLogin extends React.Component {
                         value={this.state.phoneCountry}
                         isSmall={true}
                         showPrefix={true}
+                        disabled={disabled}
                     />
                     <input
-                        className="mx_Login_phoneNumberField mx_Login_field mx_Login_field_has_prefix"
+                        className={classNames(classes)}
                         ref="phoneNumber"
                         key="phone_input"
                         type="text"
@@ -161,6 +173,7 @@ class PasswordLogin extends React.Component {
                         placeholder={_t("Mobile phone number")}
                         value={this.state.phoneNumber}
                         autoFocus
+                        disabled={disabled}
                     />
                 </div>;
         }
@@ -177,15 +190,6 @@ class PasswordLogin extends React.Component {
             );
         }
 
-        const pwFieldClass = classNames({
-            mx_Login_field: true,
-            error: this.props.loginIncorrect,
-        });
-
-        const Dropdown = sdk.getComponent('elements.Dropdown');
-
-        const loginField = this.renderLoginField(this.state.loginType);
-
         let matrixIdText = '';
         if (this.props.hsUrl) {
             try {
@@ -196,6 +200,16 @@ class PasswordLogin extends React.Component {
             }
         }
 
+        const pwFieldClass = classNames({
+            mx_Login_field: true,
+            mx_Login_field_disabled: matrixIdText === '',
+            error: this.props.loginIncorrect,
+        });
+
+        const Dropdown = sdk.getComponent('elements.Dropdown');
+
+        const loginField = this.renderLoginField(this.state.loginType, matrixIdText === '');
+
         return (
             <div>
                 <form onSubmit={this.onSubmitForm}>
@@ -215,10 +229,12 @@ class PasswordLogin extends React.Component {
                 <input className={pwFieldClass} ref={(e) => {this._passwordField = e;}} type="password"
                     name="password"
                     value={this.state.password} onChange={this.onPasswordChanged}
-                    placeholder={ _t('Password') } />
+                    placeholder={ _t('Password') }
+                    disabled={matrixIdText === ''}
+                />
                 <br />
                 {forgotPasswordJsx}
-                <input className="mx_Login_submit" type="submit" value={ _t('Sign in') } />
+                <input className="mx_Login_submit" type="submit" value={ _t('Sign in') } disabled={matrixIdText === ''} />
                 </form>
             </div>
         );

From 36666b3fc387ef7888f477f019ffc8546c76501a Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Wed, 11 Oct 2017 15:04:52 +0100
Subject: [PATCH 088/123] Add warm fuzzy dialog for inviting users to a group

---
 src/GroupAddressPicker.js   | 7 +++++++
 src/i18n/strings/en_EN.json | 4 +++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/GroupAddressPicker.js b/src/GroupAddressPicker.js
index cfd2590780..ca495de16d 100644
--- a/src/GroupAddressPicker.js
+++ b/src/GroupAddressPicker.js
@@ -76,6 +76,13 @@ function _onGroupInviteFinished(groupId, addrs) {
                 title: _t("Failed to invite the following users to %(groupId)s:", {groupId: groupId}),
                 description: errorList.join(", "),
             });
+        } else {
+            const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
+            Modal.createTrackedDialog('Group invitations sent', '', QuestionDialog, {
+                title: _t("Invites sent"),
+                description: _t("Your group invitations have been sent."),
+                hasCancelButton: false,
+            });
         }
     }).catch((err) => {
         const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 6acaba9fae..aaabea1011 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -906,5 +906,7 @@
     "Related Groups": "Related Groups",
     "Related groups for this room:": "Related groups for this room:",
     "This room has no related groups": "This room has no related groups",
-    "New group ID (e.g. +foo:%(localDomain)s)": "New group ID (e.g. +foo:%(localDomain)s)"
+    "New group ID (e.g. +foo:%(localDomain)s)": "New group ID (e.g. +foo:%(localDomain)s)",
+    "Invites sent": "Invites sent",
+    "Your group invitations have been sent.": "Your group invitations have been sent."
 }

From 0ab5b1a6af3598c52102bcea24029244c398e54d Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 11 Oct 2017 08:50:28 -0600
Subject: [PATCH 089/123] _td translatable strings

Signed-off-by: Travis Ralston <travpc@gmail.com>
---
 src/components/views/rooms/RoomSettings.js | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js
index b3b27875a0..e6d3bc7d71 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -17,7 +17,7 @@ limitations under the License.
 
 import Promise from 'bluebird';
 import React from 'react';
-import { _t, _tJsx } from '../../../languageHandler';
+import { _t, _tJsx, _td } from '../../../languageHandler';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import SdkConfig from '../../../SdkConfig';
 import sdk from '../../../index';
@@ -37,15 +37,14 @@ function parseIntWithDefault(val, def) {
 
 const plEventsToLabels = {
     // These will be translated for us later.
-    // TODO: _td() these when https://github.com/matrix-org/matrix-react-sdk/pull/1421 lands
-    "m.room.avatar": "To change the room's avatar, you must be a",
-    "m.room.name": "To change the room's name, you must be a",
-    "m.room.canonical_alias": "To change the room's main address, you must be a",
-    "m.room.history_visibility": "To change the room's history visibility, you must be a",
-    "m.room.power_levels": "To change the permissions in the room, you must be a",
-    "m.room.topic": "To change the topic, you must be a",
+    "m.room.avatar": _td("To change the room's avatar, you must be a"),
+    "m.room.name": _td("To change the room's name, you must be a"),
+    "m.room.canonical_alias": _td("To change the room's main address, you must be a"),
+    "m.room.history_visibility": _td("To change the room's history visibility, you must be a"),
+    "m.room.power_levels": _td("To change the permissions in the room, you must be a"),
+    "m.room.topic": _td("To change the topic, you must be a"),
 
-    "im.vector.modular.widgets": "To modify widgets in the room, you must be a",
+    "im.vector.modular.widgets": _td("To modify widgets in the room, you must be a"),
 };
 
 const plEventsToShow = {

From 060bf3bdf64a7e23c24d19f35c0e2f4f3910afe2 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Wed, 11 Oct 2017 16:02:01 +0100
Subject: [PATCH 090/123] Remove inline CSS

---
 src/components/views/elements/Flair.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/elements/Flair.js b/src/components/views/elements/Flair.js
index 84c0c2a187..ceab20bf19 100644
--- a/src/components/views/elements/Flair.js
+++ b/src/components/views/elements/Flair.js
@@ -265,7 +265,7 @@ export default class Flair extends React.Component {
             return <FlairAvatar key={index} groupProfile={profile} />;
         });
         return (
-            <span className="mx_Flair" style={{"marginLeft": "5px", "verticalAlign": "-3px"}}>
+            <span className="mx_Flair">
                 { avatars }
             </span>
         );

From d1fdd208097142b9bfdbbf2fc115b271af2bf2bf Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 29 Sep 2017 16:04:12 -0600
Subject: [PATCH 091/123] Show who banned the user on hover

Fixes https://github.com/vector-im/riot-web/issues/5039

Signed-off-by: Travis Ralston <travpc@gmail.com>
---
 src/components/views/rooms/RoomSettings.js | 10 +++++++---
 src/i18n/strings/en_EN.json                |  1 +
 src/i18n/strings/en_US.json                |  1 +
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js
index 031e089c4e..05116bc097 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -39,6 +39,7 @@ const BannedUser = React.createClass({
     propTypes: {
         canUnban: React.PropTypes.bool,
         member: React.PropTypes.object.isRequired, // js-sdk RoomMember
+        by: React.PropTypes.object.isRequired, // js-sdk RoomMember
         reason: React.PropTypes.string,
     },
 
@@ -77,8 +78,10 @@ const BannedUser = React.createClass({
         return (
             <li>
                 { unbanButton }
-                <strong>{this.props.member.name}</strong> {this.props.member.userId}
-                {this.props.reason ? " " +_t('Reason') + ": " + this.props.reason : ""}
+                <span title={_t("Banned by %(displayName)s (%(userId)s)", {displayName: this.props.by.name, userId: this.props.by.userId})}>
+                    <strong>{this.props.member.name}</strong> {this.props.member.userId}
+                    {this.props.reason ? " " +_t('Reason') + ": " + this.props.reason : ""}
+                </span>
             </li>
         );
     },
@@ -670,8 +673,9 @@ module.exports = React.createClass({
                     <ul className="mx_RoomSettings_banned">
                         {banned.map(function(member) {
                             const banEvent = member.events.member.getContent();
+                            const bannedBy = self.props.room.getMember(member.events.member.getSender());
                             return (
-                                <BannedUser key={member.userId} canUnban={canBanUsers} member={member} reason={banEvent.reason} />
+                                <BannedUser key={member.userId} canUnban={canBanUsers} member={member} reason={banEvent.reason} by={bannedBy} />
                             );
                         })}
                     </ul>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index cf2be3c2f8..9e5524d80c 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -808,6 +808,7 @@
     "This will allow you to reset your password and receive notifications.": "This will allow you to reset your password and receive notifications.",
     "To return to your account in future you need to set a password": "To return to your account in future you need to set a password",
     "Skip": "Skip",
+    "Banned by %(displayName)s (%(userId)s)": "Banned by %(displayName)s (%(userId)s)",
     "Start verification": "Start verification",
     "Share without verifying": "Share without verifying",
     "Ignore request": "Ignore request",
diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index 3954b2b6fa..93b3e88332 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -607,6 +607,7 @@
     "Desktop specific": "Desktop specific",
     "Analytics": "Analytics",
     "Opt out of analytics": "Opt out of analytics",
+    "Banned by %(displayName)s (%(userId)s)": "Banned by %(displayName)s (%(userId)s)",
     "Options": "Options",
     "Riot collects anonymous analytics to allow us to improve the application.": "Riot collects anonymous analytics to allow us to improve the application.",
     "Passphrases must match": "Passphrases must match",

From 8a2813ac08e212fef2aa62b14ff7d800f7ab2923 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 11 Oct 2017 09:05:54 -0600
Subject: [PATCH 092/123] Fallback to MXID instead of relying on the user being
 in the room

Signed-off-by: Travis Ralston <travpc@gmail.com>
---
 src/components/views/rooms/RoomSettings.js | 8 +++++---
 src/i18n/strings/en_EN.json                | 2 +-
 src/i18n/strings/en_US.json                | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js
index 05116bc097..b62b72bf18 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -39,7 +39,7 @@ const BannedUser = React.createClass({
     propTypes: {
         canUnban: React.PropTypes.bool,
         member: React.PropTypes.object.isRequired, // js-sdk RoomMember
-        by: React.PropTypes.object.isRequired, // js-sdk RoomMember
+        by: React.PropTypes.string.isRequired,
         reason: React.PropTypes.string,
     },
 
@@ -78,7 +78,7 @@ const BannedUser = React.createClass({
         return (
             <li>
                 { unbanButton }
-                <span title={_t("Banned by %(displayName)s (%(userId)s)", {displayName: this.props.by.name, userId: this.props.by.userId})}>
+                <span title={_t("Banned by %(displayName)s", {displayName: this.props.by})}>
                     <strong>{this.props.member.name}</strong> {this.props.member.userId}
                     {this.props.reason ? " " +_t('Reason') + ": " + this.props.reason : ""}
                 </span>
@@ -673,7 +673,9 @@ module.exports = React.createClass({
                     <ul className="mx_RoomSettings_banned">
                         {banned.map(function(member) {
                             const banEvent = member.events.member.getContent();
-                            const bannedBy = self.props.room.getMember(member.events.member.getSender());
+                            const sender = self.props.room.getMember(member.events.member.getSender());
+                            let bannedBy = member.events.member.getSender(); // start by falling back to mxid
+                            if (sender) bannedBy = sender.name;
                             return (
                                 <BannedUser key={member.userId} canUnban={canBanUsers} member={member} reason={banEvent.reason} by={bannedBy} />
                             );
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 9e5524d80c..f6edae19a9 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -808,7 +808,7 @@
     "This will allow you to reset your password and receive notifications.": "This will allow you to reset your password and receive notifications.",
     "To return to your account in future you need to set a password": "To return to your account in future you need to set a password",
     "Skip": "Skip",
-    "Banned by %(displayName)s (%(userId)s)": "Banned by %(displayName)s (%(userId)s)",
+    "Banned by %(displayName)s": "Banned by %(displayName)s",
     "Start verification": "Start verification",
     "Share without verifying": "Share without verifying",
     "Ignore request": "Ignore request",
diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index 93b3e88332..fccf387f30 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -607,7 +607,7 @@
     "Desktop specific": "Desktop specific",
     "Analytics": "Analytics",
     "Opt out of analytics": "Opt out of analytics",
-    "Banned by %(displayName)s (%(userId)s)": "Banned by %(displayName)s (%(userId)s)",
+    "Banned by %(displayName)s": "Banned by %(displayName)s",
     "Options": "Options",
     "Riot collects anonymous analytics to allow us to improve the application.": "Riot collects anonymous analytics to allow us to improve the application.",
     "Passphrases must match": "Passphrases must match",

From 5626c06b3ccc0de5b02ea4ab9ced91f7f0fd6651 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 11 Oct 2017 17:42:54 +0100
Subject: [PATCH 093/123] Show failures when sending messages

This is useful for the spam checking where otherwise you don't
really know why your message has failed to send
---
 src/components/structures/RoomView.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index e0332b1b19..e5c730233d 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -738,6 +738,17 @@ module.exports = React.createClass({
     _getUnsentMessageError: function(room) {
         const unsentMessages = this._getUnsentMessages(room);
         if (!unsentMessages.length) return "";
+
+        if (
+            unsentMessages.length === 1 &&
+            unsentMessages[0].error &&
+            unsentMessages[0].error.data &&
+            unsentMessages[0].error.data.error &&
+            unsentMessages[0].error.name !== "UnknownDeviceError"
+        ) {
+            return unsentMessages[0].error.data.error;
+        }
+
         for (const event of unsentMessages) {
             if (!event.error || event.error.name !== "UnknownDeviceError") {
                 return _t("Some of your messages have not been sent.");

From d3f9a3aeb55aaf6a746a12d9d6f9a27df54654fe Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Wed, 11 Oct 2017 17:56:17 +0100
Subject: [PATCH 094/123] Run eslint --fix

Fixing 1000s of lint issues. Some rules cannot be `--fix`ed but this goes some way to linting the entire codebase.
---
 src/CallHandler.js                            |  89 ++---
 src/ContentMessages.js                        |  53 ++-
 src/HtmlUtils.js                              |  65 ++--
 src/ImageUtils.js                             |   7 +-
 src/Login.js                                  |  16 +-
 src/Markdown.js                               |   6 +-
 src/MatrixClientPeg.js                        |   8 +-
 src/Modal.js                                  |  22 +-
 src/Notifier.js                               |   4 +-
 src/Presence.js                               |  14 +-
 src/RichText.js                               |  34 +-
 src/Rooms.js                                  |   3 +-
 src/ScalarAuthClient.js                       |  14 +-
 src/ScalarMessaging.js                        |  21 +-
 src/Tinter.js                                 |  83 +++--
 src/Unread.js                                 |  19 +-
 src/Velociraptor.js                           |  32 +-
 src/VelocityBounce.js                         |   4 +-
 src/WhoIsTyping.js                            |  16 +-
 .../views/dialogs/EncryptedEventDialog.js     |  38 +--
 src/autocomplete/Autocompleter.js             |   2 +-
 src/autocomplete/Components.js                |  18 +-
 src/autocomplete/DuckDuckGoProvider.js        |   6 +-
 src/autocomplete/EmojiProvider.js             |   7 +-
 src/autocomplete/UserProvider.js              |   6 +-
 src/components/structures/ContextualMenu.js   |  34 +-
 src/components/structures/CreateRoom.js       |  70 ++--
 src/components/structures/FilePanel.js        |  35 +-
 src/components/structures/InteractiveAuth.js  |   8 +-
 src/components/structures/LoggedInView.js     |  17 +-
 src/components/structures/MessagePanel.js     | 102 +++---
 .../structures/NotificationPanel.js           |  31 +-
 src/components/structures/RoomStatusBar.js    |  64 ++--
 src/components/structures/RoomView.js         | 322 +++++++++---------
 src/components/structures/ScrollPanel.js      |  65 ++--
 src/components/structures/TimelinePanel.js    | 185 +++++-----
 src/components/structures/UploadBar.js        |  32 +-
 .../structures/login/ForgotPassword.js        |  82 +++--
 src/components/structures/login/Login.js      |  40 +--
 .../structures/login/PostRegistration.js      |  22 +-
 .../structures/login/Registration.js          |  30 +-
 src/components/views/avatars/BaseAvatar.js    |  53 ++-
 src/components/views/avatars/MemberAvatar.js  |  16 +-
 .../views/create_room/CreateRoomButton.js     |   4 +-
 src/components/views/create_room/Presets.js   |  14 +-
 src/components/views/create_room/RoomAlias.js |  26 +-
 .../views/dialogs/ChatCreateOrReuseDialog.js  |   4 +-
 .../views/dialogs/DeactivateAccountDialog.js  |  20 +-
 .../views/dialogs/InteractiveAuthDialog.js    |   8 +-
 .../views/dialogs/UnknownDeviceDialog.js      |  34 +-
 .../views/elements/AccessibleButton.js        |   2 +-
 src/components/views/elements/ActionButton.js |   4 +-
 .../views/elements/AddressSelector.js         |  34 +-
 src/components/views/elements/AddressTile.js  |  10 +-
 .../views/elements/CreateRoomButton.js        |   2 +-
 .../views/elements/DeviceVerifyButtons.js     |  18 +-
 .../views/elements/DirectorySearchBox.js      |   2 +-
 src/components/views/elements/Dropdown.js     |  26 +-
 src/components/views/elements/EditableText.js |  29 +-
 .../views/elements/EditableTextContainer.js   |  10 +-
 src/components/views/elements/HomeButton.js   |   2 +-
 .../views/elements/LanguageDropdown.js        |  10 +-
 .../views/elements/MemberEventListSummary.js  |  46 ++-
 .../views/elements/PowerSelector.js           |  39 +--
 src/components/views/elements/ProgressBar.js  |  10 +-
 .../views/elements/RoomDirectoryButton.js     |   2 +-
 .../views/elements/SettingsButton.js          |   2 +-
 .../views/elements/StartChatButton.js         |   2 +-
 src/components/views/elements/TintableSvg.js  |  18 +-
 src/components/views/elements/UserSelector.js |  14 +-
 src/components/views/login/CaptchaForm.js     |  25 +-
 src/components/views/login/CasLogin.js        |   4 +-
 src/components/views/login/CountryDropdown.js |   8 +-
 .../views/login/CustomServerDialog.js         |  24 +-
 .../login/InteractiveAuthEntryComponents.js   |  36 +-
 src/components/views/login/LoginHeader.js     |   4 +-
 src/components/views/login/PasswordLogin.js   |  14 +-
 .../views/login/RegistrationForm.js           |  60 ++--
 src/components/views/login/ServerConfig.js    |  57 ++--
 src/components/views/messages/MAudioBody.js   |  13 +-
 src/components/views/messages/MFileBody.js    |  27 +-
 src/components/views/messages/MImageBody.js   |  12 +-
 src/components/views/messages/MVideoBody.js   |  19 +-
 src/components/views/messages/MessageEvent.js |  16 +-
 .../views/messages/RoomAvatarEvent.js         |  28 +-
 src/components/views/messages/TextualBody.js  |  92 +++--
 src/components/views/messages/TextualEvent.js |  10 +-
 .../views/room_settings/AliasSettings.js      |  81 +++--
 .../views/room_settings/ColorSettings.js      |  52 +--
 .../views/room_settings/UrlPreviewSettings.js |  83 +++--
 src/components/views/rooms/Autocomplete.js    |   6 +-
 src/components/views/rooms/AuxPanel.js        |  20 +-
 src/components/views/rooms/EntityTile.js      |  61 ++--
 src/components/views/rooms/EventTile.js       | 147 ++++----
 .../views/rooms/LinkPreviewWidget.js          |  48 +--
 .../views/rooms/MemberDeviceInfo.js           |  16 +-
 src/components/views/rooms/MemberInfo.js      | 201 ++++++-----
 src/components/views/rooms/MemberList.js      |  77 ++---
 src/components/views/rooms/MemberTile.js      |  34 +-
 src/components/views/rooms/MessageComposer.js |  38 +--
 .../views/rooms/MessageComposerInput.js       |  13 +-
 src/components/views/rooms/PresenceLabel.js   |  29 +-
 .../views/rooms/ReadReceiptMarker.js          |  32 +-
 src/components/views/rooms/RoomList.js        | 271 +++++++--------
 src/components/views/rooms/RoomNameEditor.js  |  22 +-
 src/components/views/rooms/RoomPreviewBar.js  |  66 ++--
 src/components/views/rooms/RoomSettings.js    | 279 ++++++++-------
 src/components/views/rooms/RoomTile.js        |  99 +++---
 src/components/views/rooms/RoomTopicEditor.js |  14 +-
 .../views/rooms/SearchResultTile.js           |  26 +-
 .../views/rooms/SearchableEntityList.js       |  57 ++--
 .../views/rooms/TopUnreadMessagesBar.js       |   8 +-
 src/components/views/rooms/UserTile.js        |  32 +-
 .../views/settings/AddPhoneNumber.js          |  22 +-
 src/components/views/settings/ChangeAvatar.js |  50 +--
 .../views/settings/ChangeDisplayName.js       |  19 +-
 .../views/settings/ChangePassword.js          |  20 +-
 src/components/views/settings/DevicesPanel.js |  20 +-
 .../views/settings/DevicesPanelEntry.js       |  16 +-
 .../settings/EnableNotificationsButton.js     |  14 +-
 src/languageHandler.js                        |  32 +-
 src/linkify-matrix.js                         |  75 ++--
 src/ratelimitedfunc.js                        |  12 +-
 src/utils/DecryptFile.js                      |   6 +-
 src/utils/Receipt.js                          |   6 +-
 test/all-tests.js                             |   2 +-
 .../structures/MessagePanel-test.js           |  74 ++--
 .../components/structures/ScrollPanel-test.js |  54 +--
 .../structures/TimelinePanel-test.js          | 116 +++----
 test/components/stub-component.js             |   6 +-
 .../dialogs/InteractiveAuthDialog-test.js     |  20 +-
 .../elements/MemberEventListSummary-test.js   |  74 ++--
 .../views/rooms/MessageComposerInput-test.js  |   2 +-
 test/mock-clock.js                            |  64 ++--
 test/skinned-sdk.js                           |   8 +-
 test/test-utils.js                            |  37 +-
 136 files changed, 2540 insertions(+), 2657 deletions(-)

diff --git a/src/CallHandler.js b/src/CallHandler.js
index 8331d579df..a9539d40e1 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -63,23 +63,22 @@ import dis from './dispatcher';
 global.mxCalls = {
     //room_id: MatrixCall
 };
-var calls = global.mxCalls;
-var ConferenceHandler = null;
+const calls = global.mxCalls;
+let ConferenceHandler = null;
 
-var audioPromises = {};
+const audioPromises = {};
 
 function play(audioId) {
     // TODO: Attach an invisible element for this instead
     // which listens?
-    var audio = document.getElementById(audioId);
+    const audio = document.getElementById(audioId);
     if (audio) {
         if (audioPromises[audioId]) {
             audioPromises[audioId] = audioPromises[audioId].then(()=>{
                 audio.load();
                 return audio.play();
             });
-        }
-        else {
+        } else {
             audioPromises[audioId] = audio.play();
         }
     }
@@ -88,12 +87,11 @@ function play(audioId) {
 function pause(audioId) {
     // TODO: Attach an invisible element for this instead
     // which listens?
-    var audio = document.getElementById(audioId);
+    const audio = document.getElementById(audioId);
     if (audio) {
         if (audioPromises[audioId]) {
             audioPromises[audioId] = audioPromises[audioId].then(()=>audio.pause());
-        }
-        else {
+        } else {
             // pause doesn't actually return a promise, but might as well do this for symmetry with play();
             audioPromises[audioId] = audio.pause();
         }
@@ -125,38 +123,32 @@ function _setCallListeners(call) {
         if (newState === "ringing") {
             _setCallState(call, call.roomId, "ringing");
             pause("ringbackAudio");
-        }
-        else if (newState === "invite_sent") {
+        } else if (newState === "invite_sent") {
             _setCallState(call, call.roomId, "ringback");
             play("ringbackAudio");
-        }
-        else if (newState === "ended" && oldState === "connected") {
+        } else if (newState === "ended" && oldState === "connected") {
             _setCallState(undefined, call.roomId, "ended");
             pause("ringbackAudio");
             play("callendAudio");
-        }
-        else if (newState === "ended" && oldState === "invite_sent" &&
+        } else if (newState === "ended" && oldState === "invite_sent" &&
                 (call.hangupParty === "remote" ||
                 (call.hangupParty === "local" && call.hangupReason === "invite_timeout")
                 )) {
             _setCallState(call, call.roomId, "busy");
             pause("ringbackAudio");
             play("busyAudio");
-            var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             Modal.createTrackedDialog('Call Handler', 'Call Timeout', ErrorDialog, {
                 title: _t('Call Timeout'),
                 description: _t('The remote side failed to pick up') + '.',
             });
-        }
-        else if (oldState === "invite_sent") {
+        } else if (oldState === "invite_sent") {
             _setCallState(call, call.roomId, "stop_ringback");
             pause("ringbackAudio");
-        }
-        else if (oldState === "ringing") {
+        } else if (oldState === "ringing") {
             _setCallState(call, call.roomId, "stop_ringing");
             pause("ringbackAudio");
-        }
-        else if (newState === "connected") {
+        } else if (newState === "connected") {
             _setCallState(call, call.roomId, "connected");
             pause("ringbackAudio");
         }
@@ -165,14 +157,13 @@ function _setCallListeners(call) {
 
 function _setCallState(call, roomId, status) {
     console.log(
-        "Call state in %s changed to %s (%s)", roomId, status, (call ? call.call_state : "-")
+        "Call state in %s changed to %s (%s)", roomId, status, (call ? call.call_state : "-"),
     );
     calls[roomId] = call;
 
     if (status === "ringing") {
         play("ringAudio");
-    }
-    else if (call && call.call_state === "ringing") {
+    } else if (call && call.call_state === "ringing") {
         pause("ringAudio");
     }
 
@@ -192,14 +183,12 @@ function _onAction(payload) {
         _setCallState(newCall, newCall.roomId, "ringback");
         if (payload.type === 'voice') {
             newCall.placeVoiceCall();
-        }
-        else if (payload.type === 'video') {
+        } else if (payload.type === 'video') {
             newCall.placeVideoCall(
                 payload.remote_element,
-                payload.local_element
+                payload.local_element,
             );
-        }
-        else if (payload.type === 'screensharing') {
+        } else if (payload.type === 'screensharing') {
             const screenCapErrorString = PlatformPeg.get().screenCaptureErrorString();
             if (screenCapErrorString) {
                 _setCallState(undefined, newCall.roomId, "ended");
@@ -213,10 +202,9 @@ function _onAction(payload) {
             }
             newCall.placeScreenSharingCall(
                 payload.remote_element,
-                payload.local_element
+                payload.local_element,
             );
-        }
-        else {
+        } else {
             console.error("Unknown conf call type: %s", payload.type);
         }
     }
@@ -255,21 +243,19 @@ function _onAction(payload) {
                     description: _t('You cannot place a call with yourself.'),
                 });
                 return;
-            }
-            else if (members.length === 2) {
+            } else if (members.length === 2) {
                 console.log("Place %s call in %s", payload.type, payload.room_id);
                 const call = Matrix.createNewMatrixCall(MatrixClientPeg.get(), payload.room_id, {
                     forceTURN: UserSettingsStore.getLocalSetting('webRtcForceTURN', false),
                 });
                 placeCall(call);
-            }
-            else { // > 2
+            } else { // > 2
                 dis.dispatch({
                     action: "place_conference_call",
                     room_id: payload.room_id,
                     type: payload.type,
                     remote_element: payload.remote_element,
-                    local_element: payload.local_element
+                    local_element: payload.local_element,
                 });
             }
             break;
@@ -280,15 +266,13 @@ function _onAction(payload) {
                 Modal.createTrackedDialog('Call Handler', 'Conference call unsupported client', ErrorDialog, {
                     description: _t('Conference calls are not supported in this client'),
                 });
-            }
-            else if (!MatrixClientPeg.get().supportsVoip()) {
+            } else if (!MatrixClientPeg.get().supportsVoip()) {
                 const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                 Modal.createTrackedDialog('Call Handler', 'VoIP is unsupported', ErrorDialog, {
                     title: _t('VoIP is unsupported'),
                     description: _t('You cannot place VoIP calls in this browser.'),
                 });
-            }
-            else if (MatrixClientPeg.get().isRoomEncrypted(payload.room_id)) {
+            } else if (MatrixClientPeg.get().isRoomEncrypted(payload.room_id)) {
                 // Conference calls are implemented by sending the media to central
                 // server which combines the audio from all the participants together
                 // into a single stream. This is incompatible with end-to-end encryption
@@ -299,16 +283,15 @@ function _onAction(payload) {
                 Modal.createTrackedDialog('Call Handler', 'Conference calls unsupported e2e', ErrorDialog, {
                     description: _t('Conference calls are not supported in encrypted rooms'),
                 });
-            }
-            else {
-                var QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
+            } else {
+                const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
                 Modal.createTrackedDialog('Call Handler', 'Conference calling in development', QuestionDialog, {
                     title: _t('Warning!'),
                     description: _t('Conference calling is in development and may not be reliable.'),
-                    onFinished: confirm=>{
+                    onFinished: (confirm)=>{
                         if (confirm) {
                             ConferenceHandler.createNewMatrixCall(
-                                MatrixClientPeg.get(), payload.room_id
+                                MatrixClientPeg.get(), payload.room_id,
                             ).done(function(call) {
                                 placeCall(call);
                             }, function(err) {
@@ -357,7 +340,7 @@ function _onAction(payload) {
             _setCallState(calls[payload.room_id], payload.room_id, "connected");
             dis.dispatch({
                 action: "view_room",
-                room_id: payload.room_id
+                room_id: payload.room_id,
             });
             break;
     }
@@ -368,9 +351,9 @@ if (!global.mxCallHandler) {
     dis.register(_onAction);
 }
 
-var callHandler = {
+const callHandler = {
     getCallForRoom: function(roomId) {
-        var call = module.exports.getCall(roomId);
+        let call = module.exports.getCall(roomId);
         if (call) return call;
 
         if (ConferenceHandler) {
@@ -386,8 +369,8 @@ var callHandler = {
     },
 
     getAnyActiveCall: function() {
-        var roomsWithCalls = Object.keys(calls);
-        for (var i = 0; i < roomsWithCalls.length; i++) {
+        const roomsWithCalls = Object.keys(calls);
+        for (let i = 0; i < roomsWithCalls.length; i++) {
             if (calls[roomsWithCalls[i]] &&
                     calls[roomsWithCalls[i]].call_state !== "ended") {
                 return calls[roomsWithCalls[i]];
@@ -402,7 +385,7 @@ var callHandler = {
 
     getConferenceHandler: function() {
         return ConferenceHandler;
-    }
+    },
 };
 // Only things in here which actually need to be global are the
 // calls list (done separately) and making sure we only register
diff --git a/src/ContentMessages.js b/src/ContentMessages.js
index 93057fafed..00728061a2 100644
--- a/src/ContentMessages.js
+++ b/src/ContentMessages.js
@@ -17,14 +17,14 @@ limitations under the License.
 'use strict';
 
 import Promise from 'bluebird';
-var extend = require('./extend');
-var dis = require('./dispatcher');
-var MatrixClientPeg = require('./MatrixClientPeg');
-var sdk = require('./index');
+const extend = require('./extend');
+const dis = require('./dispatcher');
+const MatrixClientPeg = require('./MatrixClientPeg');
+const sdk = require('./index');
 import { _t } from './languageHandler';
-var Modal = require('./Modal');
+const Modal = require('./Modal');
 
-var encrypt = require("browser-encrypt-attachment");
+const encrypt = require("browser-encrypt-attachment");
 
 // Polyfill for Canvas.toBlob API using Canvas.toDataURL
 require("blueimp-canvas-to-blob");
@@ -54,8 +54,8 @@ const MAX_HEIGHT = 600;
 function createThumbnail(element, inputWidth, inputHeight, mimeType) {
     const deferred = Promise.defer();
 
-    var targetWidth = inputWidth;
-    var targetHeight = inputHeight;
+    let targetWidth = inputWidth;
+    let targetHeight = inputHeight;
     if (targetHeight > MAX_HEIGHT) {
         targetWidth = Math.floor(targetWidth * (MAX_HEIGHT / targetHeight));
         targetHeight = MAX_HEIGHT;
@@ -81,7 +81,7 @@ function createThumbnail(element, inputWidth, inputHeight, mimeType) {
                 w: inputWidth,
                 h: inputHeight,
             },
-            thumbnail: thumbnail
+            thumbnail: thumbnail,
         });
     }, mimeType);
 
@@ -129,12 +129,12 @@ function loadImageElement(imageFile) {
  * @return {Promise} A promise that resolves with the attachment info.
  */
 function infoForImageFile(matrixClient, roomId, imageFile) {
-    var thumbnailType = "image/png";
+    let thumbnailType = "image/png";
     if (imageFile.type == "image/jpeg") {
         thumbnailType = "image/jpeg";
     }
 
-    var imageInfo;
+    let imageInfo;
     return loadImageElement(imageFile).then(function(img) {
         return createThumbnail(img, img.width, img.height, thumbnailType);
     }).then(function(result) {
@@ -191,7 +191,7 @@ function loadVideoElement(videoFile) {
 function infoForVideoFile(matrixClient, roomId, videoFile) {
     const thumbnailType = "image/jpeg";
 
-    var videoInfo;
+    let videoInfo;
     return loadVideoElement(videoFile).then(function(video) {
         return createThumbnail(video, video.videoWidth, video.videoHeight, thumbnailType);
     }).then(function(result) {
@@ -286,7 +286,7 @@ class ContentMessages {
             body: file.name || 'Attachment',
             info: {
                 size: file.size,
-            }
+            },
         };
 
         // if we have a mime type for the file, add it to the message metadata
@@ -297,10 +297,10 @@ class ContentMessages {
         const def = Promise.defer();
         if (file.type.indexOf('image/') == 0) {
             content.msgtype = 'm.image';
-            infoForImageFile(matrixClient, roomId, file).then(imageInfo=>{
+            infoForImageFile(matrixClient, roomId, file).then((imageInfo)=>{
                 extend(content.info, imageInfo);
                 def.resolve();
-            }, error=>{
+            }, (error)=>{
                 console.error(error);
                 content.msgtype = 'm.file';
                 def.resolve();
@@ -310,10 +310,10 @@ class ContentMessages {
             def.resolve();
         } else if (file.type.indexOf('video/') == 0) {
             content.msgtype = 'm.video';
-            infoForVideoFile(matrixClient, roomId, file).then(videoInfo=>{
+            infoForVideoFile(matrixClient, roomId, file).then((videoInfo)=>{
                 extend(content.info, videoInfo);
                 def.resolve();
-            }, error=>{
+            }, (error)=>{
                 content.msgtype = 'm.file';
                 def.resolve();
             });
@@ -331,7 +331,7 @@ class ContentMessages {
         this.inprogress.push(upload);
         dis.dispatch({action: 'upload_started'});
 
-        var error;
+        let error;
 
         function onProgress(ev) {
             upload.total = ev.total;
@@ -355,11 +355,11 @@ class ContentMessages {
         }, function(err) {
             error = err;
             if (!upload.canceled) {
-                var desc = _t('The file \'%(fileName)s\' failed to upload', {fileName: upload.fileName}) + '.';
+                let desc = _t('The file \'%(fileName)s\' failed to upload', {fileName: upload.fileName}) + '.';
                 if (err.http_status == 413) {
                     desc = _t('The file \'%(fileName)s\' exceeds this home server\'s size limit for uploads', {fileName: upload.fileName});
                 }
-                var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+                const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                 Modal.createTrackedDialog('Upload failed', '', ErrorDialog, {
                     title: _t('Upload Failed'),
                     description: desc,
@@ -367,8 +367,8 @@ class ContentMessages {
             }
         }).finally(() => {
             const inprogressKeys = Object.keys(this.inprogress);
-            for (var i = 0; i < this.inprogress.length; ++i) {
-                var k = inprogressKeys[i];
+            for (let i = 0; i < this.inprogress.length; ++i) {
+                const k = inprogressKeys[i];
                 if (this.inprogress[k].promise === upload.promise) {
                     this.inprogress.splice(k, 1);
                     break;
@@ -376,8 +376,7 @@ class ContentMessages {
             }
             if (error) {
                 dis.dispatch({action: 'upload_failed', upload: upload});
-            }
-            else {
+            } else {
                 dis.dispatch({action: 'upload_finished', upload: upload});
             }
         });
@@ -389,9 +388,9 @@ class ContentMessages {
 
     cancelUpload(promise) {
         const inprogressKeys = Object.keys(this.inprogress);
-        var upload;
-        for (var i = 0; i < this.inprogress.length; ++i) {
-            var k = inprogressKeys[i];
+        let upload;
+        for (let i = 0; i < this.inprogress.length; ++i) {
+            const k = inprogressKeys[i];
             if (this.inprogress[k].promise === promise) {
                 upload = this.inprogress[k];
                 break;
diff --git a/src/HtmlUtils.js b/src/HtmlUtils.js
index ee2bcd2b0f..5620bc06df 100644
--- a/src/HtmlUtils.js
+++ b/src/HtmlUtils.js
@@ -17,10 +17,10 @@ limitations under the License.
 
 'use strict';
 
-var React = require('react');
-var sanitizeHtml = require('sanitize-html');
-var highlight = require('highlight.js');
-var linkifyMatrix = require('./linkify-matrix');
+const React = require('react');
+const sanitizeHtml = require('sanitize-html');
+const highlight = require('highlight.js');
+const linkifyMatrix = require('./linkify-matrix');
 import escape from 'lodash/escape';
 import emojione from 'emojione';
 import classNames from 'classnames';
@@ -66,8 +66,7 @@ function unicodeToImage(str) {
         if ( (typeof unicodeChar === 'undefined') || (unicodeChar === '') || (!(unicodeChar in emojione.jsEscapeMap)) ) {
             // if the unicodeChar doesnt exist just return the entire match
             return unicodeChar;
-        }
-        else {
+        } else {
             // get the unicode codepoint from the actual char
             unicode = emojione.jsEscapeMap[unicodeChar];
 
@@ -183,21 +182,19 @@ const sanitizeHtmlParams = {
             if (attribs.href) {
                 attribs.target = '_blank'; // by default
 
-                var m;
+                let m;
                 // FIXME: horrible duplication with linkify-matrix
                 m = attribs.href.match(linkifyMatrix.VECTOR_URL_PATTERN);
                 if (m) {
                     attribs.href = m[1];
                     delete attribs.target;
-                }
-                else {
+                } else {
                     m = attribs.href.match(linkifyMatrix.MATRIXTO_URL_PATTERN);
                     if (m) {
-                        var entity = m[1];
+                        const entity = m[1];
                         if (entity[0] === '@') {
                             attribs.href = '#/user/' + entity;
-                        }
-                        else if (entity[0] === '#' || entity[0] === '!') {
+                        } else if (entity[0] === '#' || entity[0] === '!') {
                             attribs.href = '#/room/' + entity;
                         }
                         delete attribs.target;
@@ -205,7 +202,7 @@ const sanitizeHtmlParams = {
                 }
             }
             attribs.rel = 'noopener'; // https://mathiasbynens.github.io/rel-noopener/
-            return { tagName: tagName, attribs : attribs };
+            return { tagName: tagName, attribs: attribs };
         },
         'img': function(tagName, attribs) {
             // Strip out imgs that aren't `mxc` here instead of using allowedSchemesByTag
@@ -224,7 +221,7 @@ const sanitizeHtmlParams = {
         'code': function(tagName, attribs) {
             if (typeof attribs.class !== 'undefined') {
                 // Filter out all classes other than ones starting with language- for syntax highlighting.
-                let classes = attribs.class.split(/\s+/).filter(function(cl) {
+                const classes = attribs.class.split(/\s+/).filter(function(cl) {
                     return cl.startsWith('language-');
                 });
                 attribs.class = classes.join(' ');
@@ -287,11 +284,11 @@ class BaseHighlighter {
      * TextHighlighter).
      */
     applyHighlights(safeSnippet, safeHighlights) {
-        var lastOffset = 0;
-        var offset;
-        var nodes = [];
+        let lastOffset = 0;
+        let offset;
+        let nodes = [];
 
-        var safeHighlight = safeHighlights[0];
+        const safeHighlight = safeHighlights[0];
         while ((offset = safeSnippet.toLowerCase().indexOf(safeHighlight.toLowerCase(), lastOffset)) >= 0) {
             // handle preamble
             if (offset > lastOffset) {
@@ -301,7 +298,7 @@ class BaseHighlighter {
 
             // do highlight. use the original string rather than safeHighlight
             // to preserve the original casing.
-            var endOffset = offset + safeHighlight.length;
+            const endOffset = offset + safeHighlight.length;
             nodes.push(this._processSnippet(safeSnippet.substring(offset, endOffset), true));
 
             lastOffset = endOffset;
@@ -319,8 +316,7 @@ class BaseHighlighter {
         if (safeHighlights[1]) {
             // recurse into this range to check for the next set of highlight matches
             return this.applyHighlights(safeSnippet, safeHighlights.slice(1));
-        }
-        else {
+        } else {
             // no more highlights to be found, just return the unhighlighted string
             return [this._processSnippet(safeSnippet, false)];
         }
@@ -341,7 +337,7 @@ class HtmlHighlighter extends BaseHighlighter {
             return snippet;
         }
 
-        var span = "<span class=\""+this.highlightClass+"\">"
+        let span = "<span class=\""+this.highlightClass+"\">"
             + snippet + "</span>";
 
         if (this.highlightLink) {
@@ -366,15 +362,15 @@ class TextHighlighter extends BaseHighlighter {
      * returns a React node
      */
     _processSnippet(snippet, highlight) {
-        var key = this._key++;
+        const key = this._key++;
 
-        var node =
-            <span key={key} className={highlight ? this.highlightClass : null }>
+        let node =
+            <span key={key} className={highlight ? this.highlightClass : null}>
                 { snippet }
             </span>;
 
         if (highlight && this.highlightLink) {
-            node = <a key={key} href={this.highlightLink}>{node}</a>;
+            node = <a key={key} href={this.highlightLink}>{ node }</a>;
         }
 
         return node;
@@ -393,20 +389,20 @@ class TextHighlighter extends BaseHighlighter {
 export function bodyToHtml(content, highlights, opts) {
     opts = opts || {};
 
-    var isHtml = (content.format === "org.matrix.custom.html");
-    let body = isHtml ? content.formatted_body : escape(content.body);
+    const isHtml = (content.format === "org.matrix.custom.html");
+    const body = isHtml ? content.formatted_body : escape(content.body);
 
     let bodyHasEmoji = false;
 
-    var safeBody;
+    let safeBody;
     // XXX: We sanitize the HTML whilst also highlighting its text nodes, to avoid accidentally trying
     // to highlight HTML tags themselves.  However, this does mean that we don't highlight textnodes which
     // are interrupted by HTML tags (not that we did before) - e.g. foo<span/>bar won't get highlighted
     // by an attempt to search for 'foobar'.  Then again, the search query probably wouldn't work either
     try {
         if (highlights && highlights.length > 0) {
-            var highlighter = new HtmlHighlighter("mx_EventTile_searchHighlight", opts.highlightLink);
-            var safeHighlights = highlights.map(function(highlight) {
+            const highlighter = new HtmlHighlighter("mx_EventTile_searchHighlight", opts.highlightLink);
+            const safeHighlights = highlights.map(function(highlight) {
                 return sanitizeHtml(highlight, sanitizeHtmlParams);
             });
             // XXX: hacky bodge to temporarily apply a textFilter to the sanitizeHtmlParams structure.
@@ -417,16 +413,15 @@ export function bodyToHtml(content, highlights, opts) {
         safeBody = sanitizeHtml(body, sanitizeHtmlParams);
         bodyHasEmoji = containsEmoji(body);
         if (bodyHasEmoji) safeBody = unicodeToImage(safeBody);
-    }
-    finally {
+    } finally {
         delete sanitizeHtmlParams.textFilter;
     }
 
     let emojiBody = false;
     if (bodyHasEmoji) {
         EMOJI_REGEX.lastIndex = 0;
-        let contentBodyTrimmed = content.body !== undefined ? content.body.trim() : '';
-        let match = EMOJI_REGEX.exec(contentBodyTrimmed);
+        const contentBodyTrimmed = content.body !== undefined ? content.body.trim() : '';
+        const match = EMOJI_REGEX.exec(contentBodyTrimmed);
         emojiBody = match && match[0] && match[0].length === contentBodyTrimmed.length;
     }
 
diff --git a/src/ImageUtils.js b/src/ImageUtils.js
index 3744241874..a83d94a633 100644
--- a/src/ImageUtils.js
+++ b/src/ImageUtils.js
@@ -42,13 +42,12 @@ module.exports = {
             // no scaling needs to be applied
             return fullHeight;
         }
-        var widthMulti = thumbWidth / fullWidth;
-        var heightMulti = thumbHeight / fullHeight;
+        const widthMulti = thumbWidth / fullWidth;
+        const heightMulti = thumbHeight / fullHeight;
         if (widthMulti < heightMulti) {
             // width is the dominant dimension so scaling will be fixed on that
             return Math.floor(widthMulti * fullHeight);
-        }
-        else {
+        } else {
             // height is the dominant dimension so scaling will be fixed on that
             return Math.floor(heightMulti * fullHeight);
         }
diff --git a/src/Login.js b/src/Login.js
index 049b79c2f4..0eff94ce60 100644
--- a/src/Login.js
+++ b/src/Login.js
@@ -59,8 +59,8 @@ export default class Login {
     }
 
     getFlows() {
-        var self = this;
-        var client = this._createTemporaryClient();
+        const self = this;
+        const client = this._createTemporaryClient();
         return client.loginFlows().then(function(result) {
             self._flows = result.flows;
             self._currentFlowIndex = 0;
@@ -77,12 +77,12 @@ export default class Login {
     getCurrentFlowStep() {
         // technically the flow can have multiple steps, but no one does this
         // for login so we can ignore it.
-        var flowStep = this._flows[this._currentFlowIndex];
+        const flowStep = this._flows[this._currentFlowIndex];
         return flowStep ? flowStep.type : null;
     }
 
     loginAsGuest() {
-        var client = this._createTemporaryClient();
+        const client = this._createTemporaryClient();
         return client.registerGuest({
             body: {
                 initial_device_display_name: this._defaultDeviceDisplayName,
@@ -94,7 +94,7 @@ export default class Login {
                 accessToken: creds.access_token,
                 homeserverUrl: this._hsUrl,
                 identityServerUrl: this._isUrl,
-                guest: true
+                guest: true,
             };
         }, (error) => {
             throw error;
@@ -149,12 +149,12 @@ export default class Login {
                 identityServerUrl: self._isUrl,
                 userId: data.user_id,
                 deviceId: data.device_id,
-                accessToken: data.access_token
+                accessToken: data.access_token,
             });
         }, function(error) {
             if (error.httpStatus === 403) {
                 if (self._fallbackHsUrl) {
-                    var fbClient = Matrix.createClient({
+                    const fbClient = Matrix.createClient({
                         baseUrl: self._fallbackHsUrl,
                         idBaseUrl: this._isUrl,
                     });
@@ -165,7 +165,7 @@ export default class Login {
                             identityServerUrl: self._isUrl,
                             userId: data.user_id,
                             deviceId: data.device_id,
-                            accessToken: data.access_token
+                            accessToken: data.access_token,
                         });
                     }, function(fallback_error) {
                         // throw the original error
diff --git a/src/Markdown.js b/src/Markdown.js
index 455d5e95bd..e05f163ba5 100644
--- a/src/Markdown.js
+++ b/src/Markdown.js
@@ -48,7 +48,7 @@ function html_if_tag_allowed(node) {
  * or false if it is only a single line.
  */
 function is_multi_line(node) {
-    var par = node;
+    let par = node;
     while (par.parent) {
         par = par.parent;
     }
@@ -143,7 +143,7 @@ export default class Markdown {
             if (isMultiLine) this.cr();
             html_if_tag_allowed.call(this, node);
             if (isMultiLine) this.cr();
-        }
+        };
 
         return renderer.render(this.parsed);
     }
@@ -178,7 +178,7 @@ export default class Markdown {
         renderer.html_block = function(node) {
             this.lit(node.literal);
             if (is_multi_line(node) && node.next) this.lit('\n\n');
-        }
+        };
 
         return renderer.render(this.parsed);
     }
diff --git a/src/MatrixClientPeg.js b/src/MatrixClientPeg.js
index 4264828c7b..0c3d5b3775 100644
--- a/src/MatrixClientPeg.js
+++ b/src/MatrixClientPeg.js
@@ -95,7 +95,7 @@ class MatrixClientPeg {
         opts.pendingEventOrdering = "detached";
 
         try {
-            let promise = this.matrixClient.store.startup();
+            const promise = this.matrixClient.store.startup();
             console.log(`MatrixClientPeg: waiting for MatrixClient store to initialise`);
             await promise;
         } catch(err) {
@@ -136,7 +136,7 @@ class MatrixClientPeg {
     }
 
     _createClient(creds: MatrixClientCreds) {
-        var opts = {
+        const opts = {
             baseUrl: creds.homeserverUrl,
             idBaseUrl: creds.identityServerUrl,
             accessToken: creds.accessToken,
@@ -153,8 +153,8 @@ class MatrixClientPeg {
 
         this.matrixClient.setGuest(Boolean(creds.guest));
 
-        var notifTimelineSet = new EventTimelineSet(null, {
-            timelineSupport: true
+        const notifTimelineSet = new EventTimelineSet(null, {
+            timelineSupport: true,
         });
         // XXX: what is our initial pagination token?! it somehow needs to be synchronised with /sync.
         notifTimelineSet.getLiveTimeline().setPaginationToken("", EventTimeline.BACKWARDS);
diff --git a/src/Modal.js b/src/Modal.js
index 056b6d8bf2..68d75d1ff1 100644
--- a/src/Modal.js
+++ b/src/Modal.js
@@ -17,8 +17,8 @@ limitations under the License.
 
 'use strict';
 
-var React = require('react');
-var ReactDOM = require('react-dom');
+const React = require('react');
+const ReactDOM = require('react-dom');
 import Analytics from './Analytics';
 import sdk from './index';
 
@@ -137,15 +137,15 @@ class ModalManager {
      * @param {String} className   CSS class to apply to the modal wrapper
      */
     createDialogAsync(loader, props, className) {
-        var self = this;
+        const self = this;
         const modal = {};
 
         // never call this from onFinished() otherwise it will loop
         //
         // nb explicit function() rather than arrow function, to get `arguments`
-        var closeDialog = function() {
+        const closeDialog = function() {
             if (props && props.onFinished) props.onFinished.apply(null, arguments);
-            var i = self._modals.indexOf(modal);
+            const i = self._modals.indexOf(modal);
             if (i >= 0) {
                 self._modals.splice(i, 1);
             }
@@ -160,7 +160,7 @@ class ModalManager {
         // property set here so you can't close the dialog from a button click!
         modal.elem = (
             <AsyncWrapper key={modalCount} loader={loader} {...props}
-                onFinished={closeDialog}/>
+                onFinished={closeDialog} />
         );
         modal.onFinished = props ? props.onFinished : null;
         modal.className = className;
@@ -191,13 +191,13 @@ class ModalManager {
             return;
         }
 
-        var modal = this._modals[0];
-        var dialog = (
-            <div className={"mx_Dialog_wrapper " + (modal.className ? modal.className : '') }>
+        const modal = this._modals[0];
+        const dialog = (
+            <div className={"mx_Dialog_wrapper " + (modal.className ? modal.className : '')}>
                 <div className="mx_Dialog">
-                    {modal.elem}
+                    { modal.elem }
                 </div>
-                <div className="mx_Dialog_background" onClick={ this.closeAll }></div>
+                <div className="mx_Dialog_background" onClick={this.closeAll}></div>
             </div>
         );
 
diff --git a/src/Notifier.js b/src/Notifier.js
index 155564dcdf..a2e80353e1 100644
--- a/src/Notifier.js
+++ b/src/Notifier.js
@@ -81,7 +81,7 @@ const Notifier = {
         }
 
         const avatarUrl = ev.sender ? Avatar.avatarUrlForMember(
-            ev.sender, 40, 40, 'crop'
+            ev.sender, 40, 40, 'crop',
         ) : null;
 
         const notif = plaf.displayNotification(title, msg, avatarUrl, room);
@@ -303,7 +303,7 @@ const Notifier = {
                 this._playAudioNotification(ev, room);
             }
         }
-    }
+    },
 };
 
 if (!global.mxNotifier) {
diff --git a/src/Presence.js b/src/Presence.js
index c45d571217..fab518e1cb 100644
--- a/src/Presence.js
+++ b/src/Presence.js
@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-var MatrixClientPeg = require("./MatrixClientPeg");
-var dis = require("./dispatcher");
+const MatrixClientPeg = require("./MatrixClientPeg");
+const dis = require("./dispatcher");
 
  // Time in ms after that a user is considered as unavailable/away
-var UNAVAILABLE_TIME_MS = 3 * 60 * 1000; // 3 mins
-var PRESENCE_STATES = ["online", "offline", "unavailable"];
+const UNAVAILABLE_TIME_MS = 3 * 60 * 1000; // 3 mins
+const PRESENCE_STATES = ["online", "offline", "unavailable"];
 
 class Presence {
 
@@ -71,14 +71,14 @@ class Presence {
         if (!this.running) {
             return;
         }
-        var old_state = this.state;
+        const old_state = this.state;
         this.state = newState;
 
         if (MatrixClientPeg.get().isGuest()) {
             return; // don't try to set presence when a guest; it won't work.
         }
 
-        var self = this;
+        const self = this;
         MatrixClientPeg.get().setPresence(this.state).done(function() {
             console.log("Presence: %s", newState);
         }, function(err) {
@@ -104,7 +104,7 @@ class Presence {
      * @private
      */
     _resetTimer() {
-        var self = this;
+        const self = this;
         this.setState("online");
         // Re-arm the timer
         clearTimeout(this.timer);
diff --git a/src/RichText.js b/src/RichText.js
index cbd3b9ae18..4bc3815d25 100644
--- a/src/RichText.js
+++ b/src/RichText.js
@@ -44,9 +44,9 @@ export const contentStateToHTML = (contentState: ContentState) => {
     return stateToHTML(contentState, {
         inlineStyles: {
             UNDERLINE: {
-                element: 'u'
-            }
-        }
+                element: 'u',
+            },
+        },
     });
 };
 
@@ -59,7 +59,7 @@ function unicodeToEmojiUri(str) {
     let replaceWith, unicode, alt;
     if ((!emojione.unicodeAlt) || (emojione.sprites)) {
         // if we are using the shortname as the alt tag then we need a reversed array to map unicode code point to shortnames
-        let mappedUnicode = emojione.mapUnicodeToShort();
+        const mappedUnicode = emojione.mapUnicodeToShort();
     }
 
     str = str.replace(emojione.regUnicode, function(unicodeChar) {
@@ -90,14 +90,14 @@ function findWithRegex(regex, contentBlock: ContentBlock, callback: (start: numb
 }
 
 // Workaround for https://github.com/facebook/draft-js/issues/414
-let emojiDecorator = {
+const emojiDecorator = {
     strategy: (contentState, contentBlock, callback) => {
         findWithRegex(EMOJI_REGEX, contentBlock, callback);
     },
     component: (props) => {
-        let uri = unicodeToEmojiUri(props.children[0].props.text);
-        let shortname = emojione.toShort(props.children[0].props.text);
-        let style = {
+        const uri = unicodeToEmojiUri(props.children[0].props.text);
+        const shortname = emojione.toShort(props.children[0].props.text);
+        const style = {
             display: 'inline-block',
             width: '1em',
             maxHeight: '1em',
@@ -106,7 +106,7 @@ let emojiDecorator = {
             backgroundPosition: 'center center',
             overflow: 'hidden',
         };
-        return (<span title={shortname} style={style}><span style={{opacity: 0}}>{props.children}</span></span>);
+        return (<span title={shortname} style={style}><span style={{opacity: 0}}>{ props.children }</span></span>);
     },
 };
 
@@ -118,16 +118,16 @@ export function getScopedRTDecorators(scope: any): CompositeDecorator {
 }
 
 export function getScopedMDDecorators(scope: any): CompositeDecorator {
-    let markdownDecorators = ['HR', 'BOLD', 'ITALIC', 'CODE', 'STRIKETHROUGH'].map(
+    const markdownDecorators = ['HR', 'BOLD', 'ITALIC', 'CODE', 'STRIKETHROUGH'].map(
         (style) => ({
             strategy: (contentState, contentBlock, callback) => {
                 return findWithRegex(MARKDOWN_REGEX[style], contentBlock, callback);
             },
             component: (props) => (
                 <span className={"mx_MarkdownElement mx_Markdown_" + style}>
-                    {props.children}
+                    { props.children }
                 </span>
-            )
+            ),
         }));
 
     markdownDecorators.push({
@@ -136,9 +136,9 @@ export function getScopedMDDecorators(scope: any): CompositeDecorator {
         },
         component: (props) => (
             <a href="#" className="mx_MarkdownElement mx_Markdown_LINK">
-                {props.children}
+                { props.children }
             </a>
-        )
+        ),
     });
     // markdownDecorators.push(emojiDecorator);
     // TODO Consider renabling "syntax highlighting" when we can do it properly
@@ -161,7 +161,7 @@ export function modifyText(contentState: ContentState, rangeToReplace: Selection
     for (let currentKey = startKey;
             currentKey && currentKey !== endKey;
             currentKey = contentState.getKeyAfter(currentKey)) {
-        let blockText = getText(currentKey);
+        const blockText = getText(currentKey);
         text += blockText.substring(startOffset, blockText.length);
 
         // from now on, we'll take whole blocks
@@ -182,7 +182,7 @@ export function modifyText(contentState: ContentState, rangeToReplace: Selection
 export function selectionStateToTextOffsets(selectionState: SelectionState,
                                             contentBlocks: Array<ContentBlock>): {start: number, end: number} {
     let offset = 0, start = 0, end = 0;
-    for (let block of contentBlocks) {
+    for (const block of contentBlocks) {
         if (selectionState.getStartKey() === block.getKey()) {
             start = offset + selectionState.getStartOffset();
         }
@@ -259,7 +259,7 @@ export function attachImmutableEntitiesToEmoji(editorState: EditorState): Editor
                 .set('focusOffset', end);
             const emojiText = plainText.substring(start, end);
             newContentState = newContentState.createEntity(
-                'emoji', 'IMMUTABLE', { emojiUnicode: emojiText }
+                'emoji', 'IMMUTABLE', { emojiUnicode: emojiText },
             );
             const entityKey = newContentState.getLastCreatedEntityKey();
             newContentState = Modifier.replaceText(
diff --git a/src/Rooms.js b/src/Rooms.js
index 2e3f4457f0..6cc2d867a6 100644
--- a/src/Rooms.js
+++ b/src/Rooms.js
@@ -62,8 +62,7 @@ export function isConfCallRoom(room, me, conferenceHandler) {
 
 export function looksLikeDirectMessageRoom(room, me) {
     if (me.membership == "join" || me.membership === "ban" ||
-        (me.membership === "leave" && me.events.member.getSender() !== me.events.member.getStateKey()))
-    {
+        (me.membership === "leave" && me.events.member.getSender() !== me.events.member.getStateKey())) {
         // Used to split rooms via tags
         const tagNames = Object.keys(room.tags);
         // Used for 1:1 direct chats
diff --git a/src/ScalarAuthClient.js b/src/ScalarAuthClient.js
index 0b753cf3ab..c9d056f88e 100644
--- a/src/ScalarAuthClient.js
+++ b/src/ScalarAuthClient.js
@@ -15,10 +15,10 @@ limitations under the License.
 */
 
 import Promise from 'bluebird';
-var request = require('browser-request');
+const request = require('browser-request');
 
-var SdkConfig = require('./SdkConfig');
-var MatrixClientPeg = require('./MatrixClientPeg');
+const SdkConfig = require('./SdkConfig');
+const MatrixClientPeg = require('./MatrixClientPeg');
 
 class ScalarAuthClient {
 
@@ -38,7 +38,7 @@ class ScalarAuthClient {
 
     // Returns a scalar_token string
     getScalarToken() {
-        var tok = window.localStorage.getItem("mx_scalar_token");
+        const tok = window.localStorage.getItem("mx_scalar_token");
         if (tok) return Promise.resolve(tok);
 
         // No saved token, so do the dance to get one. First, we
@@ -53,9 +53,9 @@ class ScalarAuthClient {
     }
 
     exchangeForScalarToken(openid_token_object) {
-        var defer = Promise.defer();
+        const defer = Promise.defer();
 
-        var scalar_rest_url = SdkConfig.get().integrations_rest_url;
+        const scalar_rest_url = SdkConfig.get().integrations_rest_url;
         request({
             method: 'POST',
             uri: scalar_rest_url+'/register',
@@ -77,7 +77,7 @@ class ScalarAuthClient {
     }
 
     getScalarInterfaceUrlForRoom(roomId, screen, id) {
-        var url = SdkConfig.get().integrations_ui_url;
+        let url = SdkConfig.get().integrations_ui_url;
         url += "?scalar_token=" + encodeURIComponent(this.scalarToken);
         url += "&room_id=" + encodeURIComponent(roomId);
         if (id) {
diff --git a/src/ScalarMessaging.js b/src/ScalarMessaging.js
index d14d439d66..7698829647 100644
--- a/src/ScalarMessaging.js
+++ b/src/ScalarMessaging.js
@@ -356,12 +356,12 @@ function getWidgets(event, roomId) {
     }
     const stateEvents = room.currentState.getStateEvents("im.vector.modular.widgets");
     // Only return widgets which have required fields
-    let widgetStateEvents = [];
+    const widgetStateEvents = [];
     stateEvents.forEach((ev) => {
         if (ev.getContent().type && ev.getContent().url) {
             widgetStateEvents.push(ev.event); // return the raw event
         }
-    })
+    });
 
     sendResponse(event, widgetStateEvents);
 }
@@ -376,7 +376,7 @@ function setPlumbingState(event, roomId, status) {
         sendError(event, _t('You need to be logged in.'));
         return;
     }
-    client.sendStateEvent(roomId, "m.room.plumbing", { status : status }).done(() => {
+    client.sendStateEvent(roomId, "m.room.plumbing", { status: status }).done(() => {
         sendResponse(event, {
             success: true,
         });
@@ -415,11 +415,11 @@ function setBotPower(event, roomId, userId, level) {
     }
 
     client.getStateEvent(roomId, "m.room.power_levels", "").then((powerLevels) => {
-        let powerEvent = new MatrixEvent(
+        const powerEvent = new MatrixEvent(
             {
                 type: "m.room.power_levels",
                 content: powerLevels,
-            }
+            },
         );
 
         client.setPowerLevel(roomId, userId, level, powerEvent).done(() => {
@@ -485,8 +485,7 @@ function canSendEvent(event, roomId) {
     let canSend = false;
     if (isState) {
         canSend = room.currentState.maySendStateEvent(evType, me);
-    }
-    else {
+    } else {
         canSend = room.currentState.maySendEvent(evType, me);
     }
 
@@ -517,8 +516,8 @@ function returnStateEvent(event, roomId, eventType, stateKey) {
     sendResponse(event, stateEvent.getContent());
 }
 
-var currentRoomId = null;
-var currentRoomAlias = null;
+let currentRoomId = null;
+let currentRoomAlias = null;
 
 // Listen for when a room is viewed
 dis.register(onAction);
@@ -542,7 +541,7 @@ const onMessage = function(event) {
     //
     // All strings start with the empty string, so for sanity return if the length
     // of the event origin is 0.
-    let url = SdkConfig.get().integrations_ui_url;
+    const url = SdkConfig.get().integrations_ui_url;
     if (event.origin.length === 0 || !url.startsWith(event.origin) || !event.data.action) {
         return; // don't log this - debugging APIs like to spam postMessage which floods the log otherwise
     }
@@ -647,7 +646,7 @@ module.exports = {
             // Make an error so we get a stack trace
             const e = new Error(
                 "ScalarMessaging: mismatched startListening / stopListening detected." +
-                " Negative count"
+                " Negative count",
             );
             console.error(e);
         }
diff --git a/src/Tinter.js b/src/Tinter.js
index 5bf13e6d4a..6b23df8c9b 100644
--- a/src/Tinter.js
+++ b/src/Tinter.js
@@ -18,10 +18,10 @@ limitations under the License.
 // module.exports otherwise this will break when included by both
 // react-sdk and apps layered on top.
 
-var DEBUG = 0;
+const DEBUG = 0;
 
 // The colour keys to be replaced as referred to in CSS
-var keyRgb = [
+const keyRgb = [
     "rgb(118, 207, 166)", // Vector Green
     "rgb(234, 245, 240)", // Vector Light Green
     "rgb(211, 239, 225)", // BottomLeftMenu overlay (20% Vector Green)
@@ -35,7 +35,7 @@ var keyRgb = [
 // x = (255 - 234) / (255 - 118) = 0.16
 
 // The colour keys to be replaced as referred to in SVGs
-var keyHex = [
+const keyHex = [
     "#76CFA6", // Vector Green
     "#EAF5F0", // Vector Light Green
     "#D3EFE1", // BottomLeftMenu overlay (20% Vector Green overlaid on Vector Light Green)
@@ -44,14 +44,14 @@ var keyHex = [
 
 // cache of our replacement colours
 // defaults to our keys.
-var colors = [
+const colors = [
     keyHex[0],
     keyHex[1],
     keyHex[2],
     keyHex[3],
 ];
 
-var cssFixups = [
+const cssFixups = [
     // {
     //     style: a style object that should be fixed up taken from a stylesheet
     //     attr: name of the attribute to be clobbered, e.g. 'color'
@@ -60,7 +60,7 @@ var cssFixups = [
 ];
 
 // CSS attributes to be fixed up
-var cssAttrs = [
+const cssAttrs = [
     "color",
     "backgroundColor",
     "borderColor",
@@ -69,17 +69,17 @@ var cssAttrs = [
     "borderLeftColor",
 ];
 
-var svgAttrs = [
+const svgAttrs = [
     "fill",
     "stroke",
 ];
 
-var cached = false;
+let cached = false;
 
 function calcCssFixups() {
     if (DEBUG) console.log("calcSvgFixups start");
-    for (var i = 0; i < document.styleSheets.length; i++) {
-        var ss = document.styleSheets[i];
+    for (let i = 0; i < document.styleSheets.length; i++) {
+        const ss = document.styleSheets[i];
         if (!ss) continue; // well done safari >:(
         // Chromium apparently sometimes returns null here; unsure why.
         // see $14534907369972FRXBx:matrix.org in HQ
@@ -104,12 +104,12 @@ function calcCssFixups() {
         if (ss.href && !ss.href.match(/\/bundle.*\.css$/)) continue;
 
         if (!ss.cssRules) continue;
-        for (var j = 0; j < ss.cssRules.length; j++) {
-            var rule = ss.cssRules[j];
+        for (let j = 0; j < ss.cssRules.length; j++) {
+            const rule = ss.cssRules[j];
             if (!rule.style) continue;
-            for (var k = 0; k < cssAttrs.length; k++) {
-                var attr = cssAttrs[k];
-                for (var l = 0; l < keyRgb.length; l++) {
+            for (let k = 0; k < cssAttrs.length; k++) {
+                const attr = cssAttrs[k];
+                for (let l = 0; l < keyRgb.length; l++) {
                     if (rule.style[attr] === keyRgb[l]) {
                         cssFixups.push({
                             style: rule.style,
@@ -126,8 +126,8 @@ function calcCssFixups() {
 
 function applyCssFixups() {
     if (DEBUG) console.log("applyCssFixups start");
-    for (var i = 0; i < cssFixups.length; i++) {
-        var cssFixup = cssFixups[i];
+    for (let i = 0; i < cssFixups.length; i++) {
+        const cssFixup = cssFixups[i];
         cssFixup.style[cssFixup.attr] = colors[cssFixup.index];
     }
     if (DEBUG) console.log("applyCssFixups end");
@@ -140,15 +140,15 @@ function hexToRgb(color) {
                 color[1] + color[1] +
                 color[2] + color[2];
     }
-    var val = parseInt(color, 16);
-    var r = (val >> 16) & 255;
-    var g = (val >> 8) & 255;
-    var b = val & 255;
+    const val = parseInt(color, 16);
+    const r = (val >> 16) & 255;
+    const g = (val >> 8) & 255;
+    const b = val & 255;
     return [r, g, b];
 }
 
 function rgbToHex(rgb) {
-    var val = (rgb[0] << 16) | (rgb[1] << 8) | rgb[2];
+    const val = (rgb[0] << 16) | (rgb[1] << 8) | rgb[2];
     return '#' + (0x1000000 + val).toString(16).slice(1);
 }
 
@@ -167,12 +167,11 @@ module.exports = {
      *
      * @param {Function} tintable Function to call when the tint changes.
      */
-    registerTintable : function(tintable) {
+    registerTintable: function(tintable) {
         tintables.push(tintable);
     },
 
     tint: function(primaryColor, secondaryColor, tertiaryColor) {
-
         if (!cached) {
             calcCssFixups();
             cached = true;
@@ -185,7 +184,7 @@ module.exports = {
 
         if (!secondaryColor) {
             const x = 0.16; // average weighting factor calculated from vector green & light green
-            var rgb = hexToRgb(primaryColor);
+            const rgb = hexToRgb(primaryColor);
             rgb[0] = x * rgb[0] + (1 - x) * 255;
             rgb[1] = x * rgb[1] + (1 - x) * 255;
             rgb[2] = x * rgb[2] + (1 - x) * 255;
@@ -194,8 +193,8 @@ module.exports = {
 
         if (!tertiaryColor) {
             const x = 0.19;
-            var rgb1 = hexToRgb(primaryColor);
-            var rgb2 = hexToRgb(secondaryColor);
+            const rgb1 = hexToRgb(primaryColor);
+            const rgb2 = hexToRgb(secondaryColor);
             rgb1[0] = x * rgb1[0] + (1 - x) * rgb2[0];
             rgb1[1] = x * rgb1[1] + (1 - x) * rgb2[1];
             rgb1[2] = x * rgb1[2] + (1 - x) * rgb2[2];
@@ -204,8 +203,7 @@ module.exports = {
 
         if (colors[0] === primaryColor &&
             colors[1] === secondaryColor &&
-            colors[2] === tertiaryColor)
-        {
+            colors[2] === tertiaryColor) {
             return;
         }
 
@@ -248,14 +246,13 @@ module.exports = {
         // key colour; cache the element and apply.
 
         if (DEBUG) console.log("calcSvgFixups start for " + svgs);
-        var fixups = [];
-        for (var i = 0; i < svgs.length; i++) {
+        const fixups = [];
+        for (let i = 0; i < svgs.length; i++) {
             var svgDoc;
             try {
                 svgDoc = svgs[i].contentDocument;
-            }
-            catch(e) {
-                var msg = 'Failed to get svg.contentDocument of ' + svgs[i].toString();
+            } catch(e) {
+                let msg = 'Failed to get svg.contentDocument of ' + svgs[i].toString();
                 if (e.message) {
                     msg += e.message;
                 }
@@ -265,12 +262,12 @@ module.exports = {
                 console.error(e);
             }
             if (!svgDoc) continue;
-            var tags = svgDoc.getElementsByTagName("*");
-            for (var j = 0; j < tags.length; j++) {
-                var tag = tags[j];
-                for (var k = 0; k < svgAttrs.length; k++) {
-                    var attr = svgAttrs[k];
-                    for (var l = 0; l < keyHex.length; l++) {
+            const tags = svgDoc.getElementsByTagName("*");
+            for (let j = 0; j < tags.length; j++) {
+                const tag = tags[j];
+                for (let k = 0; k < svgAttrs.length; k++) {
+                    const attr = svgAttrs[k];
+                    for (let l = 0; l < keyHex.length; l++) {
                         if (tag.getAttribute(attr) && tag.getAttribute(attr).toUpperCase() === keyHex[l]) {
                             fixups.push({
                                 node: tag,
@@ -289,10 +286,10 @@ module.exports = {
 
     applySvgFixups: function(fixups) {
         if (DEBUG) console.log("applySvgFixups start for " + fixups);
-        for (var i = 0; i < fixups.length; i++) {
-            var svgFixup = fixups[i];
+        for (let i = 0; i < fixups.length; i++) {
+            const svgFixup = fixups[i];
             svgFixup.node.setAttribute(svgFixup.attr, colors[svgFixup.index]);
         }
         if (DEBUG) console.log("applySvgFixups end");
-    }
+    },
 };
diff --git a/src/Unread.js b/src/Unread.js
index 8fffc2a429..20e876ad88 100644
--- a/src/Unread.js
+++ b/src/Unread.js
@@ -14,10 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-var MatrixClientPeg = require('./MatrixClientPeg');
+const MatrixClientPeg = require('./MatrixClientPeg');
 import UserSettingsStore from './UserSettingsStore';
 import shouldHideEvent from './shouldHideEvent';
-var sdk = require('./index');
+const sdk = require('./index');
 
 module.exports = {
     /**
@@ -34,17 +34,17 @@ module.exports = {
         } else if (ev.getType == 'm.room.message' && ev.getContent().msgtype == 'm.notify') {
             return false;
         }
-        var EventTile = sdk.getComponent('rooms.EventTile');
+        const EventTile = sdk.getComponent('rooms.EventTile');
         return EventTile.haveTileForEvent(ev);
     },
 
     doesRoomHaveUnreadMessages: function(room) {
-        var myUserId = MatrixClientPeg.get().credentials.userId;
+        const myUserId = MatrixClientPeg.get().credentials.userId;
 
         // get the most recent read receipt sent by our account.
         // N.B. this is NOT a read marker (RM, aka "read up to marker"),
         // despite the name of the method :((
-        var readUpToId = room.getEventReadUpTo(myUserId);
+        const readUpToId = room.getEventReadUpTo(myUserId);
 
         // as we don't send RRs for our own messages, make sure we special case that
         // if *we* sent the last message into the room, we consider it not unread!
@@ -54,8 +54,7 @@ module.exports = {
         //             https://github.com/vector-im/riot-web/issues/3363
         if (room.timeline.length &&
             room.timeline[room.timeline.length - 1].sender &&
-            room.timeline[room.timeline.length - 1].sender.userId === myUserId)
-        {
+            room.timeline[room.timeline.length - 1].sender.userId === myUserId) {
             return false;
         }
 
@@ -67,8 +66,8 @@ module.exports = {
 
         const syncedSettings = UserSettingsStore.getSyncedSettings();
         // Loop through messages, starting with the most recent...
-        for (var i = room.timeline.length - 1; i >= 0; --i) {
-            var ev = room.timeline[i];
+        for (let i = room.timeline.length - 1; i >= 0; --i) {
+            const ev = room.timeline[i];
 
             if (ev.getId() == readUpToId) {
                 // If we've read up to this event, there's nothing more recents
@@ -86,5 +85,5 @@ module.exports = {
         // is unread on the theory that false positives are better than
         // false negatives here.
         return true;
-    }
+    },
 };
diff --git a/src/Velociraptor.js b/src/Velociraptor.js
index 9c85bafca0..9a674d4f09 100644
--- a/src/Velociraptor.js
+++ b/src/Velociraptor.js
@@ -1,6 +1,6 @@
-var React = require('react');
-var ReactDom = require('react-dom');
-var Velocity = require('velocity-vector');
+const React = require('react');
+const ReactDom = require('react-dom');
+const Velocity = require('velocity-vector');
 
 /**
  * The Velociraptor contains components and animates transitions with velocity.
@@ -46,13 +46,13 @@ module.exports = React.createClass({
      * update `this.children` according to the new list of children given
      */
     _updateChildren: function(newChildren) {
-        var self = this;
-        var oldChildren = this.children || {};
+        const self = this;
+        const oldChildren = this.children || {};
         this.children = {};
         React.Children.toArray(newChildren).forEach(function(c) {
             if (oldChildren[c.key]) {
-                var old = oldChildren[c.key];
-                var oldNode = ReactDom.findDOMNode(self.nodes[old.key]);
+                const old = oldChildren[c.key];
+                const oldNode = ReactDom.findDOMNode(self.nodes[old.key]);
 
                 if (oldNode && oldNode.style.left != c.props.style.left) {
                     Velocity(oldNode, { left: c.props.style.left }, self.props.transition).then(function() {
@@ -71,18 +71,18 @@ module.exports = React.createClass({
             } else {
                 // new element. If we have a startStyle, use that as the style and go through
                 // the enter animations
-                var newProps = {};
-                var restingStyle = c.props.style;
+                const newProps = {};
+                const restingStyle = c.props.style;
 
-                var startStyles = self.props.startStyles;
+                const startStyles = self.props.startStyles;
                 if (startStyles.length > 0) {
-                    var startStyle = startStyles[0];
+                    const startStyle = startStyles[0];
                     newProps.style = startStyle;
                     // console.log("mounted@startstyle0: "+JSON.stringify(startStyle));
                 }
 
-                newProps.ref = (n => self._collectNode(
-                    c.key, n, restingStyle
+                newProps.ref = ((n) => self._collectNode(
+                    c.key, n, restingStyle,
                 ));
 
                 self.children[c.key] = React.cloneElement(c, newProps);
@@ -103,8 +103,8 @@ module.exports = React.createClass({
             this.nodes[k] === undefined &&
             this.props.startStyles.length > 0
         ) {
-            var startStyles = this.props.startStyles;
-            var transitionOpts = this.props.enterTransitionOpts;
+            const startStyles = this.props.startStyles;
+            const transitionOpts = this.props.enterTransitionOpts;
             const domNode = ReactDom.findDOMNode(node);
             // start from startStyle 1: 0 is the one we gave it
             // to start with, so now we animate 1 etc.
@@ -154,7 +154,7 @@ module.exports = React.createClass({
     render: function() {
         return (
             <span>
-                {Object.values(this.children)}
+                { Object.values(this.children) }
             </span>
         );
     },
diff --git a/src/VelocityBounce.js b/src/VelocityBounce.js
index 3ad7d207a9..2141b05325 100644
--- a/src/VelocityBounce.js
+++ b/src/VelocityBounce.js
@@ -1,9 +1,9 @@
-var Velocity = require('velocity-vector');
+const Velocity = require('velocity-vector');
 
 // courtesy of https://github.com/julianshapiro/velocity/issues/283
 // We only use easeOutBounce (easeInBounce is just sort of nonsensical)
 function bounce( p ) {
-    var pow2,
+    let pow2,
         bounce = 4;
 
     while ( p < ( ( pow2 = Math.pow( 2, --bounce ) ) - 1 ) / 11 ) {
diff --git a/src/WhoIsTyping.js b/src/WhoIsTyping.js
index 2a12703a27..6bea2cbb92 100644
--- a/src/WhoIsTyping.js
+++ b/src/WhoIsTyping.js
@@ -14,19 +14,19 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-var MatrixClientPeg = require("./MatrixClientPeg");
+const MatrixClientPeg = require("./MatrixClientPeg");
 import { _t } from './languageHandler';
 
 module.exports = {
     usersTypingApartFromMeAndIgnored: function(room) {
         return this.usersTyping(
-            room, [MatrixClientPeg.get().credentials.userId].concat(MatrixClientPeg.get().getIgnoredUsers())
+            room, [MatrixClientPeg.get().credentials.userId].concat(MatrixClientPeg.get().getIgnoredUsers()),
         );
     },
 
     usersTypingApartFromMe: function(room) {
         return this.usersTyping(
-            room, [MatrixClientPeg.get().credentials.userId]
+            room, [MatrixClientPeg.get().credentials.userId],
         );
     },
 
@@ -35,15 +35,15 @@ module.exports = {
      * to exclude, return a list of user objects who are typing.
      */
     usersTyping: function(room, exclude) {
-        var whoIsTyping = [];
+        const whoIsTyping = [];
 
         if (exclude === undefined) {
             exclude = [];
         }
 
-        var memberKeys = Object.keys(room.currentState.members);
-        for (var i = 0; i < memberKeys.length; ++i) {
-            var userId = memberKeys[i];
+        const memberKeys = Object.keys(room.currentState.members);
+        for (let i = 0; i < memberKeys.length; ++i) {
+            const userId = memberKeys[i];
 
             if (room.currentState.members[userId].typing) {
                 if (exclude.indexOf(userId) == -1) {
@@ -76,5 +76,5 @@ module.exports = {
             const lastPerson = names.pop();
             return _t('%(names)s and %(lastPerson)s are typing', {names: names.join(', '), lastPerson: lastPerson});
         }
-    }
+    },
 };
diff --git a/src/async-components/views/dialogs/EncryptedEventDialog.js b/src/async-components/views/dialogs/EncryptedEventDialog.js
index cec2f05de2..a8f588d39a 100644
--- a/src/async-components/views/dialogs/EncryptedEventDialog.js
+++ b/src/async-components/views/dialogs/EncryptedEventDialog.js
@@ -14,10 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-var React = require("react");
+const React = require("react");
 import { _t } from '../../../languageHandler';
-var sdk = require('../../../index');
-var MatrixClientPeg = require("../../../MatrixClientPeg");
+const sdk = require('../../../index');
+const MatrixClientPeg = require("../../../MatrixClientPeg");
 
 module.exports = React.createClass({
     displayName: 'EncryptedEventDialog',
@@ -33,7 +33,7 @@ module.exports = React.createClass({
 
     componentWillMount: function() {
         this._unmounted = false;
-        var client = MatrixClientPeg.get();
+        const client = MatrixClientPeg.get();
 
         // first try to load the device from our store.
         //
@@ -60,7 +60,7 @@ module.exports = React.createClass({
 
     componentWillUnmount: function() {
         this._unmounted = true;
-        var client = MatrixClientPeg.get();
+        const client = MatrixClientPeg.get();
         if (client) {
             client.removeListener("deviceVerificationChanged", this.onDeviceVerificationChanged);
         }
@@ -89,12 +89,12 @@ module.exports = React.createClass({
     },
 
     _renderDeviceInfo: function() {
-        var device = this.state.device;
+        const device = this.state.device;
         if (!device) {
             return (<i>{ _t('unknown device') }</i>);
         }
 
-        var verificationStatus = (<b>{ _t('NOT verified') }</b>);
+        let verificationStatus = (<b>{ _t('NOT verified') }</b>);
         if (device.isBlocked()) {
             verificationStatus = (<b>{ _t('Blacklisted') }</b>);
         } else if (device.isVerified()) {
@@ -118,7 +118,7 @@ module.exports = React.createClass({
                     </tr>
                     <tr>
                         <td>{ _t('Ed25519 fingerprint') }</td>
-                        <td><code>{device.getFingerprint()}</code></td>
+                        <td><code>{ device.getFingerprint() }</code></td>
                     </tr>
                 </tbody>
             </table>
@@ -126,7 +126,7 @@ module.exports = React.createClass({
     },
 
     _renderEventInfo: function() {
-        var event = this.props.event;
+        const event = this.props.event;
 
         return (
             <table>
@@ -165,36 +165,36 @@ module.exports = React.createClass({
     },
 
     render: function() {
-        var DeviceVerifyButtons = sdk.getComponent('elements.DeviceVerifyButtons');
+        const DeviceVerifyButtons = sdk.getComponent('elements.DeviceVerifyButtons');
 
-        var buttons = null;
+        let buttons = null;
         if (this.state.device) {
             buttons = (
-                <DeviceVerifyButtons device={ this.state.device }
-                    userId={ this.props.event.getSender() }
+                <DeviceVerifyButtons device={this.state.device}
+                    userId={this.props.event.getSender()}
                 />
             );
         }
 
         return (
-            <div className="mx_EncryptedEventDialog" onKeyDown={ this.onKeyDown }>
+            <div className="mx_EncryptedEventDialog" onKeyDown={this.onKeyDown}>
                 <div className="mx_Dialog_title">
                     { _t('End-to-end encryption information') }
                 </div>
                 <div className="mx_Dialog_content">
                     <h4>{ _t('Event information') }</h4>
-                    {this._renderEventInfo()}
+                    { this._renderEventInfo() }
 
                     <h4>{ _t('Sender device information') }</h4>
-                    {this._renderDeviceInfo()}
+                    { this._renderDeviceInfo() }
                 </div>
                 <div className="mx_Dialog_buttons">
-                    <button className="mx_Dialog_primary" onClick={ this.props.onFinished } autoFocus={ true }>
+                    <button className="mx_Dialog_primary" onClick={this.props.onFinished} autoFocus={true}>
                         { _t('OK') }
                     </button>
-                    {buttons}
+                    { buttons }
                 </div>
             </div>
         );
-    }
+    },
 });
diff --git a/src/autocomplete/Autocompleter.js b/src/autocomplete/Autocompleter.js
index 7a64fb154c..5b10110f04 100644
--- a/src/autocomplete/Autocompleter.js
+++ b/src/autocomplete/Autocompleter.js
@@ -45,7 +45,7 @@ const PROVIDERS = [
     EmojiProvider,
     CommandProvider,
     DuckDuckGoProvider,
-].map(completer => completer.getInstance());
+].map((completer) => completer.getInstance());
 
 // Providers will get rejected if they take longer than this.
 const PROVIDER_COMPLETION_TIMEOUT = 3000;
diff --git a/src/autocomplete/Components.js b/src/autocomplete/Components.js
index 0f0399cf7d..a27533f7c2 100644
--- a/src/autocomplete/Components.js
+++ b/src/autocomplete/Components.js
@@ -30,13 +30,13 @@ export class TextualCompletion extends React.Component {
             subtitle,
             description,
             className,
-            ...restProps,
+            ...restProps
         } = this.props;
         return (
             <div className={classNames('mx_Autocomplete_Completion_block', className)} {...restProps}>
-                <span className="mx_Autocomplete_Completion_title">{title}</span>
-                <span className="mx_Autocomplete_Completion_subtitle">{subtitle}</span>
-                <span className="mx_Autocomplete_Completion_description">{description}</span>
+                <span className="mx_Autocomplete_Completion_title">{ title }</span>
+                <span className="mx_Autocomplete_Completion_subtitle">{ subtitle }</span>
+                <span className="mx_Autocomplete_Completion_description">{ description }</span>
             </div>
         );
     }
@@ -56,14 +56,14 @@ export class PillCompletion extends React.Component {
             description,
             initialComponent,
             className,
-            ...restProps,
+            ...restProps
         } = this.props;
         return (
             <div className={classNames('mx_Autocomplete_Completion_pill', className)} {...restProps}>
-                {initialComponent}
-                <span className="mx_Autocomplete_Completion_title">{title}</span>
-                <span className="mx_Autocomplete_Completion_subtitle">{subtitle}</span>
-                <span className="mx_Autocomplete_Completion_description">{description}</span>
+                { initialComponent }
+                <span className="mx_Autocomplete_Completion_title">{ title }</span>
+                <span className="mx_Autocomplete_Completion_subtitle">{ subtitle }</span>
+                <span className="mx_Autocomplete_Completion_description">{ description }</span>
             </div>
         );
     }
diff --git a/src/autocomplete/DuckDuckGoProvider.js b/src/autocomplete/DuckDuckGoProvider.js
index 9c996bb1cc..b2e85c4668 100644
--- a/src/autocomplete/DuckDuckGoProvider.js
+++ b/src/autocomplete/DuckDuckGoProvider.js
@@ -38,7 +38,7 @@ export default class DuckDuckGoProvider extends AutocompleteProvider {
     }
 
     async getCompletions(query: string, selection: {start: number, end: number}) {
-        let {command, range} = this.getCurrentCommand(query, selection);
+        const {command, range} = this.getCurrentCommand(query, selection);
         if (!query || !command) {
             return [];
         }
@@ -47,7 +47,7 @@ export default class DuckDuckGoProvider extends AutocompleteProvider {
             method: 'GET',
         });
         const json = await response.json();
-        let results = json.Results.map(result => {
+        const results = json.Results.map((result) => {
             return {
                 completion: result.Text,
                 component: (
@@ -105,7 +105,7 @@ export default class DuckDuckGoProvider extends AutocompleteProvider {
 
     renderCompletions(completions: [React.Component]): ?React.Component {
         return <div className="mx_Autocomplete_Completion_container_block">
-            {completions}
+            { completions }
         </div>;
     }
 }
diff --git a/src/autocomplete/EmojiProvider.js b/src/autocomplete/EmojiProvider.js
index 35a2ee6b53..a5b80e3b0e 100644
--- a/src/autocomplete/EmojiProvider.js
+++ b/src/autocomplete/EmojiProvider.js
@@ -138,7 +138,7 @@ export default class EmojiProvider extends AutocompleteProvider {
                 return {
                     completion: unicode,
                     component: (
-                        <PillCompletion title={shortname} initialComponent={<EmojiText style={{maxWidth: '1em'}}>{unicode}</EmojiText>} />
+                        <PillCompletion title={shortname} initialComponent={<EmojiText style={{maxWidth: '1em'}}>{ unicode }</EmojiText>} />
                     ),
                     range,
                 };
@@ -152,14 +152,13 @@ export default class EmojiProvider extends AutocompleteProvider {
     }
 
     static getInstance() {
-        if (instance == null)
-            {instance = new EmojiProvider();}
+        if (instance == null) {instance = new EmojiProvider();}
         return instance;
     }
 
     renderCompletions(completions: [React.Component]): ?React.Component {
         return <div className="mx_Autocomplete_Completion_container_pill">
-            {completions}
+            { completions }
         </div>;
     }
 }
diff --git a/src/autocomplete/UserProvider.js b/src/autocomplete/UserProvider.js
index 26b30a3d27..296399c06c 100644
--- a/src/autocomplete/UserProvider.js
+++ b/src/autocomplete/UserProvider.js
@@ -59,7 +59,7 @@ export default class UserProvider extends AutocompleteProvider {
         if (this.users === null) this._makeUsers();
 
         let completions = [];
-        let {command, range} = this.getCurrentCommand(query, selection, force);
+        const {command, range} = this.getCurrentCommand(query, selection, force);
         if (command) {
             completions = this.matcher.match(command[0]).map((user) => {
                 const displayName = (user.name || user.userId || '').replace(' (IRC)', ''); // FIXME when groups are done
@@ -71,7 +71,7 @@ export default class UserProvider extends AutocompleteProvider {
                     href: 'https://matrix.to/#/' + user.userId,
                     component: (
                         <PillCompletion
-                            initialComponent={<MemberAvatar member={user} width={24} height={24}/>}
+                            initialComponent={<MemberAvatar member={user} width={24} height={24} />}
                             title={displayName}
                             description={user.userId} />
                     ),
@@ -132,7 +132,7 @@ export default class UserProvider extends AutocompleteProvider {
 
     renderCompletions(completions: [React.Component]): ?React.Component {
         return <div className="mx_Autocomplete_Completion_container_pill mx_Autocomplete_Completion_container_truncate">
-            {completions}
+            { completions }
         </div>;
     }
 
diff --git a/src/components/structures/ContextualMenu.js b/src/components/structures/ContextualMenu.js
index e5a62b8345..c3ad7f9cd1 100644
--- a/src/components/structures/ContextualMenu.js
+++ b/src/components/structures/ContextualMenu.js
@@ -17,9 +17,9 @@ limitations under the License.
 
 'use strict';
 
-var classNames = require('classnames');
-var React = require('react');
-var ReactDOM = require('react-dom');
+const classNames = require('classnames');
+const React = require('react');
+const ReactDOM = require('react-dom');
 
 // Shamelessly ripped off Modal.js.  There's probably a better way
 // of doing reusable widgets like dialog boxes & menus where we go and
@@ -36,7 +36,7 @@ module.exports = {
     },
 
     getOrCreateContainer: function() {
-        var container = document.getElementById(this.ContextualMenuContainerId);
+        let container = document.getElementById(this.ContextualMenuContainerId);
 
         if (!container) {
             container = document.createElement("div");
@@ -48,9 +48,9 @@ module.exports = {
     },
 
     createMenu: function(Element, props) {
-        var self = this;
+        const self = this;
 
-        var closeMenu = function() {
+        const closeMenu = function() {
             ReactDOM.unmountComponentAtNode(self.getOrCreateContainer());
 
             if (props && props.onFinished) {
@@ -58,17 +58,17 @@ module.exports = {
             }
         };
 
-        var position = {
+        const position = {
             top: props.top,
         };
 
-        var chevronOffset = {};
+        const chevronOffset = {};
         if (props.chevronOffset) {
             chevronOffset.top = props.chevronOffset;
         }
 
         // To override the default chevron colour, if it's been set
-        var chevronCSS = "";
+        let chevronCSS = "";
         if (props.menuColour) {
             chevronCSS = `
                 .mx_ContextualMenu_chevron_left:after {
@@ -81,7 +81,7 @@ module.exports = {
             `;
         }
 
-        var chevron = null;
+        let chevron = null;
         if (props.left) {
             chevron = <div style={chevronOffset} className="mx_ContextualMenu_chevron_left"></div>;
             position.left = props.left;
@@ -90,15 +90,15 @@ module.exports = {
             position.right = props.right;
         }
 
-        var className = 'mx_ContextualMenu_wrapper';
+        const className = 'mx_ContextualMenu_wrapper';
 
-        var menuClasses = classNames({
+        const menuClasses = classNames({
             'mx_ContextualMenu': true,
             'mx_ContextualMenu_left': props.left,
             'mx_ContextualMenu_right': !props.left,
         });
 
-        var menuStyle = {};
+        const menuStyle = {};
         if (props.menuWidth) {
             menuStyle.width = props.menuWidth;
         }
@@ -113,14 +113,14 @@ module.exports = {
 
         // FIXME: If a menu uses getDefaultProps it clobbers the onFinished
         // property set here so you can't close the menu from a button click!
-        var menu = (
+        const menu = (
             <div className={className} style={position}>
                 <div className={menuClasses} style={menuStyle}>
-                    {chevron}
-                    <Element {...props} onFinished={closeMenu}/>
+                    { chevron }
+                    <Element {...props} onFinished={closeMenu} />
                 </div>
                 <div className="mx_ContextualMenu_background" onClick={closeMenu}></div>
-                <style>{chevronCSS}</style>
+                <style>{ chevronCSS }</style>
             </div>
         );
 
diff --git a/src/components/structures/CreateRoom.js b/src/components/structures/CreateRoom.js
index 7ecc315ba7..26454c5ea6 100644
--- a/src/components/structures/CreateRoom.js
+++ b/src/components/structures/CreateRoom.js
@@ -61,7 +61,7 @@ module.exports = React.createClass({
     },
 
     onCreateRoom: function() {
-        var options = {};
+        const options = {};
 
         if (this.state.room_name) {
             options.name = this.state.room_name;
@@ -79,14 +79,14 @@ module.exports = React.createClass({
                     {
                         type: "m.room.join_rules",
                         content: {
-                            "join_rule": this.state.is_private ? "invite" : "public"
-                        }
+                            "join_rule": this.state.is_private ? "invite" : "public",
+                        },
                     },
                     {
                         type: "m.room.history_visibility",
                         content: {
-                            "history_visibility": this.state.share_history ? "shared" : "invited"
-                        }
+                            "history_visibility": this.state.share_history ? "shared" : "invited",
+                        },
                     },
                 ];
             }
@@ -94,19 +94,19 @@ module.exports = React.createClass({
 
         options.invite = this.state.invited_users;
 
-        var alias = this.getAliasLocalpart();
+        const alias = this.getAliasLocalpart();
         if (alias) {
             options.room_alias_name = alias;
         }
 
-        var cli = MatrixClientPeg.get();
+        const cli = MatrixClientPeg.get();
         if (!cli) {
             // TODO: Error.
             console.error("Cannot create room: No matrix client.");
             return;
         }
 
-        var deferred = cli.createRoom(options);
+        const deferred = cli.createRoom(options);
 
         if (this.state.encrypt) {
             // TODO
@@ -116,7 +116,7 @@ module.exports = React.createClass({
             phase: this.phases.CREATING,
         });
 
-        var self = this;
+        const self = this;
 
         deferred.then(function(resp) {
             self.setState({
@@ -209,7 +209,7 @@ module.exports = React.createClass({
 
     onAliasChanged: function(alias) {
         this.setState({
-            alias: alias
+            alias: alias,
         });
     },
 
@@ -220,64 +220,64 @@ module.exports = React.createClass({
     },
 
     render: function() {
-        var curr_phase = this.state.phase;
+        const curr_phase = this.state.phase;
         if (curr_phase == this.phases.CREATING) {
-            var Loader = sdk.getComponent("elements.Spinner");
+            const Loader = sdk.getComponent("elements.Spinner");
             return (
-                <Loader/>
+                <Loader />
             );
         } else {
-            var error_box = "";
+            let error_box = "";
             if (curr_phase == this.phases.ERROR) {
                 error_box = (
                     <div className="mx_Error">
-                        {_t('An error occurred: %(error_string)s', {error_string: this.state.error_string})}
+                        { _t('An error occurred: %(error_string)s', {error_string: this.state.error_string}) }
                     </div>
                 );
             }
 
-            var CreateRoomButton = sdk.getComponent("create_room.CreateRoomButton");
-            var RoomAlias = sdk.getComponent("create_room.RoomAlias");
-            var Presets = sdk.getComponent("create_room.Presets");
-            var UserSelector = sdk.getComponent("elements.UserSelector");
-            var SimpleRoomHeader = sdk.getComponent("rooms.SimpleRoomHeader");
+            const CreateRoomButton = sdk.getComponent("create_room.CreateRoomButton");
+            const RoomAlias = sdk.getComponent("create_room.RoomAlias");
+            const Presets = sdk.getComponent("create_room.Presets");
+            const UserSelector = sdk.getComponent("elements.UserSelector");
+            const SimpleRoomHeader = sdk.getComponent("rooms.SimpleRoomHeader");
 
-            var domain = MatrixClientPeg.get().getDomain();
+            const domain = MatrixClientPeg.get().getDomain();
 
             return (
             <div className="mx_CreateRoom">
-                <SimpleRoomHeader title={_t("Create Room")} collapsedRhs={ this.props.collapsedRhs }/>
+                <SimpleRoomHeader title={_t("Create Room")} collapsedRhs={this.props.collapsedRhs} />
                 <div className="mx_CreateRoom_body">
-                    <input type="text" ref="room_name" value={this.state.room_name} onChange={this.onNameChange} placeholder={_t('Name')}/> <br />
-                    <textarea className="mx_CreateRoom_description" ref="topic" value={this.state.topic} onChange={this.onTopicChange} placeholder={_t('Topic')}/> <br />
-                    <RoomAlias ref="alias" alias={this.state.alias} homeserver={ domain } onChange={this.onAliasChanged}/> <br />
-                    <UserSelector ref="user_selector" selected_users={this.state.invited_users} onChange={this.onInviteChanged}/> <br />
-                    <Presets ref="presets" onChange={this.onPresetChanged} preset={this.state.preset}/> <br />
+                    <input type="text" ref="room_name" value={this.state.room_name} onChange={this.onNameChange} placeholder={_t('Name')} /> <br />
+                    <textarea className="mx_CreateRoom_description" ref="topic" value={this.state.topic} onChange={this.onTopicChange} placeholder={_t('Topic')} /> <br />
+                    <RoomAlias ref="alias" alias={this.state.alias} homeserver={domain} onChange={this.onAliasChanged} /> <br />
+                    <UserSelector ref="user_selector" selected_users={this.state.invited_users} onChange={this.onInviteChanged} /> <br />
+                    <Presets ref="presets" onChange={this.onPresetChanged} preset={this.state.preset} /> <br />
                     <div>
                         <label>
-                            <input type="checkbox" ref="is_private" checked={this.state.is_private} onChange={this.onPrivateChanged}/>
-                            {_t('Make this room private')}
+                            <input type="checkbox" ref="is_private" checked={this.state.is_private} onChange={this.onPrivateChanged} />
+                            { _t('Make this room private') }
                         </label>
                     </div>
                     <div>
                         <label>
-                            <input type="checkbox" ref="share_history" checked={this.state.share_history} onChange={this.onShareHistoryChanged}/>
-                            {_t('Share message history with new users')}
+                            <input type="checkbox" ref="share_history" checked={this.state.share_history} onChange={this.onShareHistoryChanged} />
+                            { _t('Share message history with new users') }
                         </label>
                     </div>
                     <div className="mx_CreateRoom_encrypt">
                         <label>
-                            <input type="checkbox" ref="encrypt" checked={this.state.encrypt} onChange={this.onEncryptChanged}/>
-                            {_t('Encrypt room')}
+                            <input type="checkbox" ref="encrypt" checked={this.state.encrypt} onChange={this.onEncryptChanged} />
+                            { _t('Encrypt room') }
                         </label>
                     </div>
                     <div>
                         <CreateRoomButton onCreateRoom={this.onCreateRoom} /> <br />
                     </div>
-                    {error_box}
+                    { error_box }
                 </div>
             </div>
             );
         }
-    }
+    },
 });
diff --git a/src/components/structures/FilePanel.js b/src/components/structures/FilePanel.js
index 152d5115f6..6696f3cc0f 100644
--- a/src/components/structures/FilePanel.js
+++ b/src/components/structures/FilePanel.js
@@ -24,7 +24,7 @@ import { _t, _tJsx } from '../../languageHandler';
 /*
  * Component which shows the filtered file using a TimelinePanel
  */
-var FilePanel = React.createClass({
+const FilePanel = React.createClass({
     displayName: 'FilePanel',
 
     propTypes: {
@@ -55,33 +55,33 @@ var FilePanel = React.createClass({
     },
 
     updateTimelineSet: function(roomId) {
-        var client = MatrixClientPeg.get();
-        var room = client.getRoom(roomId);
+        const client = MatrixClientPeg.get();
+        const room = client.getRoom(roomId);
 
         this.noRoom = !room;
 
         if (room) {
-            var filter = new Matrix.Filter(client.credentials.userId);
+            const filter = new Matrix.Filter(client.credentials.userId);
             filter.setDefinition(
                 {
                     "room": {
                         "timeline": {
-                            "contains_url": true
+                            "contains_url": true,
                         },
-                    }
-                }
+                    },
+                },
             );
 
             // FIXME: we shouldn't be doing this every time we change room - see comment above.
             client.getOrCreateFilter("FILTER_FILES_" + client.credentials.userId, filter).then(
                 (filterId)=>{
                     filter.filterId = filterId;
-                    var timelineSet = room.getOrCreateFilteredTimelineSet(filter);
+                    const timelineSet = room.getOrCreateFilteredTimelineSet(filter);
                     this.setState({ timelineSet: timelineSet });
                 },
                 (error)=>{
                     console.error("Failed to get or create file panel filter", error);
-                }
+                },
             );
         } else {
             console.error("Failed to add filtered timelineSet for FilePanel as no room!");
@@ -92,18 +92,18 @@ var FilePanel = React.createClass({
         if (MatrixClientPeg.get().isGuest()) {
             return <div className="mx_FilePanel mx_RoomView_messageListWrapper">
                 <div className="mx_RoomView_empty">
-                {_tJsx("You must <a>register</a> to use this functionality", /<a>(.*?)<\/a>/, (sub) => <a href="#/register" key="sub">{sub}</a>)}
+                { _tJsx("You must <a>register</a> to use this functionality", /<a>(.*?)<\/a>/, (sub) => <a href="#/register" key="sub">{ sub }</a>) }
                 </div>
             </div>;
         } else if (this.noRoom) {
             return <div className="mx_FilePanel mx_RoomView_messageListWrapper">
-                <div className="mx_RoomView_empty">{_t("You must join the room to see its files")}</div>
+                <div className="mx_RoomView_empty">{ _t("You must join the room to see its files") }</div>
             </div>;
         }
 
         // wrap a TimelinePanel with the jump-to-event bits turned off.
-        var TimelinePanel = sdk.getComponent("structures.TimelinePanel");
-        var Loader = sdk.getComponent("elements.Spinner");
+        const TimelinePanel = sdk.getComponent("structures.TimelinePanel");
+        const Loader = sdk.getComponent("elements.Spinner");
 
         if (this.state.timelineSet) {
             // console.log("rendering TimelinePanel for timelineSet " + this.state.timelineSet.room.roomId + " " +
@@ -114,17 +114,16 @@ var FilePanel = React.createClass({
                     manageReadReceipts={false}
                     manageReadMarkers={false}
                     timelineSet={this.state.timelineSet}
-                    showUrlPreview = { false }
+                    showUrlPreview = {false}
                     tileShape="file_grid"
-                    opacity={ this.props.opacity }
+                    opacity={this.props.opacity}
                     empty={_t('There are no visible files in this room')}
                 />
             );
-        }
-        else {
+        } else {
             return (
                 <div className="mx_FilePanel">
-                    <Loader/>
+                    <Loader />
                 </div>
             );
         }
diff --git a/src/components/structures/InteractiveAuth.js b/src/components/structures/InteractiveAuth.js
index dee8400a08..8a2c1b8c79 100644
--- a/src/components/structures/InteractiveAuth.js
+++ b/src/components/structures/InteractiveAuth.js
@@ -107,7 +107,7 @@ export default React.createClass({
 
             const msg = error.message || error.toString();
             this.setState({
-                errorText: msg
+                errorText: msg,
             });
         }).done();
 
@@ -207,7 +207,7 @@ export default React.createClass({
         if (this.state.errorText) {
             error = (
                 <div className="error">
-                    {this.state.errorText}
+                    { this.state.errorText }
                 </div>
             );
         }
@@ -215,8 +215,8 @@ export default React.createClass({
         return (
             <div>
                 <div>
-                    {this._renderCurrentStage()}
-                    {error}
+                    { this._renderCurrentStage() }
+                    { error }
                 </div>
             </div>
         );
diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index c6ac8e58cd..49522747cd 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -164,7 +164,7 @@ export default React.createClass({
             case KeyCode.UP:
             case KeyCode.DOWN:
                 if (ev.altKey && !ev.shiftKey && !ev.ctrlKey && !ev.metaKey) {
-                    let action = ev.keyCode == KeyCode.UP ?
+                    const action = ev.keyCode == KeyCode.UP ?
                         'view_prev_room' : 'view_next_room';
                     dis.dispatch({action: action});
                     handled = true;
@@ -206,8 +206,7 @@ export default React.createClass({
     _onScrollKeyPressed: function(ev) {
         if (this.refs.roomView) {
             this.refs.roomView.handleScrollKey(ev);
-        }
-        else if (this.refs.roomDirectory) {
+        } else if (this.refs.roomDirectory) {
             this.refs.roomDirectory.handleScrollKey(ev);
         }
     },
@@ -255,7 +254,7 @@ export default React.createClass({
                     referralBaseUrl={this.props.config.referralBaseUrl}
                     teamToken={this.props.teamToken}
                 />;
-                if (!this.props.collapseRhs) right_panel = <RightPanel opacity={this.props.rightOpacity}/>;
+                if (!this.props.collapseRhs) right_panel = <RightPanel opacity={this.props.rightOpacity} />;
                 break;
 
             case PageTypes.MyGroups:
@@ -267,7 +266,7 @@ export default React.createClass({
                     onRoomCreated={this.props.onRoomCreated}
                     collapsedRhs={this.props.collapseRhs}
                 />;
-                if (!this.props.collapseRhs) right_panel = <RightPanel opacity={this.props.rightOpacity}/>;
+                if (!this.props.collapseRhs) right_panel = <RightPanel opacity={this.props.rightOpacity} />;
                 break;
 
             case PageTypes.RoomDirectory:
@@ -320,7 +319,7 @@ export default React.createClass({
             topBar = <MatrixToolbar />;
         }
 
-        var bodyClasses = 'mx_MatrixChat';
+        let bodyClasses = 'mx_MatrixChat';
         if (topBar) {
             bodyClasses += ' mx_MatrixChat_toolbarShowing';
         }
@@ -330,7 +329,7 @@ export default React.createClass({
 
         return (
             <div className='mx_MatrixChat_wrapper'>
-                {topBar}
+                { topBar }
                 <div className={bodyClasses}>
                     <LeftPanel
                         selectedRoom={this.props.currentRoomId}
@@ -338,9 +337,9 @@ export default React.createClass({
                         opacity={this.props.leftOpacity}
                     />
                     <main className='mx_MatrixChat_middlePanel'>
-                        {page_element}
+                        { page_element }
                     </main>
-                    {right_panel}
+                    { right_panel }
                 </div>
             </div>
         );
diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 49894dcaa7..5ce36b4b82 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -154,15 +154,15 @@ module.exports = React.createClass({
     //   0: read marker is within the window
     //  +1: read marker is below the window
     getReadMarkerPosition: function() {
-        var readMarker = this.refs.readMarkerNode;
-        var messageWrapper = this.refs.scrollPanel;
+        const readMarker = this.refs.readMarkerNode;
+        const messageWrapper = this.refs.scrollPanel;
 
         if (!readMarker || !messageWrapper) {
             return null;
         }
 
-        var wrapperRect = ReactDOM.findDOMNode(messageWrapper).getBoundingClientRect();
-        var readMarkerRect = readMarker.getBoundingClientRect();
+        const wrapperRect = ReactDOM.findDOMNode(messageWrapper).getBoundingClientRect();
+        const readMarkerRect = readMarker.getBoundingClientRect();
 
         // the read-marker pretends to have zero height when it is actually
         // two pixels high; +2 here to account for that.
@@ -262,7 +262,7 @@ module.exports = React.createClass({
 
         this.eventNodes = {};
 
-        var i;
+        let i;
 
         // first figure out which is the last event in the list which we're
         // actually going to show; this allows us to behave slightly
@@ -272,9 +272,9 @@ module.exports = React.createClass({
         // a local echo, to manage the read-marker.
         let lastShownEvent;
 
-        var lastShownNonLocalEchoIndex = -1;
+        let lastShownNonLocalEchoIndex = -1;
         for (i = this.props.events.length-1; i >= 0; i--) {
-            var mxEv = this.props.events[i];
+            const mxEv = this.props.events[i];
             if (!this._shouldShowEvent(mxEv)) {
                 continue;
             }
@@ -292,12 +292,12 @@ module.exports = React.createClass({
             break;
         }
 
-        var ret = [];
+        const ret = [];
 
-        var prevEvent = null; // the last event we showed
+        let prevEvent = null; // the last event we showed
 
         // assume there is no read marker until proven otherwise
-        var readMarkerVisible = false;
+        let readMarkerVisible = false;
 
         // if the readmarker has moved, cancel any active ghost.
         if (this.currentReadMarkerEventId && this.props.readMarkerEventId &&
@@ -309,16 +309,16 @@ module.exports = React.createClass({
         const isMembershipChange = (e) => e.getType() === 'm.room.member';
 
         for (i = 0; i < this.props.events.length; i++) {
-            let mxEv = this.props.events[i];
-            let eventId = mxEv.getId();
-            let last = (mxEv === lastShownEvent);
+            const mxEv = this.props.events[i];
+            const eventId = mxEv.getId();
+            const last = (mxEv === lastShownEvent);
 
             const wantTile = this._shouldShowEvent(mxEv);
 
             // Wrap consecutive member events in a ListSummary, ignore if redacted
             if (isMembershipChange(mxEv) && wantTile) {
                 let readMarkerInMels = false;
-                let ts1 = mxEv.getTs();
+                const ts1 = mxEv.getTs();
                 // Ensure that the key of the MemberEventListSummary does not change with new
                 // member events. This will prevent it from being re-created unnecessarily, and
                 // instead will allow new props to be provided. In turn, the shouldComponentUpdate
@@ -330,7 +330,7 @@ module.exports = React.createClass({
                 const key = "membereventlistsummary-" + (prevEvent ? mxEv.getId() : "initial");
 
                 if (this._wantsDateSeparator(prevEvent, mxEv.getDate())) {
-                    let dateSeparator = <li key={ts1+'~'}><DateSeparator key={ts1+'~'} ts={ts1} showTwelveHour={this.props.isTwelveHour}/></li>;
+                    const dateSeparator = <li key={ts1+'~'}><DateSeparator key={ts1+'~'} ts={ts1} showTwelveHour={this.props.isTwelveHour} /></li>;
                     ret.push(dateSeparator);
                 }
 
@@ -339,7 +339,7 @@ module.exports = React.createClass({
                     readMarkerInMels = true;
                 }
 
-                let summarisedEvents = [mxEv];
+                const summarisedEvents = [mxEv];
                 for (;i + 1 < this.props.events.length; i++) {
                     const collapsedMxEv = this.props.events[i + 1];
 
@@ -390,7 +390,7 @@ module.exports = React.createClass({
                     onToggle={this._onWidgetLoad} // Update scroll state
                     startExpanded={highlightInMels}
                 >
-                        {eventTiles}
+                        { eventTiles }
                 </MemberEventListSummary>);
 
                 if (readMarkerInMels) {
@@ -408,7 +408,7 @@ module.exports = React.createClass({
                 prevEvent = mxEv;
             }
 
-            var isVisibleReadMarker = false;
+            let isVisibleReadMarker = false;
 
             if (eventId == this.props.readMarkerEventId) {
                 var visible = this.props.readMarkerVisible;
@@ -448,10 +448,10 @@ module.exports = React.createClass({
     _getTilesForEvent: function(prevEvent, mxEv, last) {
         const EventTile = sdk.getComponent('rooms.EventTile');
         const DateSeparator = sdk.getComponent('messages.DateSeparator');
-        var ret = [];
+        const ret = [];
 
         // is this a continuation of the previous message?
-        var continuation = false;
+        let continuation = false;
 
         if (prevEvent !== null
                 && prevEvent.sender && mxEv.sender
@@ -476,8 +476,8 @@ module.exports = React.createClass({
 
         // local echoes have a fake date, which could even be yesterday. Treat them
         // as 'today' for the date separators.
-        var ts1 = mxEv.getTs();
-        var eventDate = mxEv.getDate();
+        let ts1 = mxEv.getTs();
+        let eventDate = mxEv.getDate();
         if (mxEv.status) {
             eventDate = new Date();
             ts1 = eventDate.getTime();
@@ -485,19 +485,19 @@ module.exports = React.createClass({
 
         // do we need a date separator since the last event?
         if (this._wantsDateSeparator(prevEvent, eventDate)) {
-            var dateSeparator = <li key={ts1}><DateSeparator key={ts1} ts={ts1} showTwelveHour={this.props.isTwelveHour}/></li>;
+            const dateSeparator = <li key={ts1}><DateSeparator key={ts1} ts={ts1} showTwelveHour={this.props.isTwelveHour} /></li>;
             ret.push(dateSeparator);
             continuation = false;
         }
 
-        var eventId = mxEv.getId();
-        var highlight = (eventId == this.props.highlightedEventId);
+        const eventId = mxEv.getId();
+        const highlight = (eventId == this.props.highlightedEventId);
 
         // we can't use local echoes as scroll tokens, because their event IDs change.
         // Local echos have a send "status".
-        var scrollToken = mxEv.status ? undefined : eventId;
+        const scrollToken = mxEv.status ? undefined : eventId;
 
-        var readReceipts;
+        let readReceipts;
         if (this.props.showReadReceipts) {
             readReceipts = this._getReadReceiptsForEvent(mxEv);
         }
@@ -515,8 +515,8 @@ module.exports = React.createClass({
                         eventSendStatus={mxEv.status}
                         tileShape={this.props.tileShape}
                         isTwelveHour={this.props.isTwelveHour}
-                        last={last} isSelectedEvent={highlight}/>
-                </li>
+                        last={last} isSelectedEvent={highlight} />
+                </li>,
         );
 
         return ret;
@@ -551,7 +551,7 @@ module.exports = React.createClass({
         if (!room) {
             return null;
         }
-        let receipts = [];
+        const receipts = [];
         room.getReceiptsForEvent(event).forEach((r) => {
             if (!r.userId || r.type !== "m.read" || r.userId === myUserId) {
                 return; // ignore non-read receipts and receipts from self.
@@ -559,7 +559,7 @@ module.exports = React.createClass({
             if (MatrixClientPeg.get().isUserIgnored(r.userId)) {
                 return; // ignore ignored users
             }
-            let member = room.getMember(r.userId);
+            const member = room.getMember(r.userId);
             if (!member) {
                 return; // ignore unknown user IDs
             }
@@ -575,7 +575,7 @@ module.exports = React.createClass({
     },
 
     _getReadMarkerTile: function(visible) {
-        var hr;
+        let hr;
         if (visible) {
             hr = <hr className="mx_RoomView_myReadMarker"
                     style={{opacity: 1, width: '99%'}}
@@ -585,7 +585,7 @@ module.exports = React.createClass({
         return (
             <li key="_readupto" ref="readMarkerNode"
                   className="mx_RoomView_myReadMarker_container">
-                {hr}
+                { hr }
             </li>
         );
     },
@@ -604,7 +604,7 @@ module.exports = React.createClass({
     },
 
     _getReadMarkerGhostTile: function() {
-        var hr = <hr className="mx_RoomView_myReadMarker"
+        const hr = <hr className="mx_RoomView_myReadMarker"
                   style={{opacity: 1, width: '99%'}}
                   ref={this._startAnimation}
             />;
@@ -615,7 +615,7 @@ module.exports = React.createClass({
         return (
             <li key={"_readuptoghost_"+this.currentGhostEventId}
                   className="mx_RoomView_myReadMarker_container">
-                {hr}
+                { hr }
             </li>
         );
     },
@@ -627,7 +627,7 @@ module.exports = React.createClass({
     // once dynamic content in the events load, make the scrollPanel check the
     // scroll offsets.
     _onWidgetLoad: function() {
-        var scrollPanel = this.refs.scrollPanel;
+        const scrollPanel = this.refs.scrollPanel;
         if (scrollPanel) {
             scrollPanel.forceUpdate();
         }
@@ -638,9 +638,9 @@ module.exports = React.createClass({
     },
 
     render: function() {
-        var ScrollPanel = sdk.getComponent("structures.ScrollPanel");
-        var Spinner = sdk.getComponent("elements.Spinner");
-        var topSpinner, bottomSpinner;
+        const ScrollPanel = sdk.getComponent("structures.ScrollPanel");
+        const Spinner = sdk.getComponent("elements.Spinner");
+        let topSpinner, bottomSpinner;
         if (this.props.backPaginating) {
             topSpinner = <li key="_topSpinner"><Spinner /></li>;
         }
@@ -648,25 +648,25 @@ module.exports = React.createClass({
             bottomSpinner = <li key="_bottomSpinner"><Spinner /></li>;
         }
 
-        var style = this.props.hidden ? { display: 'none' } : {};
+        const style = this.props.hidden ? { display: 'none' } : {};
         style.opacity = this.props.opacity;
 
-        var className = this.props.className + " mx_fadable";
+        let className = this.props.className + " mx_fadable";
         if (this.props.alwaysShowTimestamps) {
             className += " mx_MessagePanel_alwaysShowTimestamps";
         }
 
         return (
-            <ScrollPanel ref="scrollPanel" className={ className }
-                    onScroll={ this.props.onScroll }
-                    onResize={ this.onResize }
-                    onFillRequest={ this.props.onFillRequest }
-                    onUnfillRequest={ this.props.onUnfillRequest }
-                    style={ style }
-                    stickyBottom={ this.props.stickyBottom }>
-                {topSpinner}
-                {this._getEventTiles()}
-                {bottomSpinner}
+            <ScrollPanel ref="scrollPanel" className={className}
+                    onScroll={this.props.onScroll}
+                    onResize={this.onResize}
+                    onFillRequest={this.props.onFillRequest}
+                    onUnfillRequest={this.props.onUnfillRequest}
+                    style={style}
+                    stickyBottom={this.props.stickyBottom}>
+                { topSpinner }
+                { this._getEventTiles() }
+                { bottomSpinner }
             </ScrollPanel>
         );
     },
diff --git a/src/components/structures/NotificationPanel.js b/src/components/structures/NotificationPanel.js
index 21eccbdff6..3c8f34fb86 100644
--- a/src/components/structures/NotificationPanel.js
+++ b/src/components/structures/NotificationPanel.js
@@ -14,18 +14,18 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-var React = require('react');
-var ReactDOM = require("react-dom");
+const React = require('react');
+const ReactDOM = require("react-dom");
 import { _t } from '../../languageHandler';
-var Matrix = require("matrix-js-sdk");
-var sdk = require('../../index');
-var MatrixClientPeg = require("../../MatrixClientPeg");
-var dis = require("../../dispatcher");
+const Matrix = require("matrix-js-sdk");
+const sdk = require('../../index');
+const MatrixClientPeg = require("../../MatrixClientPeg");
+const dis = require("../../dispatcher");
 
 /*
  * Component which shows the global notification list using a TimelinePanel
  */
-var NotificationPanel = React.createClass({
+const NotificationPanel = React.createClass({
     displayName: 'NotificationPanel',
 
     propTypes: {
@@ -33,10 +33,10 @@ var NotificationPanel = React.createClass({
 
     render: function() {
         // wrap a TimelinePanel with the jump-to-event bits turned off.
-        var TimelinePanel = sdk.getComponent("structures.TimelinePanel");
-        var Loader = sdk.getComponent("elements.Spinner");
+        const TimelinePanel = sdk.getComponent("structures.TimelinePanel");
+        const Loader = sdk.getComponent("elements.Spinner");
 
-        var timelineSet = MatrixClientPeg.get().getNotifTimelineSet();
+        const timelineSet = MatrixClientPeg.get().getNotifTimelineSet();
         if (timelineSet) {
             return (
                 <TimelinePanel key={"NotificationPanel_" + this.props.roomId}
@@ -44,18 +44,17 @@ var NotificationPanel = React.createClass({
                     manageReadReceipts={false}
                     manageReadMarkers={false}
                     timelineSet={timelineSet}
-                    showUrlPreview = { false }
-                    opacity={ this.props.opacity }
+                    showUrlPreview = {false}
+                    opacity={this.props.opacity}
                     tileShape="notif"
-                    empty={ _t('You have no visible notifications') }
+                    empty={_t('You have no visible notifications')}
                 />
             );
-        }
-        else {
+        } else {
             console.error("No notifTimelineSet available!");
             return (
                 <div className="mx_NotificationPanel">
-                    <Loader/>
+                    <Loader />
                 </div>
             );
         }
diff --git a/src/components/structures/RoomStatusBar.js b/src/components/structures/RoomStatusBar.js
index 68b7249d3b..3a2ab33db8 100644
--- a/src/components/structures/RoomStatusBar.js
+++ b/src/components/structures/RoomStatusBar.js
@@ -103,7 +103,7 @@ module.exports = React.createClass({
 
     componentWillUnmount: function() {
         // we may have entirely lost our client as we're logging out before clicking login on the guest bar...
-        var client = MatrixClientPeg.get();
+        const client = MatrixClientPeg.get();
         if (client) {
             client.removeListener("sync", this.onSyncStateChange);
             client.removeListener("RoomMember.typing", this.onRoomMemberTyping);
@@ -115,7 +115,7 @@ module.exports = React.createClass({
             return;
         }
         this.setState({
-            syncState: state
+            syncState: state,
         });
     },
 
@@ -126,7 +126,7 @@ module.exports = React.createClass({
     },
 
     // Check whether current size is greater than 0, if yes call props.onVisible
-    _checkSize: function () {
+    _checkSize: function() {
         if (this.props.onVisible && this._getSize()) {
             this.props.onVisible();
         }
@@ -157,9 +157,9 @@ module.exports = React.createClass({
         if (this.props.numUnreadMessages) {
             return (
                 <div className="mx_RoomStatusBar_scrollDownIndicator"
-                        onClick={ this.props.onScrollToBottomClick }>
+                        onClick={this.props.onScrollToBottomClick}>
                     <img src="img/newmessages.svg" width="24" height="24"
-                        alt=""/>
+                        alt="" />
                 </div>
             );
         }
@@ -167,18 +167,18 @@ module.exports = React.createClass({
         if (!this.props.atEndOfLiveTimeline) {
             return (
                 <div className="mx_RoomStatusBar_scrollDownIndicator"
-                        onClick={ this.props.onScrollToBottomClick }>
+                        onClick={this.props.onScrollToBottomClick}>
                     <img src="img/scrolldown.svg" width="24" height="24"
-                        alt={ _t("Scroll to bottom of page") }
-                        title={ _t("Scroll to bottom of page") }/>
+                        alt={_t("Scroll to bottom of page")}
+                        title={_t("Scroll to bottom of page")} />
                 </div>
             );
         }
 
         if (this.props.hasActiveCall) {
-            var TintableSvg = sdk.getComponent("elements.TintableSvg");
+            const TintableSvg = sdk.getComponent("elements.TintableSvg");
             return (
-                <TintableSvg src="img/sound-indicator.svg" width="23" height="20"/>
+                <TintableSvg src="img/sound-indicator.svg" width="23" height="20" />
             );
         }
 
@@ -189,7 +189,7 @@ module.exports = React.createClass({
         if (wantPlaceholder) {
             return (
                 <div className="mx_RoomStatusBar_typingIndicatorAvatars">
-                    {this._renderTypingIndicatorAvatars(this.props.whoIsTypingLimit)}
+                    { this._renderTypingIndicatorAvatars(this.props.whoIsTypingLimit) }
                 </div>
             );
         }
@@ -221,8 +221,8 @@ module.exports = React.createClass({
         if (othersCount > 0) {
             avatars.push(
                 <span className="mx_RoomStatusBar_typingIndicatorRemaining" key="others">
-                    +{othersCount}
-                </span>
+                    +{ othersCount }
+                </span>,
             );
         }
 
@@ -240,12 +240,12 @@ module.exports = React.createClass({
         if (this.state.syncState === "ERROR") {
             return (
                 <div className="mx_RoomStatusBar_connectionLostBar">
-                    <img src="img/warning.svg" width="24" height="23" title="/!\ " alt="/!\ "/>
+                    <img src="img/warning.svg" width="24" height="23" title="/!\ " alt="/!\ " />
                     <div className="mx_RoomStatusBar_connectionLostBar_title">
-                        {_t('Connectivity to the server has been lost.')}
+                        { _t('Connectivity to the server has been lost.') }
                     </div>
                     <div className="mx_RoomStatusBar_connectionLostBar_desc">
-                        {_t('Sent messages will be stored until your connection has returned.')}
+                        { _t('Sent messages will be stored until your connection has returned.') }
                     </div>
                 </div>
             );
@@ -254,18 +254,18 @@ module.exports = React.createClass({
         if (this.props.unsentMessageError) {
             return (
                 <div className="mx_RoomStatusBar_connectionLostBar">
-                    <img src="img/warning.svg" width="24" height="23" title="/!\ " alt="/!\ "/>
+                    <img src="img/warning.svg" width="24" height="23" title="/!\ " alt="/!\ " />
                     <div className="mx_RoomStatusBar_connectionLostBar_title">
                         { this.props.unsentMessageError }
                     </div>
                     <div className="mx_RoomStatusBar_connectionLostBar_desc">
-                    {_tJsx("<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.",
+                    { _tJsx("<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.",
                         [/<a>(.*?)<\/a>/, /<a>(.*?)<\/a>/],
                         [
-                            (sub) => <a className="mx_RoomStatusBar_resend_link" key="resend" onClick={ this.props.onResendAllClick }>{sub}</a>,
-                            (sub) => <a className="mx_RoomStatusBar_resend_link" key="cancel" onClick={ this.props.onCancelAllClick }>{sub}</a>,
-                        ]
-                    )}
+                            (sub) => <a className="mx_RoomStatusBar_resend_link" key="resend" onClick={this.props.onResendAllClick}>{ sub }</a>,
+                            (sub) => <a className="mx_RoomStatusBar_resend_link" key="cancel" onClick={this.props.onCancelAllClick}>{ sub }</a>,
+                        ],
+                    ) }
                     </div>
                 </div>
             );
@@ -275,24 +275,24 @@ module.exports = React.createClass({
         // set when you've scrolled up
         if (this.props.numUnreadMessages) {
             // MUST use var name "count" for pluralization to kick in
-            var unreadMsgs = _t("%(count)s new messages", {count: this.props.numUnreadMessages});
+            const unreadMsgs = _t("%(count)s new messages", {count: this.props.numUnreadMessages});
 
             return (
                 <div className="mx_RoomStatusBar_unreadMessagesBar"
-                        onClick={ this.props.onScrollToBottomClick }>
-                    {unreadMsgs}
+                        onClick={this.props.onScrollToBottomClick}>
+                    { unreadMsgs }
                 </div>
             );
         }
 
         const typingString = WhoIsTyping.whoIsTypingString(
             this.state.usersTyping,
-            this.props.whoIsTypingLimit
+            this.props.whoIsTypingLimit,
         );
         if (typingString) {
             return (
                 <div className="mx_RoomStatusBar_typingBar">
-                    <EmojiText>{typingString}</EmojiText>
+                    <EmojiText>{ typingString }</EmojiText>
                 </div>
             );
         }
@@ -300,7 +300,7 @@ module.exports = React.createClass({
         if (this.props.hasActiveCall) {
             return (
                 <div className="mx_RoomStatusBar_callBar">
-                    <b>{_t('Active call')}</b>
+                    <b>{ _t('Active call') }</b>
                 </div>
             );
         }
@@ -310,15 +310,15 @@ module.exports = React.createClass({
 
 
     render: function() {
-        var content = this._getContent();
-        var indicator = this._getIndicator(this.state.usersTyping.length > 0);
+        const content = this._getContent();
+        const indicator = this._getIndicator(this.state.usersTyping.length > 0);
 
         return (
             <div className="mx_RoomStatusBar">
                 <div className="mx_RoomStatusBar_indicator">
-                    {indicator}
+                    { indicator }
                 </div>
-                {content}
+                { content }
             </div>
         );
     },
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index e0332b1b19..04d43e1f44 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -22,25 +22,25 @@ limitations under the License.
 
 import shouldHideEvent from "../../shouldHideEvent";
 
-var React = require("react");
-var ReactDOM = require("react-dom");
+const React = require("react");
+const ReactDOM = require("react-dom");
 import Promise from 'bluebird';
-var classNames = require("classnames");
-var Matrix = require("matrix-js-sdk");
+const classNames = require("classnames");
+const Matrix = require("matrix-js-sdk");
 import { _t } from '../../languageHandler';
 
-var UserSettingsStore = require('../../UserSettingsStore');
-var MatrixClientPeg = require("../../MatrixClientPeg");
-var ContentMessages = require("../../ContentMessages");
-var Modal = require("../../Modal");
-var sdk = require('../../index');
-var CallHandler = require('../../CallHandler');
-var Resend = require("../../Resend");
-var dis = require("../../dispatcher");
-var Tinter = require("../../Tinter");
-var rate_limited_func = require('../../ratelimitedfunc');
-var ObjectUtils = require('../../ObjectUtils');
-var Rooms = require('../../Rooms');
+const UserSettingsStore = require('../../UserSettingsStore');
+const MatrixClientPeg = require("../../MatrixClientPeg");
+const ContentMessages = require("../../ContentMessages");
+const Modal = require("../../Modal");
+const sdk = require('../../index');
+const CallHandler = require('../../CallHandler');
+const Resend = require("../../Resend");
+const dis = require("../../dispatcher");
+const Tinter = require("../../Tinter");
+const rate_limited_func = require('../../ratelimitedfunc');
+const ObjectUtils = require('../../ObjectUtils');
+const Rooms = require('../../Rooms');
 
 import KeyCode from '../../KeyCode';
 
@@ -49,7 +49,7 @@ import UserProvider from '../../autocomplete/UserProvider';
 import RoomViewStore from '../../stores/RoomViewStore';
 import RoomScrollStateStore from '../../stores/RoomScrollStateStore';
 
-let DEBUG = false;
+const DEBUG = false;
 let debuglog = function() {};
 
 const BROWSER_SUPPORTS_SANDBOX = 'sandbox' in document.createElement('iframe');
@@ -307,10 +307,10 @@ module.exports = React.createClass({
     },
 
     componentDidMount: function() {
-        var call = this._getCallForRoom();
-        var callState = call ? call.call_state : "ended";
+        const call = this._getCallForRoom();
+        const callState = call ? call.call_state : "ended";
         this.setState({
-            callState: callState
+            callState: callState,
         });
 
         this._updateConfCallNotification();
@@ -327,9 +327,8 @@ module.exports = React.createClass({
             this.state.room.getJoinedMembers().length == 1 &&
             this.state.room.getLiveTimeline() &&
             this.state.room.getLiveTimeline().getEvents() &&
-            this.state.room.getLiveTimeline().getEvents().length <= 6)
-        {
-            var inviteBox = document.getElementById("mx_SearchableEntityList_query");
+            this.state.room.getLiveTimeline().getEvents().length <= 6) {
+            const inviteBox = document.getElementById("mx_SearchableEntityList_query");
             setTimeout(function() {
                 if (inviteBox) {
                     inviteBox.focus();
@@ -345,7 +344,7 @@ module.exports = React.createClass({
 
     componentDidUpdate: function() {
         if (this.refs.roomView) {
-            var roomView = ReactDOM.findDOMNode(this.refs.roomView);
+            const roomView = ReactDOM.findDOMNode(this.refs.roomView);
             if (!roomView.ondrop) {
                 roomView.addEventListener('drop', this.onDrop);
                 roomView.addEventListener('dragover', this.onDragOver);
@@ -372,7 +371,7 @@ module.exports = React.createClass({
             // is really just for hygiene - we're going to be
             // deleted anyway, so it doesn't matter if the event listeners
             // don't get cleaned up.
-            var roomView = ReactDOM.findDOMNode(this.refs.roomView);
+            const roomView = ReactDOM.findDOMNode(this.refs.roomView);
             roomView.removeEventListener('drop', this.onDrop);
             roomView.removeEventListener('dragover', this.onDragOver);
             roomView.removeEventListener('dragleave', this.onDragLeaveOrEnd);
@@ -478,8 +477,7 @@ module.exports = React.createClass({
 
                 if (call) {
                     callState = call.call_state;
-                }
-                else {
+                } else {
                     callState = "ended";
                 }
 
@@ -591,17 +589,17 @@ module.exports = React.createClass({
     },
 
     _calculatePeekRules: function(room) {
-        var guestAccessEvent = room.currentState.getStateEvents("m.room.guest_access", "");
+        const guestAccessEvent = room.currentState.getStateEvents("m.room.guest_access", "");
         if (guestAccessEvent && guestAccessEvent.getContent().guest_access === "can_join") {
             this.setState({
-                guestsCanJoin: true
+                guestsCanJoin: true,
             });
         }
 
-        var historyVisibility = room.currentState.getStateEvents("m.room.history_visibility", "");
+        const historyVisibility = room.currentState.getStateEvents("m.room.history_visibility", "");
         if (historyVisibility && historyVisibility.getContent().history_visibility === "world_readable") {
             this.setState({
-                canPeek: true
+                canPeek: true,
             });
         }
     },
@@ -610,35 +608,35 @@ module.exports = React.createClass({
         // console.log("_updatePreviewUrlVisibility");
 
         // check our per-room overrides
-        var roomPreviewUrls = room.getAccountData("org.matrix.room.preview_urls");
+        const roomPreviewUrls = room.getAccountData("org.matrix.room.preview_urls");
         if (roomPreviewUrls && roomPreviewUrls.getContent().disable !== undefined) {
             this.setState({
-                showUrlPreview: !roomPreviewUrls.getContent().disable
+                showUrlPreview: !roomPreviewUrls.getContent().disable,
             });
             return;
         }
 
         // check our global disable override
-        var userRoomPreviewUrls = MatrixClientPeg.get().getAccountData("org.matrix.preview_urls");
+        const userRoomPreviewUrls = MatrixClientPeg.get().getAccountData("org.matrix.preview_urls");
         if (userRoomPreviewUrls && userRoomPreviewUrls.getContent().disable) {
             this.setState({
-                showUrlPreview: false
+                showUrlPreview: false,
             });
             return;
         }
 
         // check the room state event
-        var roomStatePreviewUrls = room.currentState.getStateEvents('org.matrix.room.preview_urls', '');
+        const roomStatePreviewUrls = room.currentState.getStateEvents('org.matrix.room.preview_urls', '');
         if (roomStatePreviewUrls && roomStatePreviewUrls.getContent().disable) {
             this.setState({
-                showUrlPreview: false
+                showUrlPreview: false,
             });
             return;
         }
 
         // otherwise, we assume they're on.
         this.setState({
-            showUrlPreview: true
+            showUrlPreview: true,
         });
     },
 
@@ -654,11 +652,11 @@ module.exports = React.createClass({
     },
 
     updateTint: function() {
-        var room = this.state.room;
+        const room = this.state.room;
         if (!room) return;
 
-        var color_scheme_event = room.getAccountData("org.matrix.room.color_scheme");
-        var color_scheme = {};
+        const color_scheme_event = room.getAccountData("org.matrix.room.color_scheme");
+        let color_scheme = {};
         if (color_scheme_event) {
             color_scheme = color_scheme_event.getContent();
             // XXX: we should validate the event
@@ -676,12 +674,11 @@ module.exports = React.createClass({
     onRoomAccountData: function(event, room) {
         if (room.roomId == this.state.roomId) {
             if (event.getType() === "org.matrix.room.color_scheme") {
-                var color_scheme = event.getContent();
+                const color_scheme = event.getContent();
                 // XXX: we should validate the event
                 console.log("Tinter.tint from onRoomAccountData");
                 Tinter.tint(color_scheme.primary_color, color_scheme.secondary_color);
-            }
-            else if (event.getType() === "org.matrix.room.preview_urls") {
+            } else if (event.getType() === "org.matrix.room.preview_urls") {
                 this._updatePreviewUrlVisibility(room);
             }
         }
@@ -720,7 +717,7 @@ module.exports = React.createClass({
         // if we are now a member of the room, where we were not before, that
         // means we have finished joining a room we were previously peeking
         // into.
-        var me = MatrixClientPeg.get().credentials.userId;
+        const me = MatrixClientPeg.get().credentials.userId;
         if (this.state.joining && this.state.room.hasMembershipState(me, "join")) {
             // Having just joined a room, check to see if it looks like a DM room, and if so,
             // mark it as one. This is to work around the fact that some clients don't support
@@ -754,18 +751,18 @@ module.exports = React.createClass({
     },
 
     _updateConfCallNotification: function() {
-        var room = this.state.room;
+        const room = this.state.room;
         if (!room || !this.props.ConferenceHandler) {
             return;
         }
-        var confMember = room.getMember(
-            this.props.ConferenceHandler.getConferenceUserIdForRoom(room.roomId)
+        const confMember = room.getMember(
+            this.props.ConferenceHandler.getConferenceUserIdForRoom(room.roomId),
         );
 
         if (!confMember) {
             return;
         }
-        var confCall = this.props.ConferenceHandler.getConferenceCallForRoom(confMember.roomId);
+        const confCall = this.props.ConferenceHandler.getConferenceCallForRoom(confMember.roomId);
 
         // A conf call notification should be displayed if there is an ongoing
         // conf call but this cilent isn't a part of it.
@@ -773,7 +770,7 @@ module.exports = React.createClass({
             displayConfCallNotification: (
                 (!confCall || confCall.call_state === "ended") &&
                 confMember.membership === "join"
-            )
+            ),
         });
     },
 
@@ -788,7 +785,7 @@ module.exports = React.createClass({
 
         if (this.state.searchResults.next_batch) {
             debuglog("requesting more search results");
-            var searchPromise = MatrixClientPeg.get().backPaginateRoomEventsSearch(
+            const searchPromise = MatrixClientPeg.get().backPaginateRoomEventsSearch(
                 this.state.searchResults);
             return this._handleSearchResult(searchPromise);
         } else {
@@ -883,8 +880,7 @@ module.exports = React.createClass({
                 numUnreadMessages: 0,
                 atEndOfLiveTimeline: true,
             });
-        }
-        else {
+        } else {
             this.setState({
                 atEndOfLiveTimeline: false,
             });
@@ -898,10 +894,10 @@ module.exports = React.createClass({
 
         ev.dataTransfer.dropEffect = 'none';
 
-        var items = ev.dataTransfer.items;
+        const items = ev.dataTransfer.items;
         if (items.length == 1) {
             if (items[0].kind == 'file') {
-                this.setState({ draggingFile : true });
+                this.setState({ draggingFile: true });
                 ev.dataTransfer.dropEffect = 'copy';
             }
         }
@@ -910,8 +906,8 @@ module.exports = React.createClass({
     onDrop: function(ev) {
         ev.stopPropagation();
         ev.preventDefault();
-        this.setState({ draggingFile : false });
-        var files = ev.dataTransfer.files;
+        this.setState({ draggingFile: false });
+        const files = ev.dataTransfer.files;
         if (files.length == 1) {
             this.uploadFile(files[0]);
         }
@@ -920,7 +916,7 @@ module.exports = React.createClass({
     onDragLeaveOrEnd: function(ev) {
         ev.stopPropagation();
         ev.preventDefault();
-        this.setState({ draggingFile : false });
+        this.setState({ draggingFile: false });
     },
 
     uploadFile: function(file) {
@@ -930,7 +926,7 @@ module.exports = React.createClass({
         }
 
         ContentMessages.sendContentToRoom(
-            file, this.state.room.roomId, MatrixClientPeg.get()
+            file, this.state.room.roomId, MatrixClientPeg.get(),
         ).done(undefined, (error) => {
             if (error.name === "UnknownDeviceError") {
                 dis.dispatch({
@@ -969,19 +965,19 @@ module.exports = React.createClass({
         // todo: should cancel any previous search requests.
         this.searchId = new Date().getTime();
 
-        var filter;
+        let filter;
         if (scope === "Room") {
             filter = {
                 // XXX: it's unintuitive that the filter for searching doesn't have the same shape as the v2 filter API :(
                 rooms: [
-                    this.state.room.roomId
-                ]
+                    this.state.room.roomId,
+                ],
             };
         }
 
         debuglog("sending search request");
 
-        var searchPromise = MatrixClientPeg.get().searchRoomEvents({
+        const searchPromise = MatrixClientPeg.get().searchRoomEvents({
             filter: filter,
             term: term,
         });
@@ -989,11 +985,11 @@ module.exports = React.createClass({
     },
 
     _handleSearchResult: function(searchPromise) {
-        var self = this;
+        const self = this;
 
         // keep a record of the current search id, so that if the search terms
         // change before we get a response, we can ignore the results.
-        var localSearchId = this.searchId;
+        const localSearchId = this.searchId;
 
         this.setState({
             searchInProgress: true,
@@ -1012,7 +1008,7 @@ module.exports = React.createClass({
             // In either case, we want to highlight the literal search term
             // whether it was used by the search engine or not.
 
-            var highlights = results.highlights;
+            let highlights = results.highlights;
             if (highlights.indexOf(self.state.searchTerm) < 0) {
                 highlights = highlights.concat(self.state.searchTerm);
             }
@@ -1020,14 +1016,15 @@ module.exports = React.createClass({
             // For overlapping highlights,
             // favour longer (more specific) terms first
             highlights = highlights.sort(function(a, b) {
-                return b.length - a.length; });
+                return b.length - a.length;
+});
 
             self.setState({
                 searchHighlights: highlights,
                 searchResults: results,
             });
         }, function(error) {
-            var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             console.error("Search failed: " + error);
             Modal.createTrackedDialog('Search failed', '', ErrorDialog, {
                 title: _t("Search failed"),
@@ -1035,17 +1032,17 @@ module.exports = React.createClass({
             });
         }).finally(function() {
             self.setState({
-                searchInProgress: false
+                searchInProgress: false,
             });
         });
     },
 
     getSearchResultTiles: function() {
-        var EventTile = sdk.getComponent('rooms.EventTile');
-        var SearchResultTile = sdk.getComponent('rooms.SearchResultTile');
-        var Spinner = sdk.getComponent("elements.Spinner");
+        const EventTile = sdk.getComponent('rooms.EventTile');
+        const SearchResultTile = sdk.getComponent('rooms.SearchResultTile');
+        const Spinner = sdk.getComponent("elements.Spinner");
 
-        var cli = MatrixClientPeg.get();
+        const cli = MatrixClientPeg.get();
 
         // XXX: todo: merge overlapping results somehow?
         // XXX: why doesn't searching on name work?
@@ -1055,7 +1052,7 @@ module.exports = React.createClass({
             return [];
         }
 
-        var ret = [];
+        const ret = [];
 
         if (this.state.searchInProgress) {
             ret.push(<li key="search-spinner">
@@ -1067,32 +1064,32 @@ module.exports = React.createClass({
             if (this.state.searchResults.results.length == 0) {
                 ret.push(<li key="search-top-marker">
                          <h2 className="mx_RoomView_topMarker">{ _t("No results") }</h2>
-                         </li>
+                         </li>,
                         );
             } else {
                 ret.push(<li key="search-top-marker">
                          <h2 className="mx_RoomView_topMarker">{ _t("No more results") }</h2>
-                         </li>
+                         </li>,
                         );
             }
         }
 
         // once dynamic content in the search results load, make the scrollPanel check
         // the scroll offsets.
-        var onWidgetLoad = () => {
-            var scrollPanel = this.refs.searchResultsPanel;
+        const onWidgetLoad = () => {
+            const scrollPanel = this.refs.searchResultsPanel;
             if (scrollPanel) {
                 scrollPanel.checkScroll();
             }
         };
 
-        var lastRoomId;
+        let lastRoomId;
 
-        for (var i = this.state.searchResults.results.length - 1; i >= 0; i--) {
-            var result = this.state.searchResults.results[i];
+        for (let i = this.state.searchResults.results.length - 1; i >= 0; i--) {
+            const result = this.state.searchResults.results[i];
 
-            var mxEv = result.context.getEvent();
-            var roomId = mxEv.getRoomId();
+            const mxEv = result.context.getEvent();
+            const roomId = mxEv.getRoomId();
 
             if (!EventTile.haveTileForEvent(mxEv)) {
                 // XXX: can this ever happen? It will make the result count
@@ -1102,13 +1099,13 @@ module.exports = React.createClass({
 
             if (this.state.searchScope === 'All') {
                 if(roomId != lastRoomId) {
-                    var room = cli.getRoom(roomId);
+                    const room = cli.getRoom(roomId);
 
                     // XXX: if we've left the room, we might not know about
                     // it. We should tell the js sdk to go and find out about
                     // it. But that's not an issue currently, as synapse only
                     // returns results for rooms we're joined to.
-                    var roomName = room ? room.name : _t("Unknown room %(roomId)s", { roomId: roomId });
+                    const roomName = room ? room.name : _t("Unknown room %(roomId)s", { roomId: roomId });
 
                     ret.push(<li key={mxEv.getId() + "-room"}>
                                  <h1>{ _t("Room") }: { roomName }</h1>
@@ -1117,13 +1114,13 @@ module.exports = React.createClass({
                 }
             }
 
-            var resultLink = "#/room/"+roomId+"/"+mxEv.getId();
+            const resultLink = "#/room/"+roomId+"/"+mxEv.getId();
 
             ret.push(<SearchResultTile key={mxEv.getId()}
                      searchResult={result}
                      searchHighlights={this.state.searchHighlights}
                      resultLink={resultLink}
-                     onWidgetLoad={onWidgetLoad}/>);
+                     onWidgetLoad={onWidgetLoad} />);
         }
         return ret;
     },
@@ -1139,38 +1136,37 @@ module.exports = React.createClass({
             uploadingRoomSettings: true,
         });
 
-        var newName = this.refs.header.getEditedName();
+        const newName = this.refs.header.getEditedName();
         if (newName !== undefined) {
             this.refs.room_settings.setName(newName);
         }
-        var newTopic = this.refs.header.getEditedTopic();
+        const newTopic = this.refs.header.getEditedTopic();
         if (newTopic !== undefined) {
             this.refs.room_settings.setTopic(newTopic);
         }
 
         this.refs.room_settings.save().then((results) => {
-            var fails = results.filter(function(result) { return result.state !== "fulfilled"; });
+            const fails = results.filter(function(result) { return result.state !== "fulfilled"; });
             console.log("Settings saved with %s errors", fails.length);
             if (fails.length) {
                 fails.forEach(function(result) {
                     console.error(result.reason);
                 });
-                var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+                const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                 Modal.createTrackedDialog('Failed to save room settings', '', ErrorDialog, {
                     title: _t("Failed to save settings"),
                     description: fails.map(function(result) { return result.reason; }).join("\n"),
                 });
                 // still editing room settings
-            }
-            else {
+            } else {
                 this.setState({
-                    editingRoomSettings: false
+                    editingRoomSettings: false,
                 });
             }
         }).finally(() => {
             this.setState({
                 uploadingRoomSettings: false,
-                editingRoomSettings: false
+                editingRoomSettings: false,
             });
         }).done();
     },
@@ -1201,8 +1197,8 @@ module.exports = React.createClass({
         MatrixClientPeg.get().forget(this.state.room.roomId).done(function() {
             dis.dispatch({ action: 'view_next_room' });
         }, function(err) {
-            var errCode = err.errcode || _t("unknown error code");
-            var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+            const errCode = err.errcode || _t("unknown error code");
+            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             Modal.createTrackedDialog('Failed to forget room', '', ErrorDialog, {
                 title: _t("Error"),
                 description: _t("Failed to forget room %(errCode)s", { errCode: errCode }),
@@ -1211,20 +1207,20 @@ module.exports = React.createClass({
     },
 
     onRejectButtonClicked: function(ev) {
-        var self = this;
+        const self = this;
         this.setState({
-            rejecting: true
+            rejecting: true,
         });
         MatrixClientPeg.get().leave(this.state.roomId).done(function() {
             dis.dispatch({ action: 'view_next_room' });
             self.setState({
-                rejecting: false
+                rejecting: false,
             });
         }, function(error) {
             console.error("Failed to reject invite: %s", error);
 
-            var msg = error.message ? error.message : JSON.stringify(error);
-            var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+            const msg = error.message ? error.message : JSON.stringify(error);
+            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             Modal.createTrackedDialog('Failed to reject invite', '', ErrorDialog, {
                 title: _t("Failed to reject invite"),
                 description: msg,
@@ -1232,7 +1228,7 @@ module.exports = React.createClass({
 
             self.setState({
                 rejecting: false,
-                rejectError: error
+                rejectError: error,
             });
         });
     },
@@ -1292,7 +1288,7 @@ module.exports = React.createClass({
     // restored when we switch back to it.
     //
     _getScrollState: function() {
-        var messagePanel = this.refs.messagePanel;
+        const messagePanel = this.refs.messagePanel;
         if (!messagePanel) return null;
 
         // if we're following the live timeline, we want to return null; that
@@ -1307,7 +1303,7 @@ module.exports = React.createClass({
             return null;
         }
 
-        var scrollState = messagePanel.getScrollState();
+        const scrollState = messagePanel.getScrollState();
 
         if (scrollState.stuckAtBottom) {
             // we don't really expect to be in this state, but it will
@@ -1334,7 +1330,7 @@ module.exports = React.createClass({
         // a maxHeight on the underlying remote video tag.
 
         // header + footer + status + give us at least 120px of scrollback at all times.
-        var auxPanelMaxHeight = window.innerHeight -
+        let auxPanelMaxHeight = window.innerHeight -
                 (83 + // height of RoomHeader
                  36 + // height of the status area
                  72 + // minimum height of the message compmoser
@@ -1353,26 +1349,26 @@ module.exports = React.createClass({
     onFullscreenClick: function() {
         dis.dispatch({
             action: 'video_fullscreen',
-            fullscreen: true
+            fullscreen: true,
         }, true);
     },
 
     onMuteAudioClick: function() {
-        var call = this._getCallForRoom();
+        const call = this._getCallForRoom();
         if (!call) {
             return;
         }
-        var newState = !call.isMicrophoneMuted();
+        const newState = !call.isMicrophoneMuted();
         call.setMicrophoneMuted(newState);
         this.forceUpdate(); // TODO: just update the voip buttons
     },
 
     onMuteVideoClick: function() {
-        var call = this._getCallForRoom();
+        const call = this._getCallForRoom();
         if (!call) {
             return;
         }
-        var newState = !call.isLocalVideoMuted();
+        const newState = !call.isLocalVideoMuted();
         call.setLocalVideoMuted(newState);
         this.forceUpdate(); // TODO: just update the voip buttons
     },
@@ -1408,7 +1404,7 @@ module.exports = React.createClass({
      * We pass it down to the scroll panel.
      */
     handleScrollKey: function(ev) {
-        var panel;
+        let panel;
         if(this.refs.searchResultsPanel) {
             panel = this.refs.searchResultsPanel;
         } else if(this.refs.messagePanel) {
@@ -1478,13 +1474,13 @@ module.exports = React.createClass({
                         <RoomHeader ref="header"
                             room={this.state.room}
                             oobData={this.props.oobData}
-                            collapsedRhs={ this.props.collapsedRhs }
+                            collapsedRhs={this.props.collapsedRhs}
                         />
                         <div className="mx_RoomView_auxPanel">
-                            <RoomPreviewBar onJoinClick={ this.onJoinButtonClicked }
-                                            onForgetClick={ this.onForgetClick }
-                                            onRejectClick={ this.onRejectThreepidInviteButtonClicked }
-                                            canPreview={ false } error={ this.state.roomLoadError }
+                            <RoomPreviewBar onJoinClick={this.onJoinButtonClicked}
+                                            onForgetClick={this.onForgetClick}
+                                            onRejectClick={this.onRejectThreepidInviteButtonClicked}
+                                            canPreview={false} error={this.state.roomLoadError}
                                             roomAlias={roomAlias}
                                             spinner={this.state.joining}
                                             inviterName={inviterName}
@@ -1498,8 +1494,8 @@ module.exports = React.createClass({
             }
         }
 
-        var myUserId = MatrixClientPeg.get().credentials.userId;
-        var myMember = this.state.room.getMember(myUserId);
+        const myUserId = MatrixClientPeg.get().credentials.userId;
+        const myMember = this.state.room.getMember(myUserId);
         if (myMember && myMember.membership == 'invite') {
             if (this.state.joining || this.state.rejecting) {
                 return (
@@ -1508,7 +1504,7 @@ module.exports = React.createClass({
                     </div>
                 );
             } else {
-                var inviteEvent = myMember.events.member;
+                const inviteEvent = myMember.events.member;
                 var inviterName = inviteEvent.sender ? inviteEvent.sender.name : inviteEvent.getSender();
 
                 // We deliberately don't try to peek into invites, even if we have permission to peek
@@ -1521,14 +1517,14 @@ module.exports = React.createClass({
                         <RoomHeader
                             ref="header"
                             room={this.state.room}
-                            collapsedRhs={ this.props.collapsedRhs }
+                            collapsedRhs={this.props.collapsedRhs}
                         />
                         <div className="mx_RoomView_auxPanel">
-                            <RoomPreviewBar onJoinClick={ this.onJoinButtonClicked }
-                                            onForgetClick={ this.onForgetClick }
-                                            onRejectClick={ this.onRejectButtonClicked }
-                                            inviterName={ inviterName }
-                                            canPreview={ false }
+                            <RoomPreviewBar onJoinClick={this.onJoinButtonClicked}
+                                            onForgetClick={this.onForgetClick}
+                                            onRejectClick={this.onRejectButtonClicked}
+                                            inviterName={inviterName}
+                                            canPreview={false}
                                             spinner={this.state.joining}
                                             room={this.state.room}
                             />
@@ -1542,24 +1538,24 @@ module.exports = React.createClass({
         // We have successfully loaded this room, and are not previewing.
         // Display the "normal" room view.
 
-        var call = this._getCallForRoom();
-        var inCall = false;
+        const call = this._getCallForRoom();
+        let inCall = false;
         if (call && (this.state.callState !== 'ended' && this.state.callState !== 'ringing')) {
             inCall = true;
         }
 
-        var scrollheader_classes = classNames({
+        const scrollheader_classes = classNames({
             mx_RoomView_scrollheader: true,
         });
 
-        var statusBar;
+        let statusBar;
         let isStatusAreaExpanded = true;
 
         if (ContentMessages.getCurrentUploads().length > 0) {
-            var UploadBar = sdk.getComponent('structures.UploadBar');
+            const UploadBar = sdk.getComponent('structures.UploadBar');
             statusBar = <UploadBar room={this.state.room} />;
         } else if (!this.state.searchResults) {
-            var RoomStatusBar = sdk.getComponent('structures.RoomStatusBar');
+            const RoomStatusBar = sdk.getComponent('structures.RoomStatusBar');
             isStatusAreaExpanded = this.state.statusBarVisible;
             statusBar = <RoomStatusBar
                 room={this.state.room}
@@ -1582,12 +1578,12 @@ module.exports = React.createClass({
         if (this.state.editingRoomSettings) {
             aux = <RoomSettings ref="room_settings" onSaveClick={this.onSettingsSaveClick} onCancelClick={this.onCancelClick} room={this.state.room} />;
         } else if (this.state.uploadingRoomSettings) {
-            aux = <Loader/>;
+            aux = <Loader />;
         } else if (this.state.forwardingEvent !== null) {
             aux = <ForwardMessage onCancelClick={this.onCancelClick} />;
         } else if (this.state.searching) {
             hideCancel = true; // has own cancel
-            aux = <SearchBar ref="search_bar" searchInProgress={this.state.searchInProgress } onCancelClick={this.onCancelSearchClick} onSearch={this.onSearch}/>;
+            aux = <SearchBar ref="search_bar" searchInProgress={this.state.searchInProgress} onCancelClick={this.onCancelSearchClick} onSearch={this.onSearch} />;
         } else if (!myMember || myMember.membership !== "join") {
             // We do have a room object for this room, but we're not currently in it.
             // We may have a 3rd party invite to it.
@@ -1602,7 +1598,7 @@ module.exports = React.createClass({
             hideCancel = true;
             aux = (
                 <RoomPreviewBar onJoinClick={this.onJoinButtonClicked}
-                                onForgetClick={ this.onForgetClick }
+                                onForgetClick={this.onForgetClick}
                                 onRejectClick={this.onRejectThreepidInviteButtonClicked}
                                 spinner={this.state.joining}
                                 inviterName={inviterName}
@@ -1613,7 +1609,7 @@ module.exports = React.createClass({
             );
         }
 
-        var auxPanel = (
+        const auxPanel = (
             <AuxPanel ref="auxPanel" room={this.state.room}
               userId={MatrixClientPeg.get().credentials.userId}
               conferenceHandler={this.props.ConferenceHandler}
@@ -1626,8 +1622,8 @@ module.exports = React.createClass({
             </AuxPanel>
         );
 
-        var messageComposer, searchInfo;
-        var canSpeak = (
+        let messageComposer, searchInfo;
+        const canSpeak = (
             // joined and not showing search results
             myMember && (myMember.membership == 'join') && !this.state.searchResults
         );
@@ -1638,8 +1634,8 @@ module.exports = React.createClass({
                     onResize={this.onChildResize}
                     uploadFile={this.uploadFile}
                     callState={this.state.callState}
-                    opacity={ this.props.opacity }
-                    showApps={ this.state.showApps }
+                    opacity={this.props.opacity}
+                    showApps={this.state.showApps}
                 />;
         }
 
@@ -1647,19 +1643,19 @@ module.exports = React.createClass({
         // in this.state if this is what RoomHeader desires?
         if (this.state.searchResults) {
             searchInfo = {
-                searchTerm : this.state.searchTerm,
-                searchScope : this.state.searchScope,
-                searchCount : this.state.searchResults.count,
+                searchTerm: this.state.searchTerm,
+                searchScope: this.state.searchScope,
+                searchCount: this.state.searchResults.count,
             };
         }
 
         if (inCall) {
-            var zoomButton, voiceMuteButton, videoMuteButton;
+            let zoomButton, voiceMuteButton, videoMuteButton;
 
             if (call.type === "video") {
                 zoomButton = (
-                    <div className="mx_RoomView_voipButton" onClick={this.onFullscreenClick} title={ _t("Fill screen") }>
-                        <TintableSvg src="img/fullscreen.svg" width="29" height="22" style={{ marginTop: 1, marginRight: 4 }}/>
+                    <div className="mx_RoomView_voipButton" onClick={this.onFullscreenClick} title={_t("Fill screen")}>
+                        <TintableSvg src="img/fullscreen.svg" width="29" height="22" style={{ marginTop: 1, marginRight: 4 }} />
                     </div>
                 );
 
@@ -1667,14 +1663,14 @@ module.exports = React.createClass({
                     <div className="mx_RoomView_voipButton" onClick={this.onMuteVideoClick}>
                         <TintableSvg src={call.isLocalVideoMuted() ? "img/video-unmute.svg" : "img/video-mute.svg"}
                              alt={call.isLocalVideoMuted() ? _t("Click to unmute video") : _t("Click to mute video")}
-                             width="31" height="27"/>
+                             width="31" height="27" />
                     </div>;
             }
             voiceMuteButton =
                 <div className="mx_RoomView_voipButton" onClick={this.onMuteAudioClick}>
                     <TintableSvg src={call.isMicrophoneMuted() ? "img/voice-unmute.svg" : "img/voice-mute.svg"}
                          alt={call.isMicrophoneMuted() ? _t("Click to unmute audio") : _t("Click to mute audio")}
-                         width="21" height="26"/>
+                         width="21" height="26" />
                 </div>;
 
             // wrap the existing status bar into a 'callStatusBar' which adds more knobs.
@@ -1684,25 +1680,25 @@ module.exports = React.createClass({
                     { videoMuteButton }
                     { zoomButton }
                     { statusBar }
-                    <TintableSvg className="mx_RoomView_voipChevron" src="img/voip-chevron.svg" width="22" height="17"/>
+                    <TintableSvg className="mx_RoomView_voipChevron" src="img/voip-chevron.svg" width="22" height="17" />
                 </div>;
         }
 
         // if we have search results, we keep the messagepanel (so that it preserves its
         // scroll state), but hide it.
-        var searchResultsPanel;
-        var hideMessagePanel = false;
+        let searchResultsPanel;
+        let hideMessagePanel = false;
 
         if (this.state.searchResults) {
             searchResultsPanel = (
                 <ScrollPanel ref="searchResultsPanel"
                     className="mx_RoomView_messagePanel mx_RoomView_searchResultsPanel"
-                    onFillRequest={ this.onSearchResultsFillRequest }
-                    onResize={ this.onSearchResultsResize }
+                    onFillRequest={this.onSearchResultsFillRequest}
+                    onResize={this.onSearchResultsResize}
                     style={{ opacity: this.props.opacity }}
                 >
                     <li className={scrollheader_classes}></li>
-                    {this.getSearchResultTiles()}
+                    { this.getSearchResultTiles() }
                 </ScrollPanel>
             );
             hideMessagePanel = true;
@@ -1717,7 +1713,7 @@ module.exports = React.createClass({
         }
 
         // console.log("ShowUrlPreview for %s is %s", this.state.room.roomId, this.state.showUrlPreview);
-        var messagePanel = (
+        const messagePanel = (
             <TimelinePanel ref={this._gatherTimelinePanelRef}
                 timelineSet={this.state.room.getUnfilteredTimelineSet()}
                 showReadReceipts={!UserSettingsStore.getSyncedSetting('hideReadReceipts', false)}
@@ -1727,16 +1723,16 @@ module.exports = React.createClass({
                 highlightedEventId={highlightedEventId}
                 eventId={this.state.initialEventId}
                 eventPixelOffset={this.state.initialEventPixelOffset}
-                onScroll={ this.onMessageListScroll }
-                onReadMarkerUpdated={ this._updateTopUnreadMessagesBar }
-                showUrlPreview = { this.state.showUrlPreview }
-                opacity={ this.props.opacity }
+                onScroll={this.onMessageListScroll}
+                onReadMarkerUpdated={this._updateTopUnreadMessagesBar}
+                showUrlPreview = {this.state.showUrlPreview}
+                opacity={this.props.opacity}
                 className="mx_RoomView_messagePanel"
             />);
 
-        var topUnreadMessagesBar = null;
+        let topUnreadMessagesBar = null;
         if (this.state.showTopUnreadMessagesBar) {
-            var TopUnreadMessagesBar = sdk.getComponent('rooms.TopUnreadMessagesBar');
+            const TopUnreadMessagesBar = sdk.getComponent('rooms.TopUnreadMessagesBar');
             topUnreadMessagesBar = (
                 <div className="mx_RoomView_topUnreadMessagesBar mx_fadable" style={{ opacity: this.props.opacity }}>
                     <TopUnreadMessagesBar
@@ -1752,13 +1748,13 @@ module.exports = React.createClass({
         }
 
         return (
-            <div className={ "mx_RoomView" + (inCall ? " mx_RoomView_inCall" : "") } ref="roomView">
+            <div className={"mx_RoomView" + (inCall ? " mx_RoomView_inCall" : "")} ref="roomView">
                 <RoomHeader ref="header" room={this.state.room} searchInfo={searchInfo}
                     oobData={this.props.oobData}
                     editing={this.state.editingRoomSettings}
                     saving={this.state.uploadingRoomSettings}
                     inRoom={myMember && myMember.membership === 'join'}
-                    collapsedRhs={ this.props.collapsedRhs }
+                    collapsedRhs={this.props.collapsedRhs}
                     onSearchClick={this.onSearchClick}
                     onSettingsClick={this.onSettingsClick}
                     onSaveClick={this.onSettingsSaveClick}
diff --git a/src/components/structures/ScrollPanel.js b/src/components/structures/ScrollPanel.js
index ae3ffe66e3..62787d8cb3 100644
--- a/src/components/structures/ScrollPanel.js
+++ b/src/components/structures/ScrollPanel.js
@@ -14,13 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-var React = require("react");
-var ReactDOM = require("react-dom");
-var GeminiScrollbar = require('react-gemini-scrollbar');
+const React = require("react");
+const ReactDOM = require("react-dom");
+const GeminiScrollbar = require('react-gemini-scrollbar');
 import Promise from 'bluebird';
-var KeyCode = require('../../KeyCode');
+const KeyCode = require('../../KeyCode');
 
-var DEBUG_SCROLL = false;
+const DEBUG_SCROLL = false;
 // var DEBUG_SCROLL = true;
 
 // The amount of extra scroll distance to allow prior to unfilling.
@@ -178,7 +178,7 @@ module.exports = React.createClass({
     },
 
     onScroll: function(ev) {
-        var sn = this._getScrollNode();
+        const sn = this._getScrollNode();
         debuglog("Scroll event: offset now:", sn.scrollTop,
                  "_lastSetScroll:", this._lastSetScroll);
 
@@ -238,7 +238,7 @@ module.exports = React.createClass({
     // about whether the the content is scrolled down right now, irrespective of
     // whether it will stay that way when the children update.
     isAtBottom: function() {
-        var sn = this._getScrollNode();
+        const sn = this._getScrollNode();
 
         // there seems to be some bug with flexbox/gemini/chrome/richvdh's
         // understanding of the box model, wherein the scrollNode ends up 2
@@ -281,7 +281,7 @@ module.exports = React.createClass({
     //   |#########|                                       |
     //   `---------'                                       -
     _getExcessHeight: function(backwards) {
-        var sn = this._getScrollNode();
+        const sn = this._getScrollNode();
         if (backwards) {
             return sn.scrollTop - sn.clientHeight - UNPAGINATION_PADDING;
         } else {
@@ -295,7 +295,7 @@ module.exports = React.createClass({
             return;
         }
 
-        var sn = this._getScrollNode();
+        const sn = this._getScrollNode();
 
         // if there is less than a screenful of messages above or below the
         // viewport, try to get some more messages.
@@ -377,7 +377,7 @@ module.exports = React.createClass({
 
     // check if there is already a pending fill request. If not, set one off.
     _maybeFill: function(backwards) {
-        var dir = backwards ? 'b' : 'f';
+        const dir = backwards ? 'b' : 'f';
         if (this._pendingFillRequests[dir]) {
             debuglog("ScrollPanel: Already a "+dir+" fill in progress - not starting another");
             return;
@@ -470,8 +470,8 @@ module.exports = React.createClass({
      * mult: -1 to page up, +1 to page down
      */
     scrollRelative: function(mult) {
-        var scrollNode = this._getScrollNode();
-        var delta = mult * scrollNode.clientHeight * 0.5;
+        const scrollNode = this._getScrollNode();
+        const delta = mult * scrollNode.clientHeight * 0.5;
         this._setScrollTop(scrollNode.scrollTop + delta);
         this._saveScrollState();
     },
@@ -535,7 +535,7 @@ module.exports = React.createClass({
         this.scrollState = {
             stuckAtBottom: false,
             trackedScrollToken: scrollToken,
-            pixelOffset: pixelOffset
+            pixelOffset: pixelOffset,
         };
 
         // ... then make it so.
@@ -546,10 +546,10 @@ module.exports = React.createClass({
     // given offset in the window. A helper for _restoreSavedScrollState.
     _scrollToToken: function(scrollToken, pixelOffset) {
         /* find the dom node with the right scrolltoken */
-        var node;
-        var messages = this.refs.itemlist.children;
-        for (var i = messages.length-1; i >= 0; --i) {
-            var m = messages[i];
+        let node;
+        const messages = this.refs.itemlist.children;
+        for (let i = messages.length-1; i >= 0; --i) {
+            const m = messages[i];
             // 'data-scroll-tokens' is a DOMString of comma-separated scroll tokens
             // There might only be one scroll token
             if (m.dataset.scrollTokens &&
@@ -564,10 +564,10 @@ module.exports = React.createClass({
             return;
         }
 
-        var scrollNode = this._getScrollNode();
-        var wrapperRect = ReactDOM.findDOMNode(this).getBoundingClientRect();
-        var boundingRect = node.getBoundingClientRect();
-        var scrollDelta = boundingRect.bottom + pixelOffset - wrapperRect.bottom;
+        const scrollNode = this._getScrollNode();
+        const wrapperRect = ReactDOM.findDOMNode(this).getBoundingClientRect();
+        const boundingRect = node.getBoundingClientRect();
+        const scrollDelta = boundingRect.bottom + pixelOffset - wrapperRect.bottom;
 
         debuglog("ScrollPanel: scrolling to token '" + scrollToken + "'+" +
                  pixelOffset + " (delta: "+scrollDelta+")");
@@ -575,7 +575,6 @@ module.exports = React.createClass({
         if(scrollDelta != 0) {
             this._setScrollTop(scrollNode.scrollTop + scrollDelta);
         }
-
     },
 
     _saveScrollState: function() {
@@ -585,16 +584,16 @@ module.exports = React.createClass({
             return;
         }
 
-        var itemlist = this.refs.itemlist;
-        var wrapperRect = ReactDOM.findDOMNode(this).getBoundingClientRect();
-        var messages = itemlist.children;
+        const itemlist = this.refs.itemlist;
+        const wrapperRect = ReactDOM.findDOMNode(this).getBoundingClientRect();
+        const messages = itemlist.children;
         let newScrollState = null;
 
-        for (var i = messages.length-1; i >= 0; --i) {
-            var node = messages[i];
+        for (let i = messages.length-1; i >= 0; --i) {
+            const node = messages[i];
             if (!node.dataset.scrollTokens) continue;
 
-            var boundingRect = node.getBoundingClientRect();
+            const boundingRect = node.getBoundingClientRect();
             newScrollState = {
                 stuckAtBottom: false,
                 trackedScrollToken: node.dataset.scrollTokens.split(',')[0],
@@ -619,8 +618,8 @@ module.exports = React.createClass({
     },
 
     _restoreSavedScrollState: function() {
-        var scrollState = this.scrollState;
-        var scrollNode = this._getScrollNode();
+        const scrollState = this.scrollState;
+        const scrollNode = this._getScrollNode();
 
         if (scrollState.stuckAtBottom) {
             this._setScrollTop(Number.MAX_VALUE);
@@ -631,9 +630,9 @@ module.exports = React.createClass({
     },
 
     _setScrollTop: function(scrollTop) {
-        var scrollNode = this._getScrollNode();
+        const scrollNode = this._getScrollNode();
 
-        var prevScroll = scrollNode.scrollTop;
+        const prevScroll = scrollNode.scrollTop;
 
         // FF ignores attempts to set scrollTop to very large numbers
         scrollNode.scrollTop = Math.min(scrollTop, scrollNode.scrollHeight);
@@ -676,7 +675,7 @@ module.exports = React.createClass({
                 className={this.props.className} style={this.props.style}>
                     <div className="mx_RoomView_messageListWrapper">
                         <ol ref="itemlist" className="mx_RoomView_MessageList" aria-live="polite">
-                            {this.props.children}
+                            { this.props.children }
                         </ol>
                     </div>
                 </GeminiScrollbar>
diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index c4723f515d..e3b3b66f97 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -15,27 +15,27 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-var React = require('react');
-var ReactDOM = require("react-dom");
+const React = require('react');
+const ReactDOM = require("react-dom");
 import Promise from 'bluebird';
 
-var Matrix = require("matrix-js-sdk");
-var EventTimeline = Matrix.EventTimeline;
+const Matrix = require("matrix-js-sdk");
+const EventTimeline = Matrix.EventTimeline;
 
-var sdk = require('../../index');
+const sdk = require('../../index');
 import { _t } from '../../languageHandler';
-var MatrixClientPeg = require("../../MatrixClientPeg");
-var dis = require("../../dispatcher");
-var ObjectUtils = require('../../ObjectUtils');
-var Modal = require("../../Modal");
-var UserActivity = require("../../UserActivity");
-var KeyCode = require('../../KeyCode');
+const MatrixClientPeg = require("../../MatrixClientPeg");
+const dis = require("../../dispatcher");
+const ObjectUtils = require('../../ObjectUtils');
+const Modal = require("../../Modal");
+const UserActivity = require("../../UserActivity");
+const KeyCode = require('../../KeyCode');
 import UserSettingsStore from '../../UserSettingsStore';
 
-var PAGINATE_SIZE = 20;
-var INITIAL_SIZE = 20;
+const PAGINATE_SIZE = 20;
+const INITIAL_SIZE = 20;
 
-var DEBUG = false;
+const DEBUG = false;
 
 if (DEBUG) {
     // using bind means that we get to keep useful line numbers in the console
@@ -260,7 +260,7 @@ var TimelinePanel = React.createClass({
 
         dis.unregister(this.dispatcherRef);
 
-        var client = MatrixClientPeg.get();
+        const client = MatrixClientPeg.get();
         if (client) {
             client.removeListener("Room.timeline", this.onRoomTimeline);
             client.removeListener("Room.timelineReset", this.onRoomTimelineReset);
@@ -275,20 +275,20 @@ var TimelinePanel = React.createClass({
 
     onMessageListUnfillRequest: function(backwards, scrollToken) {
         // If backwards, unpaginate from the back (i.e. the start of the timeline)
-        let dir = backwards ? EventTimeline.BACKWARDS : EventTimeline.FORWARDS;
+        const dir = backwards ? EventTimeline.BACKWARDS : EventTimeline.FORWARDS;
         debuglog("TimelinePanel: unpaginating events in direction", dir);
 
         // All tiles are inserted by MessagePanel to have a scrollToken === eventId, and
         // this particular event should be the first or last to be unpaginated.
-        let eventId = scrollToken;
+        const eventId = scrollToken;
 
-        let marker = this.state.events.findIndex(
+        const marker = this.state.events.findIndex(
             (ev) => {
                 return ev.getId() === eventId;
-            }
+            },
         );
 
-        let count = backwards ? marker + 1 : this.state.events.length - marker;
+        const count = backwards ? marker + 1 : this.state.events.length - marker;
 
         if (count > 0) {
             debuglog("TimelinePanel: Unpaginating", count, "in direction", dir);
@@ -305,9 +305,9 @@ var TimelinePanel = React.createClass({
 
     // set off a pagination request.
     onMessageListFillRequest: function(backwards) {
-        var dir = backwards ? EventTimeline.BACKWARDS : EventTimeline.FORWARDS;
-        var canPaginateKey = backwards ? 'canBackPaginate' : 'canForwardPaginate';
-        var paginatingKey = backwards ? 'backPaginating' : 'forwardPaginating';
+        const dir = backwards ? EventTimeline.BACKWARDS : EventTimeline.FORWARDS;
+        const canPaginateKey = backwards ? 'canBackPaginate' : 'canForwardPaginate';
+        const paginatingKey = backwards ? 'backPaginating' : 'forwardPaginating';
 
         if (!this.state[canPaginateKey]) {
             debuglog("TimelinePanel: have given up", dir, "paginating this timeline");
@@ -328,7 +328,7 @@ var TimelinePanel = React.createClass({
 
             debuglog("TimelinePanel: paginate complete backwards:"+backwards+"; success:"+r);
 
-            var newState = {
+            const newState = {
                 [paginatingKey]: false,
                 [canPaginateKey]: r,
                 events: this._getEvents(),
@@ -336,8 +336,8 @@ var TimelinePanel = React.createClass({
 
             // moving the window in this direction may mean that we can now
             // paginate in the other where we previously could not.
-            var otherDirection = backwards ? EventTimeline.FORWARDS : EventTimeline.BACKWARDS;
-            var canPaginateOtherWayKey = backwards ? 'canForwardPaginate' : 'canBackPaginate';
+            const otherDirection = backwards ? EventTimeline.FORWARDS : EventTimeline.BACKWARDS;
+            const canPaginateOtherWayKey = backwards ? 'canForwardPaginate' : 'canBackPaginate';
             if (!this.state[canPaginateOtherWayKey] &&
                     this._timelineWindow.canPaginate(otherDirection)) {
                 debuglog('TimelinePanel: can now', otherDirection, 'paginate again');
@@ -420,15 +420,15 @@ var TimelinePanel = React.createClass({
         this._timelineWindow.paginate(EventTimeline.FORWARDS, 1, false).done(() => {
             if (this.unmounted) { return; }
 
-            var events = this._timelineWindow.getEvents();
-            var lastEv = events[events.length-1];
+            const events = this._timelineWindow.getEvents();
+            const lastEv = events[events.length-1];
 
             // if we're at the end of the live timeline, append the pending events
             if (this.props.timelineSet.room && !this._timelineWindow.canPaginate(EventTimeline.FORWARDS)) {
                 events.push(...this.props.timelineSet.room.getPendingEvents());
             }
 
-            var updatedState = {events: events};
+            const updatedState = {events: events};
 
             if (this.props.manageReadMarkers) {
                 // when a new event arrives when the user is not watching the
@@ -439,8 +439,8 @@ var TimelinePanel = React.createClass({
                 // read-marker when a remote echo of an event we have just sent takes
                 // more than the timeout on userCurrentlyActive.
                 //
-                var myUserId = MatrixClientPeg.get().credentials.userId;
-                var sender = ev.sender ? ev.sender.userId : null;
+                const myUserId = MatrixClientPeg.get().credentials.userId;
+                const sender = ev.sender ? ev.sender.userId : null;
                 var callback = null;
                 if (sender != myUserId && !UserActivity.userCurrentlyActive()) {
                     updatedState.readMarkerVisible = true;
@@ -646,7 +646,7 @@ var TimelinePanel = React.createClass({
         // and we'll get confused when their ID changes and we can't figure out
         // where the RM is pointing to. The read marker will be invisible for
         // now anyway, so this doesn't really matter.
-        var lastDisplayedIndex = this._getLastDisplayedEventIndex({
+        const lastDisplayedIndex = this._getLastDisplayedEventIndex({
             allowPartial: true,
             ignoreEchoes: true,
         });
@@ -655,7 +655,7 @@ var TimelinePanel = React.createClass({
             return;
         }
 
-        var lastDisplayedEvent = this.state.events[lastDisplayedIndex];
+        const lastDisplayedEvent = this.state.events[lastDisplayedIndex];
         this._setReadMarker(lastDisplayedEvent.getId(),
                             lastDisplayedEvent.getTs());
 
@@ -676,7 +676,7 @@ var TimelinePanel = React.createClass({
         // we call _timelineWindow.getEvents() rather than using
         // this.state.events, because react batches the update to the latter, so it
         // may not have been updated yet.
-        var events = this._timelineWindow.getEvents();
+        const events = this._timelineWindow.getEvents();
 
         // first find where the current RM is
         for (var i = 0; i < events.length; i++) {
@@ -689,7 +689,7 @@ var TimelinePanel = React.createClass({
         }
 
         // now think about advancing it
-        var myUserId = MatrixClientPeg.get().credentials.userId;
+        const myUserId = MatrixClientPeg.get().credentials.userId;
         for (i++; i < events.length; i++) {
             var ev = events[i];
             if (!ev.sender || ev.sender.userId != myUserId) {
@@ -734,7 +734,7 @@ var TimelinePanel = React.createClass({
         //
         // a quick way to figure out if we've loaded the relevant event is
         // simply to check if the messagepanel knows where the read-marker is.
-        var ret = this.refs.messagePanel.getReadMarkerPosition();
+        const ret = this.refs.messagePanel.getReadMarkerPosition();
         if (ret !== null) {
             // The messagepanel knows where the RM is, so we must have loaded
             // the relevant event.
@@ -755,13 +755,13 @@ var TimelinePanel = React.createClass({
     forgetReadMarker: function() {
         if (!this.props.manageReadMarkers) return;
 
-        var rmId = this._getCurrentReadReceipt();
+        const rmId = this._getCurrentReadReceipt();
 
         // see if we know the timestamp for the rr event
-        var tl = this.props.timelineSet.getTimelineForEvent(rmId);
-        var rmTs;
+        const tl = this.props.timelineSet.getTimelineForEvent(rmId);
+        let rmTs;
         if (tl) {
-            var event = tl.getEvents().find((e) => { return e.getId() == rmId; });
+            const event = tl.getEvents().find((e) => { return e.getId() == rmId; });
             if (event) {
                 rmTs = event.getTs();
             }
@@ -801,7 +801,7 @@ var TimelinePanel = React.createClass({
         if (!this.props.manageReadMarkers) return null;
         if (!this.refs.messagePanel) return null;
 
-        var ret = this.refs.messagePanel.getReadMarkerPosition();
+        const ret = this.refs.messagePanel.getReadMarkerPosition();
         if (ret !== null) {
             return ret;
         }
@@ -844,8 +844,7 @@ var TimelinePanel = React.createClass({
         // jump to the live timeline on ctrl-end, rather than the end of the
         // timeline window.
         if (ev.ctrlKey && !ev.shiftKey && !ev.altKey && !ev.metaKey &&
-            ev.keyCode == KeyCode.END)
-        {
+            ev.keyCode == KeyCode.END) {
             this.jumpToLiveTimeline();
         } else {
             this.refs.messagePanel.handleScrollKey(ev);
@@ -853,12 +852,12 @@ var TimelinePanel = React.createClass({
     },
 
     _initTimeline: function(props) {
-        var initialEvent = props.eventId;
-        var pixelOffset = props.eventPixelOffset;
+        const initialEvent = props.eventId;
+        const pixelOffset = props.eventPixelOffset;
 
         // if a pixelOffset is given, it is relative to the bottom of the
         // container. If not, put the event in the middle of the container.
-        var offsetBase = 1;
+        let offsetBase = 1;
         if (pixelOffset == null) {
             offsetBase = 0.5;
         }
@@ -887,7 +886,7 @@ var TimelinePanel = React.createClass({
             MatrixClientPeg.get(), this.props.timelineSet,
             {windowLimit: this.props.timelineCap});
 
-        var onLoaded = () => {
+        const onLoaded = () => {
             this._reloadEvents();
 
             // If we switched away from the room while there were pending
@@ -922,15 +921,15 @@ var TimelinePanel = React.createClass({
             });
         };
 
-        var onError = (error) => {
+        const onError = (error) => {
             this.setState({timelineLoading: false});
             console.error(
                 `Error loading timeline panel at ${eventId}: ${error}`,
             );
-            var msg = error.message ? error.message : JSON.stringify(error);
-            var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+            const msg = error.message ? error.message : JSON.stringify(error);
+            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
 
-            var onFinished;
+            let onFinished;
 
             // if we were given an event ID, then when the user closes the
             // dialog, let's jump to the end of the timeline. If we weren't,
@@ -945,7 +944,7 @@ var TimelinePanel = React.createClass({
                     });
                 };
             }
-            var message = (error.errcode == 'M_FORBIDDEN')
+            const message = (error.errcode == 'M_FORBIDDEN')
             	? _t("Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.")
                 : _t("Tried to load a specific point in this room's timeline, but was unable to find it.");
             Modal.createTrackedDialog('Failed to load timeline position', '', ErrorDialog, {
@@ -955,7 +954,7 @@ var TimelinePanel = React.createClass({
             });
         };
 
-        var prom = this._timelineWindow.load(eventId, INITIAL_SIZE);
+        let prom = this._timelineWindow.load(eventId, INITIAL_SIZE);
 
         // if we already have the event in question, TimelineWindow.load
         // returns a resolved promise.
@@ -996,7 +995,7 @@ var TimelinePanel = React.createClass({
 
     // get the list of events from the timeline window and the pending event list
     _getEvents: function() {
-        var events = this._timelineWindow.getEvents();
+        const events = this._timelineWindow.getEvents();
 
         // if we're at the end of the live timeline, append the pending events
         if (!this._timelineWindow.canPaginate(EventTimeline.FORWARDS)) {
@@ -1007,7 +1006,7 @@ var TimelinePanel = React.createClass({
     },
 
     _indexForEventId: function(evId) {
-        for (var i = 0; i < this.state.events.length; ++i) {
+        for (let i = 0; i < this.state.events.length; ++i) {
             if (evId == this.state.events[i].getId()) {
                 return i;
             }
@@ -1017,18 +1016,18 @@ var TimelinePanel = React.createClass({
 
     _getLastDisplayedEventIndex: function(opts) {
         opts = opts || {};
-        var ignoreOwn = opts.ignoreOwn || false;
-        var ignoreEchoes = opts.ignoreEchoes || false;
-        var allowPartial = opts.allowPartial || false;
+        const ignoreOwn = opts.ignoreOwn || false;
+        const ignoreEchoes = opts.ignoreEchoes || false;
+        const allowPartial = opts.allowPartial || false;
 
-        var messagePanel = this.refs.messagePanel;
+        const messagePanel = this.refs.messagePanel;
         if (messagePanel === undefined) return null;
 
-        var wrapperRect = ReactDOM.findDOMNode(messagePanel).getBoundingClientRect();
-        var myUserId = MatrixClientPeg.get().credentials.userId;
+        const wrapperRect = ReactDOM.findDOMNode(messagePanel).getBoundingClientRect();
+        const myUserId = MatrixClientPeg.get().credentials.userId;
 
-        for (var i = this.state.events.length-1; i >= 0; --i) {
-            var ev = this.state.events[i];
+        for (let i = this.state.events.length-1; i >= 0; --i) {
+            const ev = this.state.events[i];
 
             if (ignoreOwn && ev.sender && ev.sender.userId == myUserId) {
                 continue;
@@ -1039,10 +1038,10 @@ var TimelinePanel = React.createClass({
                 continue;
             }
 
-            var node = messagePanel.getNodeForEventId(ev.getId());
+            const node = messagePanel.getNodeForEventId(ev.getId());
             if (!node) continue;
 
-            var boundingRect = node.getBoundingClientRect();
+            const boundingRect = node.getBoundingClientRect();
             if ((allowPartial && boundingRect.top < wrapperRect.bottom) ||
                 (!allowPartial && boundingRect.bottom < wrapperRect.bottom)) {
                 return i;
@@ -1060,18 +1059,18 @@ var TimelinePanel = React.createClass({
      *                                    SDK.
      */
     _getCurrentReadReceipt: function(ignoreSynthesized) {
-        var client = MatrixClientPeg.get();
+        const client = MatrixClientPeg.get();
         // the client can be null on logout
         if (client == null) {
             return null;
         }
 
-        var myUserId = client.credentials.userId;
+        const myUserId = client.credentials.userId;
         return this.props.timelineSet.room.getEventReadUpTo(myUserId, ignoreSynthesized);
     },
 
     _setReadMarker: function(eventId, eventTs, inhibitSetState) {
-        var roomId = this.props.timelineSet.room.roomId;
+        const roomId = this.props.timelineSet.room.roomId;
 
         // don't update the state (and cause a re-render) if there is
         // no change to the RM.
@@ -1096,8 +1095,8 @@ var TimelinePanel = React.createClass({
     },
 
     render: function() {
-        var MessagePanel = sdk.getComponent("structures.MessagePanel");
-        var Loader = sdk.getComponent("elements.Spinner");
+        const MessagePanel = sdk.getComponent("structures.MessagePanel");
+        const Loader = sdk.getComponent("elements.Spinner");
 
         // just show a spinner while the timeline loads.
         //
@@ -1112,7 +1111,7 @@ var TimelinePanel = React.createClass({
         // exist.
         if (this.state.timelineLoading) {
             return (
-                    <div className={ this.props.className + " mx_RoomView_messageListWrapper" }>
+                    <div className={this.props.className + " mx_RoomView_messageListWrapper"}>
                         <Loader />
                     </div>
             );
@@ -1120,7 +1119,7 @@ var TimelinePanel = React.createClass({
 
         if (this.state.events.length == 0 && !this.state.canBackPaginate && this.props.empty) {
             return (
-                    <div className={ this.props.className + " mx_RoomView_messageListWrapper" }>
+                    <div className={this.props.className + " mx_RoomView_messageListWrapper"}>
                         <div className="mx_RoomView_empty">{ this.props.empty }</div>
                     </div>
             );
@@ -1134,7 +1133,7 @@ var TimelinePanel = React.createClass({
         // forwards, otherwise if somebody hits the bottom of the loaded
         // events when viewing historical messages, we get stuck in a loop
         // of paginating our way through the entire history of the room.
-        var stickyBottom = !this._timelineWindow.canPaginate(EventTimeline.FORWARDS);
+        const stickyBottom = !this._timelineWindow.canPaginate(EventTimeline.FORWARDS);
 
         // If the state is PREPARED, we're still waiting for the js-sdk to sync with
         // the HS and fetch the latest events, so we are effectively forward paginating.
@@ -1143,26 +1142,26 @@ var TimelinePanel = React.createClass({
         );
         return (
             <MessagePanel ref="messagePanel"
-                          hidden={ this.props.hidden }
-                          backPaginating={ this.state.backPaginating }
-                          forwardPaginating={ forwardPaginating }
-                          events={ this.state.events }
-                          highlightedEventId={ this.props.highlightedEventId }
-                          readMarkerEventId={ this.state.readMarkerEventId }
-                          readMarkerVisible={ this.state.readMarkerVisible }
-                          suppressFirstDateSeparator={ this.state.canBackPaginate }
-                          showUrlPreview={ this.props.showUrlPreview }
-                          showReadReceipts={ this.props.showReadReceipts }
-                          ourUserId={ MatrixClientPeg.get().credentials.userId }
-                          stickyBottom={ stickyBottom }
-                          onScroll={ this.onMessageListScroll }
-                          onFillRequest={ this.onMessageListFillRequest }
-                          onUnfillRequest={ this.onMessageListUnfillRequest }
-                          opacity={ this.props.opacity }
-                          isTwelveHour={ this.state.isTwelveHour }
-                          alwaysShowTimestamps={ this.state.alwaysShowTimestamps }
-                          className={ this.props.className }
-                          tileShape={ this.props.tileShape }
+                          hidden={this.props.hidden}
+                          backPaginating={this.state.backPaginating}
+                          forwardPaginating={forwardPaginating}
+                          events={this.state.events}
+                          highlightedEventId={this.props.highlightedEventId}
+                          readMarkerEventId={this.state.readMarkerEventId}
+                          readMarkerVisible={this.state.readMarkerVisible}
+                          suppressFirstDateSeparator={this.state.canBackPaginate}
+                          showUrlPreview={this.props.showUrlPreview}
+                          showReadReceipts={this.props.showReadReceipts}
+                          ourUserId={MatrixClientPeg.get().credentials.userId}
+                          stickyBottom={stickyBottom}
+                          onScroll={this.onMessageListScroll}
+                          onFillRequest={this.onMessageListFillRequest}
+                          onUnfillRequest={this.onMessageListUnfillRequest}
+                          opacity={this.props.opacity}
+                          isTwelveHour={this.state.isTwelveHour}
+                          alwaysShowTimestamps={this.state.alwaysShowTimestamps}
+                          className={this.props.className}
+                          tileShape={this.props.tileShape}
             />
         );
     },
diff --git a/src/components/structures/UploadBar.js b/src/components/structures/UploadBar.js
index efb452927d..ca566d3a64 100644
--- a/src/components/structures/UploadBar.js
+++ b/src/components/structures/UploadBar.js
@@ -14,15 +14,15 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-var React = require('react');
-var ContentMessages = require('../../ContentMessages');
-var dis = require('../../dispatcher');
-var filesize = require('filesize');
+const React = require('react');
+const ContentMessages = require('../../ContentMessages');
+const dis = require('../../dispatcher');
+const filesize = require('filesize');
 import { _t } from '../../languageHandler';
 
 module.exports = React.createClass({displayName: 'UploadBar',
     propTypes: {
-        room: React.PropTypes.object
+        room: React.PropTypes.object,
     },
 
     componentDidMount: function() {
@@ -46,7 +46,7 @@ module.exports = React.createClass({displayName: 'UploadBar',
     },
 
     render: function() {
-        var uploads = ContentMessages.getCurrentUploads();
+        const uploads = ContentMessages.getCurrentUploads();
 
         // for testing UI... - also fix up the ContentMessages.getCurrentUploads().length
         // check in RoomView
@@ -62,8 +62,8 @@ module.exports = React.createClass({displayName: 'UploadBar',
             return <div />;
         }
 
-        var upload;
-        for (var i = 0; i < uploads.length; ++i) {
+        let upload;
+        for (let i = 0; i < uploads.length; ++i) {
             if (uploads[i].roomId == this.props.room.roomId) {
                 upload = uploads[i];
                 break;
@@ -73,32 +73,32 @@ module.exports = React.createClass({displayName: 'UploadBar',
             return <div />;
         }
 
-        var innerProgressStyle = {
-            width: ((upload.loaded / (upload.total || 1)) * 100) + '%'
+        const innerProgressStyle = {
+            width: ((upload.loaded / (upload.total || 1)) * 100) + '%',
         };
-        var uploadedSize = filesize(upload.loaded);
-        var totalSize = filesize(upload.total);
+        let uploadedSize = filesize(upload.loaded);
+        const totalSize = filesize(upload.total);
         if (uploadedSize.replace(/^.* /, '') === totalSize.replace(/^.* /, '')) {
             uploadedSize = uploadedSize.replace(/ .*/, '');
         }
 
         // MUST use var name 'count' for pluralization to kick in
-        var uploadText = _t("Uploading %(filename)s and %(count)s others", {filename: upload.fileName, count: (uploads.length - 1)});
+        const uploadText = _t("Uploading %(filename)s and %(count)s others", {filename: upload.fileName, count: (uploads.length - 1)});
 
         return (
             <div className="mx_UploadBar">
                 <div className="mx_UploadBar_uploadProgressOuter">
                     <div className="mx_UploadBar_uploadProgressInner" style={innerProgressStyle}></div>
                 </div>
-                <img className="mx_UploadBar_uploadIcon mx_filterFlipColor" src="img/fileicon.png" width="17" height="22"/>
+                <img className="mx_UploadBar_uploadIcon mx_filterFlipColor" src="img/fileicon.png" width="17" height="22" />
                 <img className="mx_UploadBar_uploadCancel mx_filterFlipColor" src="img/cancel.svg" width="18" height="18"
                     onClick={function() { ContentMessages.cancelUpload(upload.promise); }}
                 />
                 <div className="mx_UploadBar_uploadBytes">
                     { uploadedSize } / { totalSize }
                 </div>
-                <div className="mx_UploadBar_uploadFilename">{uploadText}</div>
+                <div className="mx_UploadBar_uploadFilename">{ uploadText }</div>
             </div>
         );
-    }
+    },
 });
diff --git a/src/components/structures/login/ForgotPassword.js b/src/components/structures/login/ForgotPassword.js
index 1b259a08fd..3e76291d20 100644
--- a/src/components/structures/login/ForgotPassword.js
+++ b/src/components/structures/login/ForgotPassword.js
@@ -17,13 +17,13 @@ limitations under the License.
 
 'use strict';
 
-var React = require('react');
+const React = require('react');
 import { _t } from '../../../languageHandler';
-var sdk = require('../../../index');
-var Modal = require("../../../Modal");
-var MatrixClientPeg = require('../../../MatrixClientPeg');
+const sdk = require('../../../index');
+const Modal = require("../../../Modal");
+const MatrixClientPeg = require('../../../MatrixClientPeg');
 
-var PasswordReset = require("../../../PasswordReset");
+const PasswordReset = require("../../../PasswordReset");
 
 module.exports = React.createClass({
     displayName: 'ForgotPassword',
@@ -35,30 +35,30 @@ module.exports = React.createClass({
         customIsUrl: React.PropTypes.string,
         onLoginClick: React.PropTypes.func,
         onRegisterClick: React.PropTypes.func,
-        onComplete: React.PropTypes.func.isRequired
+        onComplete: React.PropTypes.func.isRequired,
     },
 
     getInitialState: function() {
         return {
             enteredHomeserverUrl: this.props.customHsUrl || this.props.defaultHsUrl,
             enteredIdentityServerUrl: this.props.customIsUrl || this.props.defaultIsUrl,
-            progress: null
+            progress: null,
         };
     },
 
     submitPasswordReset: function(hsUrl, identityUrl, email, password) {
         this.setState({
-            progress: "sending_email"
+            progress: "sending_email",
         });
         this.reset = new PasswordReset(hsUrl, identityUrl);
         this.reset.resetPassword(email, password).done(() => {
             this.setState({
-                progress: "sent_email"
+                progress: "sent_email",
             });
         }, (err) => {
             this.showErrorDialog(_t('Failed to send email') + ": " + err.message);
             this.setState({
-                progress: null
+                progress: null,
             });
         });
     },
@@ -81,15 +81,12 @@ module.exports = React.createClass({
 
         if (!this.state.email) {
             this.showErrorDialog(_t('The email address linked to your account must be entered.'));
-        }
-        else if (!this.state.password || !this.state.password2) {
+        } else if (!this.state.password || !this.state.password2) {
             this.showErrorDialog(_t('A new password must be entered.'));
-        }
-        else if (this.state.password !== this.state.password2) {
+        } else if (this.state.password !== this.state.password2) {
             this.showErrorDialog(_t('New passwords must match each other.'));
-        }
-        else {
-            var QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
+        } else {
+            const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
             Modal.createTrackedDialog('Forgot Password Warning', '', QuestionDialog, {
                 title: _t('Warning!'),
                 description:
@@ -99,7 +96,7 @@ module.exports = React.createClass({
                             'end-to-end encryption keys on all devices, ' +
                             'making encrypted chat history unreadable, ' +
                             'unless you first export your room keys and re-import ' +
-                            'them afterwards. In future this will be improved.'
+                            'them afterwards. In future this will be improved.',
                         ) }
                     </div>,
                 button: _t('Continue'),
@@ -107,13 +104,13 @@ module.exports = React.createClass({
                     <button className="mx_Dialog_primary"
                             onClick={this._onExportE2eKeysClicked}>
                         { _t('Export E2E room keys') }
-                    </button>
+                    </button>,
                 ],
                 onFinished: (confirmed) => {
                     if (confirmed) {
                         this.submitPasswordReset(
                             this.state.enteredHomeserverUrl, this.state.enteredIdentityServerUrl,
-                            this.state.email, this.state.password
+                            this.state.email, this.state.password,
                         );
                     }
                 },
@@ -133,7 +130,7 @@ module.exports = React.createClass({
 
     onInputChanged: function(stateKey, ev) {
         this.setState({
-            [stateKey]: ev.target.value
+            [stateKey]: ev.target.value,
         });
     },
 
@@ -149,7 +146,7 @@ module.exports = React.createClass({
     },
 
     showErrorDialog: function(body, title) {
-        var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+        const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
         Modal.createTrackedDialog('Forgot Password Error', '', ErrorDialog, {
             title: title,
             description: body,
@@ -157,37 +154,34 @@ module.exports = React.createClass({
     },
 
     render: function() {
-        var LoginHeader = sdk.getComponent("login.LoginHeader");
-        var LoginFooter = sdk.getComponent("login.LoginFooter");
-        var ServerConfig = sdk.getComponent("login.ServerConfig");
-        var Spinner = sdk.getComponent("elements.Spinner");
+        const LoginHeader = sdk.getComponent("login.LoginHeader");
+        const LoginFooter = sdk.getComponent("login.LoginFooter");
+        const ServerConfig = sdk.getComponent("login.ServerConfig");
+        const Spinner = sdk.getComponent("elements.Spinner");
 
-        var resetPasswordJsx;
+        let resetPasswordJsx;
 
         if (this.state.progress === "sending_email") {
             resetPasswordJsx = <Spinner />;
-        }
-        else if (this.state.progress === "sent_email") {
+        } else if (this.state.progress === "sent_email") {
             resetPasswordJsx = (
                 <div>
-                    { _t('An email has been sent to') } {this.state.email}. { _t("Once you've followed the link it contains, click below") }.
+                    { _t('An email has been sent to') } { this.state.email }. { _t("Once you've followed the link it contains, click below") }.
                     <br />
                     <input className="mx_Login_submit" type="button" onClick={this.onVerify}
-                        value={ _t('I have verified my email address') } />
+                        value={_t('I have verified my email address')} />
                 </div>
             );
-        }
-        else if (this.state.progress === "complete") {
+        } else if (this.state.progress === "complete") {
             resetPasswordJsx = (
                 <div>
                     <p>{ _t('Your password has been reset') }.</p>
                     <p>{ _t('You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device') }.</p>
                     <input className="mx_Login_submit" type="button" onClick={this.props.onComplete}
-                        value={ _t('Return to login screen') } />
+                        value={_t('Return to login screen')} />
                 </div>
             );
-        }
-        else {
+        } else {
             resetPasswordJsx = (
             <div>
                 <div className="mx_Login_prompt">
@@ -199,21 +193,21 @@ module.exports = React.createClass({
                             name="reset_email" // define a name so browser's password autofill gets less confused
                             value={this.state.email}
                             onChange={this.onInputChanged.bind(this, "email")}
-                            placeholder={ _t('Email address') } autoFocus />
+                            placeholder={_t('Email address')} autoFocus />
                         <br />
                         <input className="mx_Login_field" ref="pass" type="password"
                             name="reset_password"
                             value={this.state.password}
                             onChange={this.onInputChanged.bind(this, "password")}
-                            placeholder={ _t('New password') } />
+                            placeholder={_t('New password')} />
                         <br />
                         <input className="mx_Login_field" ref="pass" type="password"
                             name="reset_password_confirm"
                             value={this.state.password2}
                             onChange={this.onInputChanged.bind(this, "password2")}
-                            placeholder={ _t('Confirm your new password') } />
+                            placeholder={_t('Confirm your new password')} />
                         <br />
-                        <input className="mx_Login_submit" type="submit" value={ _t('Send Reset Email') } />
+                        <input className="mx_Login_submit" type="submit" value={_t('Send Reset Email')} />
                     </form>
                     <ServerConfig ref="serverConfig"
                         withToggleButton={true}
@@ -222,11 +216,11 @@ module.exports = React.createClass({
                         customHsUrl={this.props.customHsUrl}
                         customIsUrl={this.props.customIsUrl}
                         onServerConfigChange={this.onServerConfigChange}
-                        delayTimeMs={0}/>
+                        delayTimeMs={0} />
                     <div className="mx_Login_error">
                     </div>
                     <a className="mx_Login_create" onClick={this.props.onLoginClick} href="#">
-                        {_t('Return to login screen')}
+                        { _t('Return to login screen') }
                     </a>
                     <a className="mx_Login_create" onClick={this.props.onRegisterClick} href="#">
                         { _t('Create an account') }
@@ -242,9 +236,9 @@ module.exports = React.createClass({
             <div className="mx_Login">
                 <div className="mx_Login_box">
                     <LoginHeader />
-                    {resetPasswordJsx}
+                    { resetPasswordJsx }
                 </div>
             </div>
         );
-    }
+    },
 });
diff --git a/src/components/structures/login/Login.js b/src/components/structures/login/Login.js
index b88aa094dc..8ee6eafad4 100644
--- a/src/components/structures/login/Login.js
+++ b/src/components/structures/login/Login.js
@@ -134,7 +134,7 @@ module.exports = React.createClass({
     },
 
     _onLoginAsGuestClick: function() {
-        var self = this;
+        const self = this;
         self.setState({
             busy: true,
             errorText: null,
@@ -156,7 +156,7 @@ module.exports = React.createClass({
             });
         }).finally(function() {
             self.setState({
-                busy: false
+                busy: false,
             });
         }).done();
     },
@@ -183,8 +183,8 @@ module.exports = React.createClass({
     },
 
     onServerConfigChange: function(config) {
-        var self = this;
-        let newState = {
+        const self = this;
+        const newState = {
             errorText: null, // reset err messages
         };
         if (config.hsUrl !== undefined) {
@@ -199,13 +199,13 @@ module.exports = React.createClass({
     },
 
     _initLoginLogic: function(hsUrl, isUrl) {
-        var self = this;
+        const self = this;
         hsUrl = hsUrl || this.state.enteredHomeserverUrl;
         isUrl = isUrl || this.state.enteredIdentityServerUrl;
 
-        var fallbackHsUrl = hsUrl == this.props.defaultHsUrl ? this.props.fallbackHsUrl : null;
+        const fallbackHsUrl = hsUrl == this.props.defaultHsUrl ? this.props.fallbackHsUrl : null;
 
-        var loginLogic = new Login(hsUrl, isUrl, fallbackHsUrl, {
+        const loginLogic = new Login(hsUrl, isUrl, fallbackHsUrl, {
             defaultDeviceDisplayName: this.props.defaultDeviceDisplayName,
         });
         this._loginLogic = loginLogic;
@@ -259,15 +259,15 @@ module.exports = React.createClass({
                     { _tJsx("Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. " +
                             "Either use HTTPS or <a>enable unsafe scripts</a>.",
                       /<a>(.*?)<\/a>/,
-                      (sub) => { return <a href="https://www.google.com/search?&q=enable%20unsafe%20scripts">{ sub }</a>; }
-                    )}
+                      (sub) => { return <a href="https://www.google.com/search?&q=enable%20unsafe%20scripts">{ sub }</a>; },
+                    ) }
                 </span>;
             } else {
                 errorText = <span>
                     { _tJsx("Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.",
                       /<a>(.*?)<\/a>/,
-                      (sub) => { return <a href={this.state.enteredHomeserverUrl}>{ sub }</a>; }
-                    )}
+                      (sub) => { return <a href={this.state.enteredHomeserverUrl}>{ sub }</a>; },
+                    ) }
                 </span>;
             }
         }
@@ -304,7 +304,7 @@ module.exports = React.createClass({
                 }
                 return (
                     <div>
-                    { _t('Sorry, this homeserver is using a login which is not recognised ')}({step})
+                    { _t('Sorry, this homeserver is using a login which is not recognised ') }({ step })
                     </div>
                 );
         }
@@ -334,19 +334,19 @@ module.exports = React.createClass({
         const ServerConfig = sdk.getComponent("login.ServerConfig");
         const loader = this.state.busy ? <div className="mx_Login_loader"><Loader /></div> : null;
 
-        var loginAsGuestJsx;
+        let loginAsGuestJsx;
         if (this.props.enableGuest) {
             loginAsGuestJsx =
                 <a className="mx_Login_create" onClick={this._onLoginAsGuestClick} href="#">
-                    { _t('Login as guest')}
+                    { _t('Login as guest') }
                 </a>;
         }
 
-        var returnToAppJsx;
+        let returnToAppJsx;
         if (this.props.onCancelClick) {
             returnToAppJsx =
                 <a className="mx_Login_create" onClick={this.props.onCancelClick} href="#">
-                    { _t('Return to app')}
+                    { _t('Return to app') }
                 </a>;
         }
 
@@ -355,7 +355,7 @@ module.exports = React.createClass({
                 <div className="mx_Login_box">
                     <LoginHeader />
                     <div>
-                        <h2>{ _t('Sign in')}
+                        <h2>{ _t('Sign in') }
                             { loader }
                         </h2>
                         { this.componentForStep(this.state.currentFlow) }
@@ -366,12 +366,12 @@ module.exports = React.createClass({
                             defaultHsUrl={this.props.defaultHsUrl}
                             defaultIsUrl={this.props.defaultIsUrl}
                             onServerConfigChange={this.onServerConfigChange}
-                            delayTimeMs={1000}/>
+                            delayTimeMs={1000} />
                         <div className="mx_Login_error">
                                 { this.state.errorText }
                         </div>
                         <a className="mx_Login_create" onClick={this.props.onRegisterClick} href="#">
-                            { _t('Create an account')}
+                            { _t('Create an account') }
                         </a>
                         { loginAsGuestJsx }
                         { returnToAppJsx }
@@ -381,5 +381,5 @@ module.exports = React.createClass({
                 </div>
             </div>
         );
-    }
+    },
 });
diff --git a/src/components/structures/login/PostRegistration.js b/src/components/structures/login/PostRegistration.js
index c27eee98d4..194995150c 100644
--- a/src/components/structures/login/PostRegistration.js
+++ b/src/components/structures/login/PostRegistration.js
@@ -25,14 +25,14 @@ module.exports = React.createClass({
     displayName: 'PostRegistration',
 
     propTypes: {
-        onComplete: React.PropTypes.func.isRequired
+        onComplete: React.PropTypes.func.isRequired,
     },
 
     getInitialState: function() {
         return {
             avatarUrl: null,
             errorString: null,
-            busy: false
+            busy: false,
         };
     },
 
@@ -40,26 +40,26 @@ module.exports = React.createClass({
         // There is some assymetry between ChangeDisplayName and ChangeAvatar,
         // as ChangeDisplayName will auto-get the name but ChangeAvatar expects
         // the URL to be passed to you (because it's also used for room avatars).
-        var cli = MatrixClientPeg.get();
+        const cli = MatrixClientPeg.get();
         this.setState({busy: true});
-        var self = this;
+        const self = this;
         cli.getProfileInfo(cli.credentials.userId).done(function(result) {
             self.setState({
                 avatarUrl: MatrixClientPeg.get().mxcUrlToHttp(result.avatar_url),
-                busy: false
+                busy: false,
             });
         }, function(error) {
             self.setState({
                 errorString: _t("Failed to fetch avatar URL"),
-                busy: false
+                busy: false,
             });
         });
     },
 
     render: function() {
-        var ChangeDisplayName = sdk.getComponent('settings.ChangeDisplayName');
-        var ChangeAvatar = sdk.getComponent('settings.ChangeAvatar');
-        var LoginHeader = sdk.getComponent('login.LoginHeader');
+        const ChangeDisplayName = sdk.getComponent('settings.ChangeDisplayName');
+        const ChangeAvatar = sdk.getComponent('settings.ChangeAvatar');
+        const LoginHeader = sdk.getComponent('login.LoginHeader');
         return (
             <div className="mx_Login">
                 <div className="mx_Login_box">
@@ -71,10 +71,10 @@ module.exports = React.createClass({
                         <ChangeAvatar
                             initialAvatarUrl={this.state.avatarUrl} />
                         <button onClick={this.props.onComplete}>{ _t('Continue') }</button>
-                        {this.state.errorString}
+                        { this.state.errorString }
                     </div>
                 </div>
             </div>
         );
-    }
+    },
 });
diff --git a/src/components/structures/login/Registration.js b/src/components/structures/login/Registration.js
index fe05ba4cfd..db488ea237 100644
--- a/src/components/structures/login/Registration.js
+++ b/src/components/structures/login/Registration.js
@@ -57,7 +57,7 @@ module.exports = React.createClass({
 
         // registration shouldn't know or care how login is done.
         onLoginClick: React.PropTypes.func.isRequired,
-        onCancelClick: React.PropTypes.func
+        onCancelClick: React.PropTypes.func,
     },
 
     getInitialState: function() {
@@ -121,7 +121,7 @@ module.exports = React.createClass({
     },
 
     onServerConfigChange: function(config) {
-        let newState = {};
+        const newState = {};
         if (config.hsUrl !== undefined) {
             newState.hsUrl = config.hsUrl;
         }
@@ -195,7 +195,7 @@ module.exports = React.createClass({
 
                 this._rtsClient.getTeam(teamToken).then((team) => {
                     console.log(
-                        `User successfully registered with team ${team.name}`
+                        `User successfully registered with team ${team.name}`,
                     );
                     if (!team.rooms) {
                         return;
@@ -223,7 +223,7 @@ module.exports = React.createClass({
                 deviceId: response.device_id,
                 homeserverUrl: this._matrixClient.getHomeserverUrl(),
                 identityServerUrl: this._matrixClient.getIdentityServerUrl(),
-                accessToken: response.access_token
+                accessToken: response.access_token,
             }, teamToken);
         }).then((cli) => {
             return this._setupPushers(cli);
@@ -253,7 +253,7 @@ module.exports = React.createClass({
     },
 
     onFormValidationFailed: function(errCode) {
-        var errMsg;
+        let errMsg;
         switch (errCode) {
             case "RegistrationForm.ERR_PASSWORD_MISSING":
                 errMsg = _t('Missing password.');
@@ -282,7 +282,7 @@ module.exports = React.createClass({
                 break;
         }
         this.setState({
-            errorText: errMsg
+            errorText: errMsg,
         });
     },
 
@@ -316,7 +316,7 @@ module.exports = React.createClass({
             emailAddress: this.state.formVals.email,
             phoneCountry: this.state.formVals.phoneCountry,
             phoneNumber: this.state.formVals.phoneNumber,
-        }
+        };
     },
 
     render: function() {
@@ -346,7 +346,7 @@ module.exports = React.createClass({
         } else {
             let errorSection;
             if (this.state.errorText) {
-                errorSection = <div className="mx_Login_error">{this.state.errorText}</div>;
+                errorSection = <div className="mx_Login_error">{ this.state.errorText }</div>;
             }
             registerBody = (
                 <div>
@@ -362,7 +362,7 @@ module.exports = React.createClass({
                         onRegisterClick={this.onFormSubmit}
                         onTeamSelected={this.onTeamSelected}
                     />
-                    {errorSection}
+                    { errorSection }
                     <ServerConfig ref="serverConfig"
                         withToggleButton={true}
                         customHsUrl={this.props.customHsUrl}
@@ -380,7 +380,7 @@ module.exports = React.createClass({
         if (this.props.onCancelClick) {
             returnToAppJsx = (
                 <a className="mx_Login_create" onClick={this.props.onCancelClick} href="#">
-                    {_t('Return to app')}
+                    { _t('Return to app') }
                 </a>
             );
         }
@@ -393,15 +393,15 @@ module.exports = React.createClass({
                             this.state.teamSelected.domain + "/icon.png" :
                             null}
                     />
-                    <h2>{_t('Create an account')}</h2>
-                    {registerBody}
+                    <h2>{ _t('Create an account') }</h2>
+                    { registerBody }
                     <a className="mx_Login_create" onClick={this.props.onLoginClick} href="#">
-                        {_t('I already have an account')}
+                        { _t('I already have an account') }
                     </a>
-                    {returnToAppJsx}
+                    { returnToAppJsx }
                     <LoginFooter />
                 </div>
             </div>
         );
-    }
+    },
 });
diff --git a/src/components/views/avatars/BaseAvatar.js b/src/components/views/avatars/BaseAvatar.js
index e88fc869fa..addb637796 100644
--- a/src/components/views/avatars/BaseAvatar.js
+++ b/src/components/views/avatars/BaseAvatar.js
@@ -32,7 +32,7 @@ module.exports = React.createClass({
         height: React.PropTypes.number,
         // XXX resizeMethod not actually used.
         resizeMethod: React.PropTypes.string,
-        defaultToInitialLetter: React.PropTypes.bool // true to add default url
+        defaultToInitialLetter: React.PropTypes.bool, // true to add default url
     },
 
     getDefaultProps: function() {
@@ -40,7 +40,7 @@ module.exports = React.createClass({
             width: 40,
             height: 40,
             resizeMethod: 'crop',
-            defaultToInitialLetter: true
+            defaultToInitialLetter: true,
         };
     },
 
@@ -50,15 +50,14 @@ module.exports = React.createClass({
 
     componentWillReceiveProps: function(nextProps) {
         // work out if we need to call setState (if the image URLs array has changed)
-        var newState = this._getState(nextProps);
-        var newImageUrls = newState.imageUrls;
-        var oldImageUrls = this.state.imageUrls;
+        const newState = this._getState(nextProps);
+        const newImageUrls = newState.imageUrls;
+        const oldImageUrls = this.state.imageUrls;
         if (newImageUrls.length !== oldImageUrls.length) {
             this.setState(newState); // detected a new entry
-        }
-        else {
+        } else {
             // check each one to see if they are the same
-            for (var i = 0; i < newImageUrls.length; i++) {
+            for (let i = 0; i < newImageUrls.length; i++) {
                 if (oldImageUrls[i] !== newImageUrls[i]) {
                     this.setState(newState); // detected a diff
                     break;
@@ -71,31 +70,31 @@ module.exports = React.createClass({
         // work out the full set of urls to try to load. This is formed like so:
         // imageUrls: [ props.url, props.urls, default image ]
 
-        var urls = props.urls || [];
+        const urls = props.urls || [];
         if (props.url) {
             urls.unshift(props.url); // put in urls[0]
         }
 
-        var defaultImageUrl = null;
+        let defaultImageUrl = null;
         if (props.defaultToInitialLetter) {
             defaultImageUrl = AvatarLogic.defaultAvatarUrlForString(
-                props.idName || props.name
+                props.idName || props.name,
             );
             urls.push(defaultImageUrl); // lowest priority
         }
         return {
             imageUrls: urls,
             defaultImageUrl: defaultImageUrl,
-            urlsIndex: 0
+            urlsIndex: 0,
         };
     },
 
     onError: function(ev) {
-        var nextIndex = this.state.urlsIndex + 1;
+        const nextIndex = this.state.urlsIndex + 1;
         if (nextIndex < this.state.imageUrls.length) {
             // try the next one
             this.setState({
-                urlsIndex: nextIndex
+                urlsIndex: nextIndex,
             });
         }
     },
@@ -109,32 +108,32 @@ module.exports = React.createClass({
             return undefined;
         }
 
-        var idx = 0;
-        var initial = name[0];
+        let idx = 0;
+        const initial = name[0];
         if ((initial === '@' || initial === '#') && name[1]) {
             idx++;
         }
 
         // string.codePointAt(0) would do this, but that isn't supported by
         // some browsers (notably PhantomJS).
-        var chars = 1;
-        var first = name.charCodeAt(idx);
+        let chars = 1;
+        const first = name.charCodeAt(idx);
 
         // check if it’s the start of a surrogate pair
         if (first >= 0xD800 && first <= 0xDBFF && name[idx+1]) {
-            var second = name.charCodeAt(idx+1);
+            const second = name.charCodeAt(idx+1);
             if (second >= 0xDC00 && second <= 0xDFFF) {
                 chars++;
             }
         }
 
-        var firstChar = name.substring(idx, idx+chars);
+        const firstChar = name.substring(idx, idx+chars);
         return firstChar.toUpperCase();
     },
 
     render: function() {
         const EmojiText = sdk.getComponent('elements.EmojiText');
-        var imageUrl = this.state.imageUrls[this.state.urlsIndex];
+        const imageUrl = this.state.imageUrls[this.state.urlsIndex];
 
         const {
             name, idName, title, url, urls, width, height, resizeMethod,
@@ -150,7 +149,7 @@ module.exports = React.createClass({
                     width: width + "px",
                     lineHeight: height + "px" }}
                 >
-                    {initialLetter}
+                    { initialLetter }
                 </EmojiText>
             );
             const imgNode = (
@@ -163,15 +162,15 @@ module.exports = React.createClass({
                     <AccessibleButton element='span' className="mx_BaseAvatar"
                         onClick={onClick} {...otherProps}
                     >
-                        {textNode}
-                        {imgNode}
+                        { textNode }
+                        { imgNode }
                     </AccessibleButton>
                 );
             } else {
                 return (
                     <span className="mx_BaseAvatar" {...otherProps}>
-                        {textNode}
-                        {imgNode}
+                        { textNode }
+                        { imgNode }
                     </span>
                 );
             }
@@ -196,5 +195,5 @@ module.exports = React.createClass({
                     {...otherProps} />
             );
         }
-    }
+    },
 });
diff --git a/src/components/views/avatars/MemberAvatar.js b/src/components/views/avatars/MemberAvatar.js
index 9fb522a5f1..89047cd69c 100644
--- a/src/components/views/avatars/MemberAvatar.js
+++ b/src/components/views/avatars/MemberAvatar.js
@@ -16,9 +16,9 @@ limitations under the License.
 
 'use strict';
 
-var React = require('react');
-var Avatar = require('../../../Avatar');
-var sdk = require("../../../index");
+const React = require('react');
+const Avatar = require('../../../Avatar');
+const sdk = require("../../../index");
 const dispatcher = require("../../../dispatcher");
 
 module.exports = React.createClass({
@@ -63,14 +63,14 @@ module.exports = React.createClass({
             imageUrl: Avatar.avatarUrlForMember(props.member,
                                          props.width,
                                          props.height,
-                                         props.resizeMethod)
+                                         props.resizeMethod),
         };
     },
 
     render: function() {
-        var BaseAvatar = sdk.getComponent("avatars.BaseAvatar");
+        const BaseAvatar = sdk.getComponent("avatars.BaseAvatar");
 
-        var {member, onClick, viewUserOnClick, ...otherProps} = this.props;
+        let {member, onClick, viewUserOnClick, ...otherProps} = this.props;
 
         if (viewUserOnClick) {
             onClick = () => {
@@ -83,7 +83,7 @@ module.exports = React.createClass({
 
         return (
             <BaseAvatar {...otherProps} name={this.state.name} title={this.state.title}
-                idName={member.userId} url={this.state.imageUrl} onClick={onClick}/>
+                idName={member.userId} url={this.state.imageUrl} onClick={onClick} />
         );
-    }
+    },
 });
diff --git a/src/components/views/create_room/CreateRoomButton.js b/src/components/views/create_room/CreateRoomButton.js
index 8f0368d690..8a5f00d942 100644
--- a/src/components/views/create_room/CreateRoomButton.js
+++ b/src/components/views/create_room/CreateRoomButton.js
@@ -36,7 +36,7 @@ module.exports = React.createClass({
 
     render: function() {
         return (
-            <button className="mx_CreateRoomButton" onClick={this.onClick}>{_t("Create Room")}</button>
+            <button className="mx_CreateRoomButton" onClick={this.onClick}>{ _t("Create Room") }</button>
         );
-    }
+    },
 });
diff --git a/src/components/views/create_room/Presets.js b/src/components/views/create_room/Presets.js
index c4d7ca0cdb..2073896d87 100644
--- a/src/components/views/create_room/Presets.js
+++ b/src/components/views/create_room/Presets.js
@@ -16,10 +16,10 @@ limitations under the License.
 
 'use strict';
 
-var React = require('react');
+const React = require('react');
 import { _t } from '../../../languageHandler';
 
-var Presets = {
+const Presets = {
     PrivateChat: "private_chat",
     PublicChat: "public_chat",
     Custom: "custom",
@@ -29,7 +29,7 @@ module.exports = React.createClass({
     displayName: 'CreateRoomPresets',
     propTypes: {
         onChange: React.PropTypes.func,
-        preset: React.PropTypes.string
+        preset: React.PropTypes.string,
     },
 
     Presets: Presets,
@@ -47,10 +47,10 @@ module.exports = React.createClass({
     render: function() {
         return (
             <select className="mx_Presets" onChange={this.onValueChanged} value={this.props.preset}>
-                <option value={this.Presets.PrivateChat}>{_t("Private Chat")}</option>
-                <option value={this.Presets.PublicChat}>{_t("Public Chat")}</option>
-                <option value={this.Presets.Custom}>{_t("Custom")}</option>
+                <option value={this.Presets.PrivateChat}>{ _t("Private Chat") }</option>
+                <option value={this.Presets.PublicChat}>{ _t("Public Chat") }</option>
+                <option value={this.Presets.Custom}>{ _t("Custom") }</option>
             </select>
         );
-    }
+    },
 });
diff --git a/src/components/views/create_room/RoomAlias.js b/src/components/views/create_room/RoomAlias.js
index e1cb7e4094..d4228a8bca 100644
--- a/src/components/views/create_room/RoomAlias.js
+++ b/src/components/views/create_room/RoomAlias.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-var React = require('react');
+const React = require('react');
 import { _t } from '../../../languageHandler';
 
 module.exports = React.createClass({
@@ -35,10 +35,10 @@ module.exports = React.createClass({
     },
 
     getAliasLocalpart: function() {
-        var room_alias = this.props.alias;
+        let room_alias = this.props.alias;
 
         if (room_alias && this.props.homeserver) {
-            var suffix = ":" + this.props.homeserver;
+            const suffix = ":" + this.props.homeserver;
             if (room_alias.startsWith("#") && room_alias.endsWith(suffix)) {
                 room_alias = room_alias.slice(1, -suffix.length);
             }
@@ -52,22 +52,22 @@ module.exports = React.createClass({
     },
 
     onFocus: function(ev) {
-        var target = ev.target;
-        var curr_val = ev.target.value;
+        const target = ev.target;
+        const curr_val = ev.target.value;
 
         if (this.props.homeserver) {
             if (curr_val == "") {
-                var self = this;
+                const self = this;
                 setTimeout(function() {
                     target.value = "#:" + self.props.homeserver;
                     target.setSelectionRange(1, 1);
                 }, 0);
             } else {
-                var suffix = ":" + this.props.homeserver;
+                const suffix = ":" + this.props.homeserver;
                 setTimeout(function() {
                     target.setSelectionRange(
                         curr_val.startsWith("#") ? 1 : 0,
-                        curr_val.endsWith(suffix) ? (target.value.length - suffix.length) : target.value.length
+                        curr_val.endsWith(suffix) ? (target.value.length - suffix.length) : target.value.length,
                     );
                 }, 0);
             }
@@ -75,7 +75,7 @@ module.exports = React.createClass({
     },
 
     onBlur: function(ev) {
-        var curr_val = ev.target.value;
+        const curr_val = ev.target.value;
 
         if (this.props.homeserver) {
             if (curr_val == "#:" + this.props.homeserver) {
@@ -84,8 +84,8 @@ module.exports = React.createClass({
             }
 
             if (curr_val != "") {
-                var new_val = ev.target.value;
-                var suffix = ":" + this.props.homeserver;
+                let new_val = ev.target.value;
+                const suffix = ":" + this.props.homeserver;
                 if (!curr_val.startsWith("#")) new_val = "#" + new_val;
                 if (!curr_val.endsWith(suffix)) new_val = new_val + suffix;
                 ev.target.value = new_val;
@@ -97,7 +97,7 @@ module.exports = React.createClass({
         return (
             <input type="text" className="mx_RoomAlias" placeholder={_t("Alias (optional)")}
                 onChange={this.onValueChanged} onFocus={this.onFocus} onBlur={this.onBlur}
-                value={this.props.alias}/>
+                value={this.props.alias} />
         );
-    }
+    },
 });
diff --git a/src/components/views/dialogs/ChatCreateOrReuseDialog.js b/src/components/views/dialogs/ChatCreateOrReuseDialog.js
index c3b0915ab4..e0578f3b53 100644
--- a/src/components/views/dialogs/ChatCreateOrReuseDialog.js
+++ b/src/components/views/dialogs/ChatCreateOrReuseDialog.js
@@ -155,7 +155,7 @@ export default class ChatCreateOrReuseDialog extends React.Component {
                         width={48} height={48}
                     />
                     <div className="mx_ChatCreateOrReuseDialog_profile_name">
-                        {this.state.profile.displayName || this.props.userId}
+                        { this.state.profile.displayName || this.props.userId }
                     </div>
                 </div>;
             }
@@ -177,7 +177,7 @@ export default class ChatCreateOrReuseDialog extends React.Component {
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
         return (
             <BaseDialog className='mx_ChatCreateOrReuseDialog'
-                onFinished={ this.props.onFinished.bind(false) }
+                onFinished={this.props.onFinished.bind(false)}
                 title={title}
             >
                 { content }
diff --git a/src/components/views/dialogs/DeactivateAccountDialog.js b/src/components/views/dialogs/DeactivateAccountDialog.js
index 0ee264b69b..c45e072d72 100644
--- a/src/components/views/dialogs/DeactivateAccountDialog.js
+++ b/src/components/views/dialogs/DeactivateAccountDialog.js
@@ -83,7 +83,7 @@ export default class DeactivateAccountDialog extends React.Component {
         let error = null;
         if (this.state.errStr) {
             error = <div className="error">
-                {this.state.errStr}
+                { this.state.errStr }
             </div>;
             passwordBoxClass = 'error';
         }
@@ -94,30 +94,30 @@ export default class DeactivateAccountDialog extends React.Component {
         let cancelButton = null;
         if (!this.state.busy) {
             cancelButton = <button onClick={this._onCancel} autoFocus={true}>
-                {_t("Cancel")}
+                { _t("Cancel") }
             </button>;
         }
 
         return (
             <div className="mx_DeactivateAccountDialog">
                 <div className="mx_Dialog_title danger">
-                    {_t("Deactivate Account")}
+                    { _t("Deactivate Account") }
                 </div>
                 <div className="mx_Dialog_content">
-                    <p>{_t("This will make your account permanently unusable. You will not be able to re-register the same user ID.")}</p>
+                    <p>{ _t("This will make your account permanently unusable. You will not be able to re-register the same user ID.") }</p>
 
-                    <p>{_t("This action is irreversible.")}</p>
+                    <p>{ _t("This action is irreversible.") }</p>
 
-                    <p>{_t("To continue, please enter your password.")}</p>
+                    <p>{ _t("To continue, please enter your password.") }</p>
 
-                    <p>{_t("Password")}:</p>
+                    <p>{ _t("Password") }:</p>
                     <input
                         type="password"
                         onChange={this._onPasswordFieldChange}
                         ref={(e) => {this._passwordField = e;}}
                         className={passwordBoxClass}
                     />
-                    {error}
+                    { error }
                 </div>
                 <div className="mx_Dialog_buttons">
                     <button
@@ -125,10 +125,10 @@ export default class DeactivateAccountDialog extends React.Component {
                         onClick={this._onOk}
                         disabled={!okEnabled}
                     >
-                        {okLabel}
+                        { okLabel }
                     </button>
 
-                    {cancelButton}
+                    { cancelButton }
                 </div>
             </div>
         );
diff --git a/src/components/views/dialogs/InteractiveAuthDialog.js b/src/components/views/dialogs/InteractiveAuthDialog.js
index 363ce89b57..59de7c7f59 100644
--- a/src/components/views/dialogs/InteractiveAuthDialog.js
+++ b/src/components/views/dialogs/InteractiveAuthDialog.js
@@ -48,7 +48,7 @@ export default React.createClass({
     getInitialState: function() {
         return {
             authError: null,
-        }
+        };
     },
 
     _onAuthFinished: function(success, result) {
@@ -73,12 +73,12 @@ export default React.createClass({
         if (this.state.authError) {
             content = (
                 <div>
-                    <div>{this.state.authError.message || this.state.authError.toString()}</div>
+                    <div>{ this.state.authError.message || this.state.authError.toString() }</div>
                     <br />
                     <AccessibleButton onClick={this._onDismissClick}
                         className="mx_UserSettings_button"
                     >
-                        {_t("Dismiss")}
+                        { _t("Dismiss") }
                     </AccessibleButton>
                 </div>
             );
@@ -100,7 +100,7 @@ export default React.createClass({
                 onFinished={this.props.onFinished}
                 title={this.state.authError ? 'Error' : (this.props.title || _t('Authentication'))}
             >
-                {content}
+                { content }
             </BaseDialog>
         );
     },
diff --git a/src/components/views/dialogs/UnknownDeviceDialog.js b/src/components/views/dialogs/UnknownDeviceDialog.js
index 6ebd0c3efc..ee8f307f76 100644
--- a/src/components/views/dialogs/UnknownDeviceDialog.js
+++ b/src/components/views/dialogs/UnknownDeviceDialog.js
@@ -28,9 +28,9 @@ function DeviceListEntry(props) {
 
     return (
         <li>
-            <DeviceVerifyButtons device={ device } userId={ userId } />
+            <DeviceVerifyButtons device={device} userId={userId} />
             { device.deviceId }
-            <br/>
+            <br />
             { device.getDisplayName() }
         </li>
     );
@@ -48,13 +48,13 @@ function UserUnknownDeviceList(props) {
     const {userId, userDevices} = props;
 
     const deviceListEntries = Object.keys(userDevices).map((deviceId) =>
-       <DeviceListEntry key={ deviceId } userId={ userId }
-           device={ userDevices[deviceId] } />,
+       <DeviceListEntry key={deviceId} userId={userId}
+           device={userDevices[deviceId]} />,
     );
 
     return (
         <ul className="mx_UnknownDeviceDialog_deviceList">
-            {deviceListEntries}
+            { deviceListEntries }
         </ul>
     );
 }
@@ -71,13 +71,13 @@ function UnknownDeviceList(props) {
     const {devices} = props;
 
     const userListEntries = Object.keys(devices).map((userId) =>
-        <li key={ userId }>
+        <li key={userId}>
             <p>{ userId }:</p>
-            <UserUnknownDeviceList userId={ userId } userDevices={ devices[userId] } />
+            <UserUnknownDeviceList userId={userId} userDevices={devices[userId]} />
         </li>,
     );
 
-    return <ul>{userListEntries}</ul>;
+    return <ul>{ userListEntries }</ul>;
 }
 
 UnknownDeviceList.propTypes = {
@@ -120,17 +120,17 @@ export default React.createClass({
         if (blacklistUnverified) {
             warning = (
                 <h4>
-                    {_t("You are currently blacklisting unverified devices; to send " +
-                    "messages to these devices you must verify them.")}
+                    { _t("You are currently blacklisting unverified devices; to send " +
+                    "messages to these devices you must verify them.") }
                 </h4>
             );
         } else {
             warning = (
                 <div>
                     <p>
-                        {_t("We recommend you go through the verification process " +
+                        { _t("We recommend you go through the verification process " +
                             "for each device to confirm they belong to their legitimate owner, " +
-                            "but you can resend the message without verifying if you prefer.")}
+                            "but you can resend the message without verifying if you prefer.") }
                     </p>
                 </div>
             );
@@ -149,22 +149,22 @@ export default React.createClass({
             >
                 <GeminiScrollbar autoshow={false} className="mx_Dialog_content">
                     <h4>
-                        {_t('"%(RoomName)s" contains devices that you haven\'t seen before.', {RoomName: this.props.room.name})}
+                        { _t('"%(RoomName)s" contains devices that you haven\'t seen before.', {RoomName: this.props.room.name}) }
                     </h4>
                     { warning }
-                    {_t("Unknown devices")}:
+                    { _t("Unknown devices") }:
 
                     <UnknownDeviceList devices={this.props.devices} />
                 </GeminiScrollbar>
                 <div className="mx_Dialog_buttons">
-                    <button className="mx_Dialog_primary" autoFocus={ true }
+                    <button className="mx_Dialog_primary" autoFocus={true}
                             onClick={() => {
                                 this.props.onFinished();
                                 Resend.resendUnsentEvents(this.props.room);
                             }}>
-                        {_t("Send anyway")}
+                        { _t("Send anyway") }
                     </button>
-                    <button className="mx_Dialog_primary" autoFocus={ true }
+                    <button className="mx_Dialog_primary" autoFocus={true}
                             onClick={() => {
                                 // XXX: temporary logging to try to diagnose
                                 // https://github.com/vector-im/riot-web/issues/3148
diff --git a/src/components/views/elements/AccessibleButton.js b/src/components/views/elements/AccessibleButton.js
index ce58b6d5cf..794e0a4dd7 100644
--- a/src/components/views/elements/AccessibleButton.js
+++ b/src/components/views/elements/AccessibleButton.js
@@ -32,7 +32,7 @@ export default function AccessibleButton(props) {
     };
     restProps.tabIndex = restProps.tabIndex || "0";
     restProps.role = "button";
-    restProps.className = (restProps.className ? restProps.className + " " : "") + 
+    restProps.className = (restProps.className ? restProps.className + " " : "") +
                           "mx_AccessibleButton";
     return React.createElement(element, restProps, children);
 }
diff --git a/src/components/views/elements/ActionButton.js b/src/components/views/elements/ActionButton.js
index b1fa71829b..cfd31fe213 100644
--- a/src/components/views/elements/ActionButton.js
+++ b/src/components/views/elements/ActionButton.js
@@ -79,8 +79,8 @@ export default React.createClass({
                 onMouseLeave={this._onMouseLeave}
             >
                 <TintableSvg src={this.props.iconPath} width={this.props.size} height={this.props.size} />
-                {tooltip}
+                { tooltip }
             </AccessibleButton>
         );
-    }
+    },
 });
diff --git a/src/components/views/elements/AddressSelector.js b/src/components/views/elements/AddressSelector.js
index 75fe650600..9a8cd34867 100644
--- a/src/components/views/elements/AddressSelector.js
+++ b/src/components/views/elements/AddressSelector.js
@@ -46,8 +46,8 @@ export default React.createClass({
 
     componentWillReceiveProps: function(props) {
         // Make sure the selected item isn't outside the list bounds
-        var selected = this.state.selected;
-        var maxSelected = this._maxSelected(props.addressList);
+        const selected = this.state.selected;
+        const maxSelected = this._maxSelected(props.addressList);
         if (selected > maxSelected) {
             this.setState({ selected: maxSelected });
         }
@@ -57,7 +57,7 @@ export default React.createClass({
         // As the user scrolls with the arrow keys keep the selected item
         // at the top of the window.
         if (this.scrollElement && this.props.addressList.length > 0 && !this.state.hover) {
-            var elementHeight = this.addressListElement.getBoundingClientRect().height;
+            const elementHeight = this.addressListElement.getBoundingClientRect().height;
             this.scrollElement.scrollTop = (this.state.selected * elementHeight) - elementHeight;
         }
     },
@@ -75,7 +75,7 @@ export default React.createClass({
         if (this.state.selected > 0) {
             this.setState({
                 selected: this.state.selected - 1,
-                hover : false,
+                hover: false,
             });
         }
     },
@@ -84,7 +84,7 @@ export default React.createClass({
         if (this.state.selected < this._maxSelected(this.props.addressList)) {
             this.setState({
                 selected: this.state.selected + 1,
-                hover : false,
+                hover: false,
             });
         }
     },
@@ -105,7 +105,7 @@ export default React.createClass({
     },
 
     onMouseLeave: function() {
-        this.setState({ hover : false });
+        this.setState({ hover: false });
     },
 
     selectAddress: function(index) {
@@ -117,15 +117,15 @@ export default React.createClass({
     },
 
     createAddressListTiles: function() {
-        var self = this;
-        var AddressTile = sdk.getComponent("elements.AddressTile");
-        var maxSelected = this._maxSelected(this.props.addressList);
-        var addressList = [];
+        const self = this;
+        const AddressTile = sdk.getComponent("elements.AddressTile");
+        const maxSelected = this._maxSelected(this.props.addressList);
+        const addressList = [];
 
         // Only create the address elements if there are address
         if (this.props.addressList.length > 0) {
-            for (var i = 0; i <= maxSelected; i++) {
-                var classes = classNames({
+            for (let i = 0; i <= maxSelected; i++) {
+                const classes = classNames({
                     "mx_AddressSelector_addressListElement": true,
                     "mx_AddressSelector_selected": this.state.selected === i,
                 });
@@ -143,7 +143,7 @@ export default React.createClass({
                         ref={(ref) => { this.addressListElement = ref; }}
                     >
                         <AddressTile address={this.props.addressList[i]} justified={true} networkName="vector" networkUrl="img/search-icon-vector.svg" />
-                    </div>
+                    </div>,
                 );
             }
         }
@@ -151,13 +151,13 @@ export default React.createClass({
     },
 
     _maxSelected: function(list) {
-        var listSize = list.length === 0 ? 0 : list.length - 1;
-        var maxSelected = listSize > (this.props.truncateAt - 1) ? (this.props.truncateAt - 1) : listSize;
+        const listSize = list.length === 0 ? 0 : list.length - 1;
+        const maxSelected = listSize > (this.props.truncateAt - 1) ? (this.props.truncateAt - 1) : listSize;
         return maxSelected;
     },
 
     render: function() {
-        var classes = classNames({
+        const classes = classNames({
             "mx_AddressSelector": true,
             "mx_AddressSelector_empty": this.props.addressList.length === 0,
         });
@@ -168,5 +168,5 @@ export default React.createClass({
                 { this.createAddressListTiles() }
             </div>
         );
-    }
+    },
 });
diff --git a/src/components/views/elements/AddressTile.js b/src/components/views/elements/AddressTile.js
index 612f2956eb..a61cbbc794 100644
--- a/src/components/views/elements/AddressTile.js
+++ b/src/components/views/elements/AddressTile.js
@@ -107,24 +107,24 @@ export default React.createClass({
 
             let nameNode = null;
             if (address.displayName) {
-                nameNode = <div className={nameClasses}>{ address.displayName }</div>
+                nameNode = <div className={nameClasses}>{ address.displayName }</div>;
             }
 
             info = (
                 <div className="mx_AddressTile_mx">
                     <div className={emailClasses}>{ address.address }</div>
-                    {nameNode}
+                    { nameNode }
                 </div>
             );
         } else {
             error = true;
-            var unknownClasses = classNames({
+            const unknownClasses = classNames({
                 "mx_AddressTile_unknown": true,
                 "mx_AddressTile_justified": this.props.justified,
             });
 
             info = (
-                <div className={unknownClasses}>{_t("Unknown Address")}</div>
+                <div className={unknownClasses}>{ _t("Unknown Address") }</div>
             );
         }
 
@@ -151,5 +151,5 @@ export default React.createClass({
                 { dismiss }
             </div>
         );
-    }
+    },
 });
diff --git a/src/components/views/elements/CreateRoomButton.js b/src/components/views/elements/CreateRoomButton.js
index 22d222c6f1..177d033c75 100644
--- a/src/components/views/elements/CreateRoomButton.js
+++ b/src/components/views/elements/CreateRoomButton.js
@@ -24,7 +24,7 @@ const CreateRoomButton = function(props) {
     return (
         <ActionButton action="view_create_room"
             mouseOverAction={props.callout ? "callout_create_room" : null}
-            label={ _t("Create new room") }
+            label={_t("Create new room")}
             iconPath="img/icons-create-room.svg"
             size={props.size}
             tooltip={props.tooltip}
diff --git a/src/components/views/elements/DeviceVerifyButtons.js b/src/components/views/elements/DeviceVerifyButtons.js
index bfe45905a1..bb89efaa30 100644
--- a/src/components/views/elements/DeviceVerifyButtons.js
+++ b/src/components/views/elements/DeviceVerifyButtons.js
@@ -30,7 +30,7 @@ export default React.createClass({
 
     getInitialState: function() {
         return {
-            device: this.props.device
+            device: this.props.device,
         };
     },
 
@@ -60,37 +60,37 @@ export default React.createClass({
 
     onUnverifyClick: function() {
         MatrixClientPeg.get().setDeviceVerified(
-            this.props.userId, this.state.device.deviceId, false
+            this.props.userId, this.state.device.deviceId, false,
         );
     },
 
     onBlacklistClick: function() {
         MatrixClientPeg.get().setDeviceBlocked(
-            this.props.userId, this.state.device.deviceId, true
+            this.props.userId, this.state.device.deviceId, true,
         );
     },
 
     onUnblacklistClick: function() {
         MatrixClientPeg.get().setDeviceBlocked(
-            this.props.userId, this.state.device.deviceId, false
+            this.props.userId, this.state.device.deviceId, false,
         );
     },
 
     render: function() {
-        var blacklistButton = null, verifyButton = null;
+        let blacklistButton = null, verifyButton = null;
 
         if (this.state.device.isBlocked()) {
             blacklistButton = (
                 <button className="mx_MemberDeviceInfo_textButton mx_MemberDeviceInfo_unblacklist"
                   onClick={this.onUnblacklistClick}>
-                    {_t("Unblacklist")}
+                    { _t("Unblacklist") }
                 </button>
             );
         } else {
             blacklistButton = (
                 <button className="mx_MemberDeviceInfo_textButton mx_MemberDeviceInfo_blacklist"
                   onClick={this.onBlacklistClick}>
-                    {_t("Blacklist")}
+                    { _t("Blacklist") }
                 </button>
             );
         }
@@ -99,14 +99,14 @@ export default React.createClass({
             verifyButton = (
                 <button className="mx_MemberDeviceInfo_textButton mx_MemberDeviceInfo_unverify"
                   onClick={this.onUnverifyClick}>
-                    {_t("Unverify")}
+                    { _t("Unverify") }
                 </button>
             );
         } else {
             verifyButton = (
                 <button className="mx_MemberDeviceInfo_textButton mx_MemberDeviceInfo_verify"
                   onClick={this.onVerifyClick}>
-                    {_t("Verify...")}
+                    { _t("Verify...") }
                 </button>
             );
         }
diff --git a/src/components/views/elements/DirectorySearchBox.js b/src/components/views/elements/DirectorySearchBox.js
index eaa6ee34ba..7132162d5c 100644
--- a/src/components/views/elements/DirectorySearchBox.js
+++ b/src/components/views/elements/DirectorySearchBox.js
@@ -95,7 +95,7 @@ export default class DirectorySearchBox extends React.Component {
                     onChange={this._onChange} onKeyUp={this._onKeyUp}
                     placeholder={this.props.placeholder} autoFocus
                 />
-                {join_button}
+                { join_button }
                 <span className="mx_DirectorySearchBox_clear_wrapper">
                     <span className="mx_DirectorySearchBox_clear" onClick={this._onClearClick} />
                 </span>
diff --git a/src/components/views/elements/Dropdown.js b/src/components/views/elements/Dropdown.js
index 0fb5a37414..3787523a56 100644
--- a/src/components/views/elements/Dropdown.js
+++ b/src/components/views/elements/Dropdown.js
@@ -29,7 +29,7 @@ class MenuOption extends React.Component {
     getDefaultProps() {
         return {
             disabled: false,
-        }
+        };
     }
 
     _onMouseEnter() {
@@ -52,15 +52,15 @@ class MenuOption extends React.Component {
             onClick={this._onClick} onKeyPress={this._onKeyPress}
             onMouseEnter={this._onMouseEnter}
         >
-            {this.props.children}
-        </div>
+            { this.props.children }
+        </div>;
     }
-};
+}
 
 MenuOption.propTypes = {
     children: React.PropTypes.oneOfType([
       React.PropTypes.arrayOf(React.PropTypes.node),
-      React.PropTypes.node
+      React.PropTypes.node,
     ]),
     highlighted: React.PropTypes.bool,
     dropdownKey: React.PropTypes.string,
@@ -258,13 +258,13 @@ export default class Dropdown extends React.Component {
                     onMouseEnter={this._setHighlightedOption}
                     onClick={this._onMenuOptionClick}
                 >
-                    {child}
+                    { child }
                 </MenuOption>
             );
         });
         if (options.length === 0) {
             return [<div key="0" className="mx_Dropdown_option">
-                {_t("No results")}
+                { _t("No results") }
             </div>];
         }
         return options;
@@ -287,7 +287,7 @@ export default class Dropdown extends React.Component {
                 />;
             }
             menu = <div className="mx_Dropdown_menu" style={menuStyle}>
-                {this._getMenuOptions()}
+                { this._getMenuOptions() }
             </div>;
         }
 
@@ -296,8 +296,8 @@ export default class Dropdown extends React.Component {
                 this.props.getShortOption(this.props.value) :
                 this.childrenByKey[this.props.value];
             currentValue = <div className="mx_Dropdown_option">
-                {selectedChild}
-            </div>
+                { selectedChild }
+            </div>;
         }
 
         const dropdownClasses = {
@@ -312,9 +312,9 @@ export default class Dropdown extends React.Component {
         // to the input, but overflows below it. The root contains both.
         return <div className={classnames(dropdownClasses)} ref={this._collectRoot}>
             <AccessibleButton className="mx_Dropdown_input" onClick={this._onInputClick}>
-                {currentValue}
+                { currentValue }
                 <span className="mx_Dropdown_arrow"></span>
-                {menu}
+                { menu }
             </AccessibleButton>
         </div>;
     }
@@ -340,4 +340,4 @@ Dropdown.propTypes = {
     value: React.PropTypes.string,
     // negative for consistency with HTML
     disabled: React.PropTypes.bool,
-}
+};
diff --git a/src/components/views/elements/EditableText.js b/src/components/views/elements/EditableText.js
index b6a0ec1d5c..ac8821a0c2 100644
--- a/src/components/views/elements/EditableText.js
+++ b/src/components/views/elements/EditableText.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 'use strict';
 
-var React = require('react');
+const React = require('react');
 
 const KEY_TAB = 9;
 const KEY_SHIFT = 16;
@@ -95,8 +95,7 @@ module.exports = React.createClass({
             this.refs.editable_div.setAttribute("class", this.props.className + " " + this.props.placeholderClassName);
             this.placeholder = true;
             this.value = '';
-        }
-        else {
+        } else {
             this.refs.editable_div.textContent = this.value;
             this.refs.editable_div.setAttribute("class", this.props.className);
             this.placeholder = false;
@@ -152,8 +151,7 @@ module.exports = React.createClass({
 
         if (!ev.target.textContent) {
             this.showPlaceholder(true);
-        }
-        else if (!this.placeholder) {
+        } else if (!this.placeholder) {
             this.value = ev.target.textContent;
         }
 
@@ -177,21 +175,21 @@ module.exports = React.createClass({
     onFocus: function(ev) {
         //ev.target.setSelectionRange(0, ev.target.textContent.length);
 
-        var node = ev.target.childNodes[0];
+        const node = ev.target.childNodes[0];
         if (node) {
-            var range = document.createRange();
+            const range = document.createRange();
             range.setStart(node, 0);
             range.setEnd(node, node.length);
 
-            var sel = window.getSelection();
+            const sel = window.getSelection();
             sel.removeAllRanges();
             sel.addRange(range);
         }
     },
 
     onFinish: function(ev, shouldSubmit) {
-        var self = this;
-        var submit = (ev.key === "Enter") || shouldSubmit;
+        const self = this;
+        const submit = (ev.key === "Enter") || shouldSubmit;
         this.setState({
             phase: this.Phases.Display,
         }, function() {
@@ -202,19 +200,16 @@ module.exports = React.createClass({
     },
 
     onBlur: function(ev) {
-        var sel = window.getSelection();
+        const sel = window.getSelection();
         sel.removeAllRanges();
 
-        if (this.props.blurToCancel)
-            {this.cancelEdit();}
-        else
-            {this.onFinish(ev, this.props.blurToSubmit);}
+        if (this.props.blurToCancel) {this.cancelEdit();} else {this.onFinish(ev, this.props.blurToSubmit);}
 
         this.showPlaceholder(!this.value);
     },
 
     render: function() {
-        var editable_el;
+        let editable_el;
 
         if (!this.props.editable || (this.state.phase == this.Phases.Display && (this.props.label || this.props.labelClassName) && !this.value)) {
             // show the label
@@ -226,5 +221,5 @@ module.exports = React.createClass({
         }
 
         return editable_el;
-    }
+    },
 });
diff --git a/src/components/views/elements/EditableTextContainer.js b/src/components/views/elements/EditableTextContainer.js
index aeb32c07ec..0025862967 100644
--- a/src/components/views/elements/EditableTextContainer.js
+++ b/src/components/views/elements/EditableTextContainer.js
@@ -64,7 +64,7 @@ export default class EditableTextContainer extends React.Component {
                     errorString: error.toString(),
                     busy: false,
                 });
-            }
+            },
         );
     }
 
@@ -96,22 +96,22 @@ export default class EditableTextContainer extends React.Component {
                     errorString: error.toString(),
                     busy: false,
                 });
-            }
+            },
         );
     }
 
     render() {
         if (this.state.busy) {
-            var Loader = sdk.getComponent("elements.Spinner");
+            const Loader = sdk.getComponent("elements.Spinner");
             return (
                 <Loader />
             );
         } else if (this.state.errorString) {
             return (
-                <div className="error">{this.state.errorString}</div>
+                <div className="error">{ this.state.errorString }</div>
             );
         } else {
-            var EditableText = sdk.getComponent('elements.EditableText');
+            const EditableText = sdk.getComponent('elements.EditableText');
             return (
                 <EditableText initialValue={this.state.value}
                     placeholder={this.props.placeholder}
diff --git a/src/components/views/elements/HomeButton.js b/src/components/views/elements/HomeButton.js
index 4877f5dd43..05e21487eb 100644
--- a/src/components/views/elements/HomeButton.js
+++ b/src/components/views/elements/HomeButton.js
@@ -23,7 +23,7 @@ const HomeButton = function(props) {
     const ActionButton = sdk.getComponent('elements.ActionButton');
     return (
         <ActionButton action="view_home_page"
-            label={ _t("Home") }
+            label={_t("Home")}
             iconPath="img/icons-home.svg"
             size={props.size}
             tooltip={props.tooltip}
diff --git a/src/components/views/elements/LanguageDropdown.js b/src/components/views/elements/LanguageDropdown.js
index c5ed1f8942..6e3f73f7d5 100644
--- a/src/components/views/elements/LanguageDropdown.js
+++ b/src/components/views/elements/LanguageDropdown.js
@@ -35,12 +35,12 @@ export default class LanguageDropdown extends React.Component {
         this.state = {
             searchQuery: '',
             langs: null,
-        }
+        };
     }
 
     componentWillMount() {
         languageHandler.getAllLanguagesFromJson().then((langs) => {
-            langs.sort(function(a, b){
+            langs.sort(function(a, b) {
                 if(a.label < b.label) return -1;
                 if(a.label > b.label) return 1;
                 return 0;
@@ -89,7 +89,7 @@ export default class LanguageDropdown extends React.Component {
 
         const options = displayedLanguages.map((language) => {
             return <div key={language.value}>
-                {language.label}
+                { language.label }
             </div>;
         });
 
@@ -108,8 +108,8 @@ export default class LanguageDropdown extends React.Component {
             onOptionChange={this.props.onOptionChange} onSearchChange={this._onSearchChange}
             searchEnabled={true} value={value}
         >
-            {options}
-        </Dropdown>
+            { options }
+        </Dropdown>;
     }
 }
 
diff --git a/src/components/views/elements/MemberEventListSummary.js b/src/components/views/elements/MemberEventListSummary.js
index 689599da0b..596838febe 100644
--- a/src/components/views/elements/MemberEventListSummary.js
+++ b/src/components/views/elements/MemberEventListSummary.js
@@ -96,12 +96,12 @@ module.exports = React.createClass({
             // Transform into consecutive repetitions of the same transition (like 5
             // consecutive 'joined_and_left's)
             const coalescedTransitions = this._coalesceRepeatedTransitions(
-                canonicalTransitions
+                canonicalTransitions,
             );
 
             const descs = coalescedTransitions.map((t) => {
                 return this._getDescriptionForTransition(
-                    t.transitionType, plural, t.repeats
+                    t.transitionType, plural, t.repeats,
                 );
             });
 
@@ -119,7 +119,7 @@ module.exports = React.createClass({
         return (
             <span className="mx_TextualEvent mx_MemberEventListSummary_summary">
                 <EmojiText>
-                    {summaries.join(", ")}
+                    { summaries.join(", ") }
                 </EmojiText>
             </span>
         );
@@ -370,7 +370,7 @@ module.exports = React.createClass({
      */
     _renderCommaSeparatedList(items, itemLimit) {
         const remaining = itemLimit === undefined ? 0 : Math.max(
-            items.length - itemLimit, 0
+            items.length - itemLimit, 0,
         );
         if (items.length === 0) {
             return "";
@@ -394,8 +394,8 @@ module.exports = React.createClass({
             );
         });
         return (
-            <span className="mx_MemberEventListSummary_avatars" onClick={ this._toggleSummary }>
-                {avatars}
+            <span className="mx_MemberEventListSummary_avatars" onClick={this._toggleSummary}>
+                { avatars }
             </span>
         );
     },
@@ -419,19 +419,15 @@ module.exports = React.createClass({
             case 'join':
                 if (e.mxEvent.getPrevContent().membership === 'join') {
                     if (e.mxEvent.getContent().displayname !==
-                        e.mxEvent.getPrevContent().displayname)
-                    {
+                        e.mxEvent.getPrevContent().displayname) {
                         return 'changed_name';
-                    }
-                    else if (e.mxEvent.getContent().avatar_url !==
-                        e.mxEvent.getPrevContent().avatar_url)
-                    {
+                    } else if (e.mxEvent.getContent().avatar_url !==
+                        e.mxEvent.getPrevContent().avatar_url) {
                         return 'changed_avatar';
                     }
                     // console.log("MELS ignoring duplicate membership join event");
                     return null;
-                }
-                else {
+                } else {
                     return 'joined';
                 }
             case 'leave':
@@ -483,7 +479,7 @@ module.exports = React.createClass({
                     firstEvent.index < aggregateIndices[seq]) {
                         aggregateIndices[seq] = firstEvent.index;
                 }
-            }
+            },
         );
 
         return {
@@ -494,7 +490,7 @@ module.exports = React.createClass({
 
     render: function() {
         const eventsToRender = this.props.events;
-        const eventIds = eventsToRender.map(e => e.getId()).join(',');
+        const eventIds = eventsToRender.map((e) => e.getId()).join(',');
         const fewEvents = eventsToRender.length < this.props.threshold;
         const expanded = this.state.expanded || fewEvents;
 
@@ -506,7 +502,7 @@ module.exports = React.createClass({
         if (fewEvents) {
             return (
                 <div className="mx_MemberEventListSummary" data-scroll-tokens={eventIds}>
-                    {expandedEvents}
+                    { expandedEvents }
                 </div>
             );
         }
@@ -542,7 +538,7 @@ module.exports = React.createClass({
 
         // Sort types by order of lowest event index within sequence
         const orderedTransitionSequences = Object.keys(aggregate.names).sort(
-            (seq1, seq2) => aggregate.indices[seq1] > aggregate.indices[seq2]
+            (seq1, seq2) => aggregate.indices[seq1] > aggregate.indices[seq2],
         );
 
         let summaryContainer = null;
@@ -550,24 +546,24 @@ module.exports = React.createClass({
             summaryContainer = (
                 <div className="mx_EventTile_line">
                     <div className="mx_EventTile_info">
-                        {this._renderAvatars(avatarMembers)}
-                        {this._renderSummary(aggregate.names, orderedTransitionSequences)}
+                        { this._renderAvatars(avatarMembers) }
+                        { this._renderSummary(aggregate.names, orderedTransitionSequences) }
                     </div>
                 </div>
             );
         }
         const toggleButton = (
             <div className={"mx_MemberEventListSummary_toggle"} onClick={this._toggleSummary}>
-                {expanded ? 'collapse' : 'expand'}
+                { expanded ? 'collapse' : 'expand' }
             </div>
         );
 
         return (
             <div className="mx_MemberEventListSummary" data-scroll-tokens={eventIds}>
-                {toggleButton}
-                {summaryContainer}
-                {expanded ? <div className="mx_MemberEventListSummary_line">&nbsp;</div> : null}
-                {expandedEvents}
+                { toggleButton }
+                { summaryContainer }
+                { expanded ? <div className="mx_MemberEventListSummary_line">&nbsp;</div> : null }
+                { expandedEvents }
             </div>
         );
     },
diff --git a/src/components/views/elements/PowerSelector.js b/src/components/views/elements/PowerSelector.js
index efeb81fe2d..a0aaa12ff1 100644
--- a/src/components/views/elements/PowerSelector.js
+++ b/src/components/views/elements/PowerSelector.js
@@ -20,8 +20,8 @@ import React from 'react';
 import * as Roles from '../../../Roles';
 import { _t } from '../../../languageHandler';
 
-var LEVEL_ROLE_MAP = {};
-var reverseRoles = {};
+let LEVEL_ROLE_MAP = {};
+const reverseRoles = {};
 
 module.exports = React.createClass({
     displayName: 'PowerSelector',
@@ -46,7 +46,7 @@ module.exports = React.createClass({
             custom: (LEVEL_ROLE_MAP[this.props.value] === undefined),
         };
     },
-    
+
     componentWillMount: function() {
     	LEVEL_ROLE_MAP = Roles.levelRoleMap();
     	Object.keys(LEVEL_ROLE_MAP).forEach(function(key) {
@@ -72,7 +72,7 @@ module.exports = React.createClass({
     },
 
     getValue: function() {
-        var value;
+        let value;
         if (this.refs.select) {
             value = reverseRoles[this.refs.select.value];
             if (this.refs.custom) {
@@ -83,30 +83,27 @@ module.exports = React.createClass({
     },
 
     render: function() {
-        var customPicker;
+        let customPicker;
         if (this.state.custom) {
-            var input;
+            let input;
             if (this.props.disabled) {
                 input = <span>{ this.props.value }</span>;
-            }
-            else {
-                input = <input ref="custom" type="text" size="3" defaultValue={ this.props.value } onBlur={ this.onCustomBlur } onKeyDown={ this.onCustomKeyDown }/>;
+            } else {
+                input = <input ref="custom" type="text" size="3" defaultValue={this.props.value} onBlur={this.onCustomBlur} onKeyDown={this.onCustomKeyDown} />;
             }
             customPicker = <span> of { input }</span>;
         }
 
-        var selectValue;
+        let selectValue;
         if (this.state.custom) {
             selectValue = "Custom";
-        }
-        else {
+        } else {
             selectValue = LEVEL_ROLE_MAP[this.props.value] || "Custom";
         }
-        var select;
+        let select;
         if (this.props.disabled) {
             select = <span>{ selectValue }</span>;
-        }
-        else {
+        } else {
             // Each level must have a definition in LEVEL_ROLE_MAP
             const levels = [0, 50, 100];
             let options = levels.map((level) => {
@@ -115,18 +112,18 @@ module.exports = React.createClass({
                     // Give a userDefault (users_default in the power event) of 0 but
                     // because level !== undefined, this should never be used.
                     text: Roles.textualPowerLevel(level, 0),
-                }
+                };
             });
             options.push({ value: "Custom", text: _t("Custom level") });
             options = options.map((op) => {
-                return <option value={op.value} key={op.value}>{op.text}</option>;
+                return <option value={op.value} key={op.value}>{ op.text }</option>;
             });
 
             select =
                 <select ref="select"
-                        value={ this.props.controlled ? selectValue : undefined }
-                        defaultValue={ !this.props.controlled ? selectValue : undefined }
-                        onChange={ this.onSelectChange }>
+                        value={this.props.controlled ? selectValue : undefined}
+                        defaultValue={!this.props.controlled ? selectValue : undefined}
+                        onChange={this.onSelectChange}>
                     { options }
                 </select>;
         }
@@ -137,5 +134,5 @@ module.exports = React.createClass({
                 { customPicker }
             </span>
         );
-    }
+    },
 });
diff --git a/src/components/views/elements/ProgressBar.js b/src/components/views/elements/ProgressBar.js
index a39e8e48f9..861bfb1335 100644
--- a/src/components/views/elements/ProgressBar.js
+++ b/src/components/views/elements/ProgressBar.js
@@ -16,23 +16,23 @@ limitations under the License.
 
 'use strict';
 
-var React = require('react');
+const React = require('react');
 
 module.exports = React.createClass({
     displayName: 'ProgressBar',
     propTypes: {
         value: React.PropTypes.number,
-        max: React.PropTypes.number
+        max: React.PropTypes.number,
     },
 
     render: function() {
         // Would use an HTML5 progress tag but if that doesn't animate if you
         // use the HTML attributes rather than styles
-        var progressStyle = {
-            width: ((this.props.value / this.props.max) * 100)+"%"
+        const progressStyle = {
+            width: ((this.props.value / this.props.max) * 100)+"%",
         };
         return (
             <div className="mx_ProgressBar"><div className="mx_ProgressBar_fill" style={progressStyle}></div></div>
         );
-    }
+    },
 });
diff --git a/src/components/views/elements/RoomDirectoryButton.js b/src/components/views/elements/RoomDirectoryButton.js
index d964d9e5bc..d8f88034e3 100644
--- a/src/components/views/elements/RoomDirectoryButton.js
+++ b/src/components/views/elements/RoomDirectoryButton.js
@@ -24,7 +24,7 @@ const RoomDirectoryButton = function(props) {
     return (
         <ActionButton action="view_room_directory"
             mouseOverAction={props.callout ? "callout_room_directory" : null}
-            label={ _t("Room directory") }
+            label={_t("Room directory")}
             iconPath="img/icons-directory.svg"
             size={props.size}
             tooltip={props.tooltip}
diff --git a/src/components/views/elements/SettingsButton.js b/src/components/views/elements/SettingsButton.js
index ad09971689..215d757e6c 100644
--- a/src/components/views/elements/SettingsButton.js
+++ b/src/components/views/elements/SettingsButton.js
@@ -23,7 +23,7 @@ const SettingsButton = function(props) {
     const ActionButton = sdk.getComponent('elements.ActionButton');
     return (
         <ActionButton action="view_user_settings"
-            label={ _t("Settings") }
+            label={_t("Settings")}
             iconPath="img/icons-settings.svg"
             size={props.size}
             tooltip={props.tooltip}
diff --git a/src/components/views/elements/StartChatButton.js b/src/components/views/elements/StartChatButton.js
index 05a7db0b9c..199c5e44a6 100644
--- a/src/components/views/elements/StartChatButton.js
+++ b/src/components/views/elements/StartChatButton.js
@@ -24,7 +24,7 @@ const StartChatButton = function(props) {
     return (
         <ActionButton action="view_create_chat"
             mouseOverAction={props.callout ? "callout_start_chat" : null}
-            label={ _t("Start chat") }
+            label={_t("Start chat")}
             iconPath="img/icons-people.svg"
             size={props.size}
             tooltip={props.tooltip}
diff --git a/src/components/views/elements/TintableSvg.js b/src/components/views/elements/TintableSvg.js
index 401a11c1cb..3649cbccdb 100644
--- a/src/components/views/elements/TintableSvg.js
+++ b/src/components/views/elements/TintableSvg.js
@@ -16,9 +16,9 @@ limitations under the License.
 
 'use strict';
 
-var React = require('react');
-var ReactDOM = require("react-dom");
-var Tinter = require("../../../Tinter");
+const React = require('react');
+const ReactDOM = require("react-dom");
+const Tinter = require("../../../Tinter");
 
 var TintableSvg = React.createClass({
     displayName: 'TintableSvg',
@@ -63,16 +63,16 @@ var TintableSvg = React.createClass({
 
     render: function() {
         return (
-            <object className={ "mx_TintableSvg " + (this.props.className ? this.props.className : "") }
+            <object className={"mx_TintableSvg " + (this.props.className ? this.props.className : "")}
                     type="image/svg+xml"
-                    data={ this.props.src }
-                    width={ this.props.width }
-                    height={ this.props.height }
-                    onLoad={ this.onLoad }
+                    data={this.props.src}
+                    width={this.props.width}
+                    height={this.props.height}
+                    onLoad={this.onLoad}
                     tabIndex="-1"
                 />
         );
-    }
+    },
 });
 
 // Register with the Tinter so that we will be told if the tint changes
diff --git a/src/components/views/elements/UserSelector.js b/src/components/views/elements/UserSelector.js
index 955903aac0..a523c57d9f 100644
--- a/src/components/views/elements/UserSelector.js
+++ b/src/components/views/elements/UserSelector.js
@@ -52,19 +52,19 @@ module.exports = React.createClass({
     },
 
     render: function() {
-        var self = this;
+        const self = this;
         return (
             <div>
                 <ul className="mx_UserSelector_UserIdList" ref="list">
-                    {this.props.selected_users.map(function(user_id, i) {
-                        return <li key={user_id}>{user_id} - <span onClick={function() {self.removeUser(user_id);}}>X</span></li>;
-                    })}
+                    { this.props.selected_users.map(function(user_id, i) {
+                        return <li key={user_id}>{ user_id } - <span onClick={function() {self.removeUser(user_id);}}>X</span></li>;
+                    }) }
                 </ul>
-                <input type="text" ref="user_id_input" defaultValue="" className="mx_UserSelector_userIdInput" placeholder={_t("ex. @bob:example.com")}/>
+                <input type="text" ref="user_id_input" defaultValue="" className="mx_UserSelector_userIdInput" placeholder={_t("ex. @bob:example.com")} />
                 <button onClick={this.onAddUserId} className="mx_UserSelector_AddUserId">
-                    {_t("Add User")}
+                    { _t("Add User") }
                 </button>
             </div>
         );
-    }
+    },
 });
diff --git a/src/components/views/login/CaptchaForm.js b/src/components/views/login/CaptchaForm.js
index d24990f94d..cf814b0a6e 100644
--- a/src/components/views/login/CaptchaForm.js
+++ b/src/components/views/login/CaptchaForm.js
@@ -20,7 +20,7 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import { _t, _tJsx } from '../../../languageHandler';
 
-var DIV_ID = 'mx_recaptcha';
+const DIV_ID = 'mx_recaptcha';
 
 /**
  * A pure UI component which displays a captcha form.
@@ -60,9 +60,9 @@ module.exports = React.createClass({
         } else {
             console.log("Loading recaptcha script...");
             window.mx_on_recaptcha_loaded = () => {this._onCaptchaLoaded();};
-            var protocol = global.location.protocol;
+            const protocol = global.location.protocol;
             if (protocol === "file:") {
-                var warning = document.createElement('div');
+                const warning = document.createElement('div');
                 // XXX: fix hardcoded app URL.  Better solutions include:
                 // * jumping straight to a hosted captcha page (but we don't support that yet)
                 // * embedding the captcha in an iframe (if that works)
@@ -72,11 +72,10 @@ module.exports = React.createClass({
                     /<a>(.*?)<\/a>/,
                     (sub) => { return <a href='https://riot.im/app'>{ sub }</a>; }), warning);
                 this.refs.recaptchaContainer.appendChild(warning);
-            }
-            else {
-                var scriptTag = document.createElement('script');
+            } else {
+                const scriptTag = document.createElement('script');
                 scriptTag.setAttribute(
-                    'src', protocol+"//www.google.com/recaptcha/api.js?onload=mx_on_recaptcha_loaded&render=explicit"
+                    'src', protocol+"//www.google.com/recaptcha/api.js?onload=mx_on_recaptcha_loaded&render=explicit",
                 );
                 this.refs.recaptchaContainer.appendChild(scriptTag);
             }
@@ -93,7 +92,7 @@ module.exports = React.createClass({
             throw new Error("Recaptcha did not load successfully");
         }
 
-        var publicKey = this.props.sitePublicKey;
+        const publicKey = this.props.sitePublicKey;
         if (!publicKey) {
             console.error("No public key for recaptcha!");
             throw new Error(
@@ -130,18 +129,18 @@ module.exports = React.createClass({
         if (this.state.errorText) {
             error = (
                 <div className="error">
-                    {this.state.errorText}
+                    { this.state.errorText }
                 </div>
             );
         }
 
         return (
             <div ref="recaptchaContainer">
-                {_t("This Home Server would like to make sure you are not a robot")}
-                <br/>
+                { _t("This Home Server would like to make sure you are not a robot") }
+                <br />
                 <div id={DIV_ID}></div>
-                {error}
+                { error }
             </div>
         );
-    }
+    },
 });
diff --git a/src/components/views/login/CasLogin.js b/src/components/views/login/CasLogin.js
index 96e37875be..49d121687d 100644
--- a/src/components/views/login/CasLogin.js
+++ b/src/components/views/login/CasLogin.js
@@ -29,9 +29,9 @@ module.exports = React.createClass({
     render: function() {
         return (
             <div>
-                <button onClick={this.props.onSubmit}>{_t("Sign in with CAS")}</button>
+                <button onClick={this.props.onSubmit}>{ _t("Sign in with CAS") }</button>
             </div>
         );
-    }
+    },
 
 });
diff --git a/src/components/views/login/CountryDropdown.js b/src/components/views/login/CountryDropdown.js
index 56ab962d98..d8695bb1c1 100644
--- a/src/components/views/login/CountryDropdown.js
+++ b/src/components/views/login/CountryDropdown.js
@@ -69,7 +69,7 @@ export default class CountryDropdown extends React.Component {
     }
 
     _flagImgForIso2(iso2) {
-        return <img src={`flags/${iso2}.png`}/>;
+        return <img src={`flags/${iso2}.png`} />;
     }
 
     _getShortOption(iso2) {
@@ -111,8 +111,8 @@ export default class CountryDropdown extends React.Component {
 
         const options = displayedCountries.map((country) => {
             return <div key={country.iso2}>
-                {this._flagImgForIso2(country.iso2)}
-                {country.name} <span>(+{country.prefix})</span>
+                { this._flagImgForIso2(country.iso2) }
+                { country.name } <span>(+{ country.prefix })</span>
             </div>;
         });
 
@@ -125,7 +125,7 @@ export default class CountryDropdown extends React.Component {
             menuWidth={298} getShortOption={this._getShortOption}
             value={value} searchEnabled={true} disabled={this.props.disabled}
         >
-            {options}
+            { options }
         </Dropdown>;
     }
 }
diff --git a/src/components/views/login/CustomServerDialog.js b/src/components/views/login/CustomServerDialog.js
index f5c5c84e63..474a4097d1 100644
--- a/src/components/views/login/CustomServerDialog.js
+++ b/src/components/views/login/CustomServerDialog.js
@@ -24,27 +24,27 @@ module.exports = React.createClass({
         return (
             <div className="mx_ErrorDialog">
                 <div className="mx_Dialog_title">
-                    {_t("Custom Server Options")}
+                    { _t("Custom Server Options") }
                 </div>
                 <div className="mx_Dialog_content">
                     <span>
-                        {_t("You can use the custom server options to sign into other Matrix " +
-                        "servers by specifying a different Home server URL.")}
-                        <br/>
-                        {_t("This allows you to use this app with an existing Matrix account on " +
-                            "a different home server.")}
-                        <br/>
-                        <br/>
-                        {_t("You can also set a custom identity server but this will typically prevent " +
-                            "interaction with users based on email address.")}
+                        { _t("You can use the custom server options to sign into other Matrix " +
+                        "servers by specifying a different Home server URL.") }
+                        <br />
+                        { _t("This allows you to use this app with an existing Matrix account on " +
+                            "a different home server.") }
+                        <br />
+                        <br />
+                        { _t("You can also set a custom identity server but this will typically prevent " +
+                            "interaction with users based on email address.") }
                     </span>
                 </div>
                 <div className="mx_Dialog_buttons">
                     <button onClick={this.props.onFinished} autoFocus={true}>
-                        {_t("Dismiss")}
+                        { _t("Dismiss") }
                     </button>
                 </div>
             </div>
         );
-    }
+    },
 });
diff --git a/src/components/views/login/InteractiveAuthEntryComponents.js b/src/components/views/login/InteractiveAuthEntryComponents.js
index ae8a087fdd..4c53c23f76 100644
--- a/src/components/views/login/InteractiveAuthEntryComponents.js
+++ b/src/components/views/login/InteractiveAuthEntryComponents.js
@@ -129,8 +129,8 @@ export const PasswordAuthEntry = React.createClass({
 
         return (
             <div>
-                <p>{_t("To continue, please enter your password.")}</p>
-                <p>{_t("Password:")}</p>
+                <p>{ _t("To continue, please enter your password.") }</p>
+                <p>{ _t("Password:") }</p>
                 <form onSubmit={this._onSubmit}>
                     <input
                         ref="passwordField"
@@ -139,11 +139,11 @@ export const PasswordAuthEntry = React.createClass({
                         type="password"
                     />
                     <div className="mx_button_row">
-                        {submitButtonOrSpinner}
+                        { submitButtonOrSpinner }
                     </div>
                 </form>
                 <div className="error">
-                    {this.props.errorText}
+                    { this.props.errorText }
                 </div>
             </div>
         );
@@ -178,14 +178,14 @@ export const RecaptchaAuthEntry = React.createClass({
         }
 
         const CaptchaForm = sdk.getComponent("views.login.CaptchaForm");
-        var sitePublicKey = this.props.stageParams.public_key;
+        const sitePublicKey = this.props.stageParams.public_key;
         return (
             <div>
                 <CaptchaForm sitePublicKey={sitePublicKey}
                     onCaptchaResponse={this._onCaptchaResponse}
                 />
                 <div className="error">
-                    {this.props.errorText}
+                    { this.props.errorText }
                 </div>
             </div>
         );
@@ -256,8 +256,8 @@ export const EmailIdentityAuthEntry = React.createClass({
         } else {
             return (
                 <div>
-                    <p>{_t("An email has been sent to")} <i>{this.props.inputs.emailAddress}</i></p>
-                    <p>{_t("Please check your email to continue registration.")}</p>
+                    <p>{ _t("An email has been sent to") } <i>{ this.props.inputs.emailAddress }</i></p>
+                    <p>{ _t("Please check your email to continue registration.") }</p>
                 </div>
             );
         }
@@ -333,12 +333,12 @@ export const MsisdnAuthEntry = React.createClass({
             });
 
         this.props.matrixClient.submitMsisdnToken(
-            this._sid, this.props.clientSecret, this.state.token
+            this._sid, this.props.clientSecret, this.state.token,
         ).then((result) => {
             if (result.success) {
                 const idServerParsedUrl = url.parse(
                     this.props.matrixClient.getIdentityServerUrl(),
-                )
+                );
                 this.props.submitAuthDict({
                     type: MsisdnAuthEntry.LOGIN_TYPE,
                     threepid_creds: {
@@ -370,8 +370,8 @@ export const MsisdnAuthEntry = React.createClass({
             });
             return (
                 <div>
-                    <p>{_t("A text message has been sent to")} +<i>{this._msisdn}</i></p>
-                    <p>{_t("Please enter the code it contains:")}</p>
+                    <p>{ _t("A text message has been sent to") } +<i>{ this._msisdn }</i></p>
+                    <p>{ _t("Please enter the code it contains:") }</p>
                     <div className="mx_InteractiveAuthEntryComponents_msisdnWrapper">
                         <form onSubmit={this._onFormSubmit}>
                             <input type="text"
@@ -386,7 +386,7 @@ export const MsisdnAuthEntry = React.createClass({
                             />
                         </form>
                         <div className="error">
-                            {this.state.errorText}
+                            { this.state.errorText }
                         </div>
                     </div>
                 </div>
@@ -421,9 +421,9 @@ export const FallbackAuthEntry = React.createClass({
     },
 
     _onShowFallbackClick: function() {
-        var url = this.props.matrixClient.getFallbackAuthUrl(
+        const url = this.props.matrixClient.getFallbackAuthUrl(
             this.props.loginType,
-            this.props.authSessionId
+            this.props.authSessionId,
         );
         this._popupWindow = window.open(url);
     },
@@ -440,9 +440,9 @@ export const FallbackAuthEntry = React.createClass({
     render: function() {
         return (
             <div>
-                <a onClick={this._onShowFallbackClick}>{_t("Start authentication")}</a>
+                <a onClick={this._onShowFallbackClick}>{ _t("Start authentication") }</a>
                 <div className="error">
-                    {this.props.errorText}
+                    { this.props.errorText }
                 </div>
             </div>
         );
@@ -457,7 +457,7 @@ const AuthEntryComponents = [
 ];
 
 export function getEntryComponentForLoginType(loginType) {
-    for (var c of AuthEntryComponents) {
+    for (const c of AuthEntryComponents) {
         if (c.LOGIN_TYPE == loginType) {
             return c;
         }
diff --git a/src/components/views/login/LoginHeader.js b/src/components/views/login/LoginHeader.js
index 3ee3cbea2e..cd1f9c6a28 100644
--- a/src/components/views/login/LoginHeader.js
+++ b/src/components/views/login/LoginHeader.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 'use strict';
 
-var React = require('react');
+const React = require('react');
 
 module.exports = React.createClass({
     displayName: 'LoginHeader',
@@ -27,5 +27,5 @@ module.exports = React.createClass({
                 Matrix
             </div>
         );
-    }
+    },
 });
diff --git a/src/components/views/login/PasswordLogin.js b/src/components/views/login/PasswordLogin.js
index d532c400bc..484ee01f4e 100644
--- a/src/components/views/login/PasswordLogin.js
+++ b/src/components/views/login/PasswordLogin.js
@@ -94,7 +94,7 @@ class PasswordLogin extends React.Component {
     onLoginTypeChange(loginType) {
         this.setState({
             loginType: loginType,
-            username: "" // Reset because email and username use the same state
+            username: "", // Reset because email and username use the same state
         });
     }
 
@@ -180,7 +180,7 @@ class PasswordLogin extends React.Component {
     }
 
     render() {
-        var forgotPasswordJsx;
+        let forgotPasswordJsx;
 
         if (this.props.onForgotPasswordClick) {
             forgotPasswordJsx = (
@@ -220,21 +220,21 @@ class PasswordLogin extends React.Component {
                         value={this.state.loginType}
                         disabled={matrixIdText === ''}
                         onOptionChange={this.onLoginTypeChange}>
-                            <span key={PasswordLogin.LOGIN_FIELD_MXID}>{matrixIdText}</span>
+                            <span key={PasswordLogin.LOGIN_FIELD_MXID}>{ matrixIdText }</span>
                             <span key={PasswordLogin.LOGIN_FIELD_EMAIL}>{ _t('Email address') }</span>
                             <span key={PasswordLogin.LOGIN_FIELD_PHONE}>{ _t('Phone') }</span>
                     </Dropdown>
                 </div>
-                {loginField}
+                { loginField }
                 <input className={pwFieldClass} ref={(e) => {this._passwordField = e;}} type="password"
                     name="password"
                     value={this.state.password} onChange={this.onPasswordChanged}
-                    placeholder={ _t('Password') }
+                    placeholder={_t('Password')}
                     disabled={matrixIdText === ''}
                 />
                 <br />
-                {forgotPasswordJsx}
-                <input className="mx_Login_submit" type="submit" value={ _t('Sign in') } disabled={matrixIdText === ''} />
+                { forgotPasswordJsx }
+                <input className="mx_Login_submit" type="submit" value={_t('Sign in')} disabled={matrixIdText === ''} />
                 </form>
             </div>
         );
diff --git a/src/components/views/login/RegistrationForm.js b/src/components/views/login/RegistrationForm.js
index d5b7bcf46a..9c7c75b125 100644
--- a/src/components/views/login/RegistrationForm.js
+++ b/src/components/views/login/RegistrationForm.js
@@ -64,7 +64,7 @@ module.exports = React.createClass({
             minPasswordLength: 6,
             onError: function(e) {
                 console.error(e);
-            }
+            },
         };
     },
 
@@ -91,16 +91,16 @@ module.exports = React.createClass({
         this.validateField(FIELD_PHONE_NUMBER);
         this.validateField(FIELD_EMAIL);
 
-        var self = this;
+        const self = this;
         if (this.allFieldsValid()) {
             if (this.refs.email.value == '') {
-                var QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
+                const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
                 Modal.createTrackedDialog('If you don\'t specify an email address...', '', QuestionDialog, {
                     title: _t("Warning!"),
                     description:
                         <div>
-                            {_t("If you don't specify an email address, you won't be able to reset your password. " +
-                                "Are you sure?")}
+                            { _t("If you don't specify an email address, you won't be able to reset your password. " +
+                                "Are you sure?") }
                         </div>,
                     button: _t("Continue"),
                     onFinished: function(confirmed) {
@@ -116,8 +116,8 @@ module.exports = React.createClass({
     },
 
     _doSubmit: function(ev) {
-        let email = this.refs.email.value.trim();
-        var promise = this.props.onRegisterClick({
+        const email = this.refs.email.value.trim();
+        const promise = this.props.onRegisterClick({
             username: this.refs.username.value.trim(),
             password: this.refs.password.value.trim(),
             email: email,
@@ -138,8 +138,8 @@ module.exports = React.createClass({
      * they were validated.
      */
     allFieldsValid: function() {
-        var keys = Object.keys(this.state.fieldValid);
-        for (var i = 0; i < keys.length; ++i) {
+        const keys = Object.keys(this.state.fieldValid);
+        for (let i = 0; i < keys.length; ++i) {
             if (this.state.fieldValid[keys[i]] == false) {
                 return false;
             }
@@ -152,8 +152,8 @@ module.exports = React.createClass({
     },
 
     validateField: function(field_id) {
-        var pwd1 = this.refs.password.value.trim();
-        var pwd2 = this.refs.passwordConfirm.value.trim();
+        const pwd1 = this.refs.password.value.trim();
+        const pwd2 = this.refs.passwordConfirm.value.trim();
 
         switch (field_id) {
             case FIELD_EMAIL:
@@ -162,7 +162,7 @@ module.exports = React.createClass({
                     const matchingTeam = this.props.teamsConfig.teams.find(
                         (team) => {
                             return email.split('@').pop() === team.domain;
-                        }
+                        },
                     ) || null;
                     this.setState({
                         selectedTeam: matchingTeam,
@@ -191,13 +191,13 @@ module.exports = React.createClass({
                     this.markFieldValid(
                         field_id,
                         false,
-                        "RegistrationForm.ERR_USERNAME_INVALID"
+                        "RegistrationForm.ERR_USERNAME_INVALID",
                     );
                 } else if (username == '') {
                     this.markFieldValid(
                         field_id,
                         false,
-                        "RegistrationForm.ERR_USERNAME_BLANK"
+                        "RegistrationForm.ERR_USERNAME_BLANK",
                     );
                 } else {
                     this.markFieldValid(field_id, true);
@@ -208,13 +208,13 @@ module.exports = React.createClass({
                     this.markFieldValid(
                         field_id,
                         false,
-                        "RegistrationForm.ERR_PASSWORD_MISSING"
+                        "RegistrationForm.ERR_PASSWORD_MISSING",
                     );
                 } else if (pwd1.length < this.props.minPasswordLength) {
                     this.markFieldValid(
                         field_id,
                         false,
-                        "RegistrationForm.ERR_PASSWORD_LENGTH"
+                        "RegistrationForm.ERR_PASSWORD_LENGTH",
                     );
                 } else {
                     this.markFieldValid(field_id, true);
@@ -223,14 +223,14 @@ module.exports = React.createClass({
             case FIELD_PASSWORD_CONFIRM:
                 this.markFieldValid(
                     field_id, pwd1 == pwd2,
-                    "RegistrationForm.ERR_PASSWORD_MISMATCH"
+                    "RegistrationForm.ERR_PASSWORD_MISMATCH",
                 );
                 break;
         }
     },
 
     markFieldValid: function(field_id, val, error_code) {
-        var fieldValid = this.state.fieldValid;
+        const fieldValid = this.state.fieldValid;
         fieldValid[field_id] = val;
         this.setState({fieldValid: fieldValid});
         if (!val) {
@@ -271,7 +271,7 @@ module.exports = React.createClass({
     },
 
     render: function() {
-        var self = this;
+        const self = this;
 
         const emailSection = (
             <div>
@@ -280,7 +280,7 @@ module.exports = React.createClass({
                     defaultValue={this.props.defaultEmail}
                     className={this._classForField(FIELD_EMAIL, 'mx_Login_field')}
                     onBlur={function() {self.validateField(FIELD_EMAIL);}}
-                    value={self.state.email}/>
+                    value={self.state.email} />
             </div>
         );
         let belowEmailSection;
@@ -291,7 +291,7 @@ module.exports = React.createClass({
                         Sorry, but your university is not registered with us just yet.&nbsp;
                         Email us on&nbsp;
                         <a href={"mailto:" + this.props.teamsConfig.supportEmail}>
-                            {this.props.teamsConfig.supportEmail}
+                            { this.props.teamsConfig.supportEmail }
                         </a>&nbsp;
                         to get your university signed up. Or continue to register with Riot to enjoy our open source platform.
                     </p>
@@ -299,7 +299,7 @@ module.exports = React.createClass({
             } else if (this.state.selectedTeam) {
                 belowEmailSection = (
                     <p className="mx_Login_support">
-                        {_t("You are registering with %(SelectedTeamName)s", {SelectedTeamName: this.state.selectedTeam.name})}
+                        { _t("You are registering with %(SelectedTeamName)s", {SelectedTeamName: this.state.selectedTeam.name}) }
                     </p>
                 );
             }
@@ -321,7 +321,7 @@ module.exports = React.createClass({
                         FIELD_PHONE_NUMBER,
                         'mx_Login_phoneNumberField',
                         'mx_Login_field',
-                        'mx_Login_field_has_prefix'
+                        'mx_Login_field_has_prefix',
                     )}
                     onBlur={function() {self.validateField(FIELD_PHONE_NUMBER);}}
                     value={self.state.phoneNumber}
@@ -333,16 +333,16 @@ module.exports = React.createClass({
             <input className="mx_Login_submit" type="submit" value={_t("Register")} />
         );
 
-        let placeholderUserName = _t("User name");
+        const placeholderUserName = _t("User name");
 
         return (
             <div>
                 <form onSubmit={this.onSubmit}>
-                    {emailSection}
-                    {belowEmailSection}
-                    {phoneSection}
+                    { emailSection }
+                    { belowEmailSection }
+                    { phoneSection }
                     <input type="text" ref="username"
-                        placeholder={ placeholderUserName } defaultValue={this.props.defaultUsername}
+                        placeholder={placeholderUserName} defaultValue={this.props.defaultUsername}
                         className={this._classForField(FIELD_USERNAME, 'mx_Login_field')}
                         onBlur={function() {self.validateField(FIELD_USERNAME);}} />
                     <br />
@@ -357,9 +357,9 @@ module.exports = React.createClass({
                         onBlur={function() {self.validateField(FIELD_PASSWORD_CONFIRM);}}
                         defaultValue={this.props.defaultPassword} />
                     <br />
-                    {registerButton}
+                    { registerButton }
                 </form>
             </div>
         );
-    }
+    },
 });
diff --git a/src/components/views/login/ServerConfig.js b/src/components/views/login/ServerConfig.js
index 0042ab5e9f..d53c7238b1 100644
--- a/src/components/views/login/ServerConfig.js
+++ b/src/components/views/login/ServerConfig.js
@@ -16,9 +16,9 @@ limitations under the License.
 
 'use strict';
 
-var React = require('react');
-var Modal = require('../../../Modal');
-var sdk = require('../../../index');
+const React = require('react');
+const Modal = require('../../../Modal');
+const sdk = require('../../../index');
 import { _t } from '../../../languageHandler';
 
 /**
@@ -45,7 +45,7 @@ module.exports = React.createClass({
         customIsUrl: React.PropTypes.string,
 
         withToggleButton: React.PropTypes.bool,
-        delayTimeMs: React.PropTypes.number // time to wait before invoking onChanged
+        delayTimeMs: React.PropTypes.number, // time to wait before invoking onChanged
     },
 
     getDefaultProps: function() {
@@ -54,7 +54,7 @@ module.exports = React.createClass({
             customHsUrl: "",
             customIsUrl: "",
             withToggleButton: false,
-            delayTimeMs: 0
+            delayTimeMs: 0,
         };
     },
 
@@ -65,18 +65,18 @@ module.exports = React.createClass({
             // if withToggleButton is false, then show the config all the time given we have no way otherwise of making it visible
             configVisible: !this.props.withToggleButton ||
                            (this.props.customHsUrl !== this.props.defaultHsUrl) ||
-                           (this.props.customIsUrl !== this.props.defaultIsUrl)
+                           (this.props.customIsUrl !== this.props.defaultIsUrl),
         };
     },
 
     onHomeserverChanged: function(ev) {
         this.setState({hs_url: ev.target.value}, function() {
             this._hsTimeoutId = this._waitThenInvoke(this._hsTimeoutId, function() {
-                var hsUrl = this.state.hs_url.trim().replace(/\/$/, "");
+                let hsUrl = this.state.hs_url.trim().replace(/\/$/, "");
                 if (hsUrl === "") hsUrl = this.props.defaultHsUrl;
                 this.props.onServerConfigChange({
-                    hsUrl : this.state.hs_url,
-                    isUrl : this.state.is_url,
+                    hsUrl: this.state.hs_url,
+                    isUrl: this.state.is_url,
                 });
             });
         });
@@ -85,11 +85,11 @@ module.exports = React.createClass({
     onIdentityServerChanged: function(ev) {
         this.setState({is_url: ev.target.value}, function() {
             this._isTimeoutId = this._waitThenInvoke(this._isTimeoutId, function() {
-                var isUrl = this.state.is_url.trim().replace(/\/$/, "");
+                let isUrl = this.state.is_url.trim().replace(/\/$/, "");
                 if (isUrl === "") isUrl = this.props.defaultIsUrl;
                 this.props.onServerConfigChange({
-                    hsUrl : this.state.hs_url,
-                    isUrl : this.state.is_url,
+                    hsUrl: this.state.hs_url,
+                    isUrl: this.state.is_url,
                 });
             });
         });
@@ -104,32 +104,31 @@ module.exports = React.createClass({
 
     onServerConfigVisibleChange: function(visible, ev) {
         this.setState({
-            configVisible: visible
+            configVisible: visible,
         });
         if (!visible) {
             this.props.onServerConfigChange({
-                hsUrl : this.props.defaultHsUrl,
-                isUrl : this.props.defaultIsUrl,
+                hsUrl: this.props.defaultHsUrl,
+                isUrl: this.props.defaultIsUrl,
             });
-        }
-        else {
+        } else {
             this.props.onServerConfigChange({
-                hsUrl : this.state.hs_url,
-                isUrl : this.state.is_url,
+                hsUrl: this.state.hs_url,
+                isUrl: this.state.is_url,
             });
         }
     },
 
     showHelpPopup: function() {
-        var CustomServerDialog = sdk.getComponent('login.CustomServerDialog');
+        const CustomServerDialog = sdk.getComponent('login.CustomServerDialog');
         Modal.createTrackedDialog('Custom Server Dialog', '', CustomServerDialog);
     },
 
     render: function() {
-        var serverConfigStyle = {};
+        const serverConfigStyle = {};
         serverConfigStyle.display = this.state.configVisible ? 'block' : 'none';
 
-        var toggleButton;
+        let toggleButton;
         if (this.props.withToggleButton) {
             toggleButton = (
                 <div className="mx_ServerConfig_selector">
@@ -137,14 +136,14 @@ module.exports = React.createClass({
                         checked={!this.state.configVisible}
                         onChange={this.onServerConfigVisibleChange.bind(this, false)} />
                     <label className="mx_Login_label" htmlFor="basic">
-                        {_t("Default server")}
+                        { _t("Default server") }
                     </label>
                     &nbsp;&nbsp;
                     <input className="mx_Login_radio" id="advanced" name="configVisible" type="radio"
                         checked={this.state.configVisible}
                         onChange={this.onServerConfigVisibleChange.bind(this, true)} />
                     <label className="mx_Login_label" htmlFor="advanced">
-                        {_t("Custom server")}
+                        { _t("Custom server") }
                     </label>
                 </div>
             );
@@ -152,11 +151,11 @@ module.exports = React.createClass({
 
         return (
         <div>
-            {toggleButton}
+            { toggleButton }
             <div style={serverConfigStyle}>
                 <div className="mx_ServerConfig">
                     <label className="mx_Login_label mx_ServerConfig_hslabel" htmlFor="hsurl">
-                        {_t("Home server URL")}
+                        { _t("Home server URL") }
                     </label>
                     <input className="mx_Login_field" id="hsurl" type="text"
                         placeholder={this.props.defaultHsUrl}
@@ -164,7 +163,7 @@ module.exports = React.createClass({
                         value={this.state.hs_url}
                         onChange={this.onHomeserverChanged} />
                     <label className="mx_Login_label mx_ServerConfig_islabel" htmlFor="isurl">
-                        {_t("Identity server URL")}
+                        { _t("Identity server URL") }
                     </label>
                     <input className="mx_Login_field" id="isurl" type="text"
                         placeholder={this.props.defaultIsUrl}
@@ -172,11 +171,11 @@ module.exports = React.createClass({
                         value={this.state.is_url}
                         onChange={this.onIdentityServerChanged} />
                     <a className="mx_ServerConfig_help" href="#" onClick={this.showHelpPopup}>
-                        {_t("What does this mean?")}
+                        { _t("What does this mean?") }
                     </a>
                 </div>
             </div>
         </div>
         );
-    }
+    },
 });
diff --git a/src/components/views/messages/MAudioBody.js b/src/components/views/messages/MAudioBody.js
index 52c1341e60..ab53918987 100644
--- a/src/components/views/messages/MAudioBody.js
+++ b/src/components/views/messages/MAudioBody.js
@@ -35,7 +35,7 @@ export default class MAudioBody extends React.Component {
     }
     onPlayToggle() {
         this.setState({
-            playing: !this.state.playing
+            playing: !this.state.playing,
         });
     }
 
@@ -49,9 +49,9 @@ export default class MAudioBody extends React.Component {
     }
 
     componentDidMount() {
-        var content = this.props.mxEvent.getContent();
+        const content = this.props.mxEvent.getContent();
         if (content.file !== undefined && this.state.decryptedUrl === null) {
-            var decryptedBlob;
+            let decryptedBlob;
             decryptFile(content.file).then(function(blob) {
                 decryptedBlob = blob;
                 return readBlobAsDataUri(decryptedBlob);
@@ -70,14 +70,13 @@ export default class MAudioBody extends React.Component {
     }
 
     render() {
-
         const content = this.props.mxEvent.getContent();
 
         if (this.state.error !== null) {
             return (
                 <span className="mx_MAudioBody" ref="body">
-                    <img src="img/warning.svg" width="16" height="16"/>
-                    {_t("Error decrypting audio")}
+                    <img src="img/warning.svg" width="16" height="16" />
+                    { _t("Error decrypting audio") }
                 </span>
             );
         }
@@ -89,7 +88,7 @@ export default class MAudioBody extends React.Component {
             // Not sure how tall the audio player is so not sure how tall it should actually be.
             return (
                 <span className="mx_MAudioBody">
-                    <img src="img/spinner.gif" alt={content.body} width="16" height="16"/>
+                    <img src="img/spinner.gif" alt={content.body} width="16" height="16" />
                 </span>
             );
         }
diff --git a/src/components/views/messages/MFileBody.js b/src/components/views/messages/MFileBody.js
index 53c36f234c..8eedf4e1fe 100644
--- a/src/components/views/messages/MFileBody.js
+++ b/src/components/views/messages/MFileBody.js
@@ -28,10 +28,10 @@ import Modal from '../../../Modal';
 
 
 // A cached tinted copy of "img/download.svg"
-var tintedDownloadImageURL;
+let tintedDownloadImageURL;
 // Track a list of mounted MFileBody instances so that we can update
 // the "img/download.svg" when the tint changes.
-var nextMountId = 0;
+let nextMountId = 0;
 const mounts = {};
 
 /**
@@ -169,11 +169,11 @@ function computedStyle(element) {
         return "";
     }
     const style = window.getComputedStyle(element, null);
-    var cssText = style.cssText;
+    let cssText = style.cssText;
     if (cssText == "") {
         // Firefox doesn't implement ".cssText" for computed styles.
         // https://bugzilla.mozilla.org/show_bug.cgi?id=137687
-        for (var i = 0; i < style.length; i++) {
+        for (let i = 0; i < style.length; i++) {
             cssText += style[i] + ":";
             cssText += style.getPropertyValue(style[i]) + ";";
         }
@@ -202,7 +202,7 @@ module.exports = React.createClass({
      * @return {string} the human readable link text for the attachment.
      */
     presentableTextForFile: function(content) {
-        var linkText = _t("Attachment");
+        let linkText = _t("Attachment");
         if (content.body && content.body.length > 0) {
             // The content body should be the name of the file including a
             // file extension.
@@ -270,7 +270,7 @@ module.exports = React.createClass({
                 // Need to decrypt the attachment
                 // Wait for the user to click on the link before downloading
                 // and decrypting the attachment.
-                var decrypting = false;
+                let decrypting = false;
                 const decrypt = () => {
                     if (decrypting) {
                         return false;
@@ -328,14 +328,14 @@ module.exports = React.createClass({
                 <span className="mx_MFileBody">
                     <div className="mx_MImageBody_download">
                         <div style={{display: "none"}}>
-                            {/*
+                            { /*
                               * Add dummy copy of the "a" tag
                               * We'll use it to learn how the download link
                               * would have been styled if it was rendered inline.
-                              */}
-                            <a ref="dummyLink"/>
+                              */ }
+                            <a ref="dummyLink" />
                         </div>
-                        <iframe src={renderer_url} onLoad={onIframeLoad} ref="iframe"/>
+                        <iframe src={renderer_url} onLoad={onIframeLoad} ref="iframe" />
                     </div>
                 </span>
             );
@@ -356,13 +356,12 @@ module.exports = React.createClass({
                         </div>
                     </span>
                 );
-            }
-            else {
+            } else {
                 return (
                     <span className="mx_MFileBody">
                         <div className="mx_MImageBody_download">
                             <a href={contentUrl} download={fileName} target="_blank" rel="noopener">
-                                <img src={tintedDownloadImageURL} width="12" height="14" ref="downloadImage"/>
+                                <img src={tintedDownloadImageURL} width="12" height="14" ref="downloadImage" />
                                 { _t("Download %(text)s", { text: text }) }
                             </a>
                         </div>
@@ -370,7 +369,7 @@ module.exports = React.createClass({
                 );
             }
         } else {
-            var extra = text ? (': ' + text) : '';
+            const extra = text ? (': ' + text) : '';
             return <span className="mx_MFileBody">
                 { _t("Invalid file%(extra)s", { extra: extra }) }
             </span>;
diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js
index dcc073c80e..255f562fcd 100644
--- a/src/components/views/messages/MImageBody.js
+++ b/src/components/views/messages/MImageBody.js
@@ -191,8 +191,8 @@ module.exports = React.createClass({
         if (this.state.error !== null) {
             return (
                 <span className="mx_MImageBody" ref="body">
-                    <img src="img/warning.svg" width="16" height="16"/>
-                    {_t("Error decrypting image")}
+                    <img src="img/warning.svg" width="16" height="16" />
+                    { _t("Error decrypting image") }
                 </span>
             );
         }
@@ -210,7 +210,7 @@ module.exports = React.createClass({
                     }}>
                         <img src="img/spinner.gif" alt={content.body} width="32" height="32" style={{
                             "margin": "auto",
-                        }}/>
+                        }} />
                     </div>
                 </span>
             );
@@ -227,7 +227,7 @@ module.exports = React.createClass({
         if (thumbUrl) {
             return (
                 <span className="mx_MImageBody" ref="body">
-                    <a href={contentUrl} onClick={ this.onClick }>
+                    <a href={contentUrl} onClick={this.onClick}>
                         <img className="mx_MImageBody_thumbnail" src={thumbUrl} ref="image"
                             alt={content.body}
                             onMouseEnter={this.onImageEnter}
@@ -239,13 +239,13 @@ module.exports = React.createClass({
         } else if (content.body) {
             return (
                 <span className="mx_MImageBody">
-                    {_t("Image '%(Body)s' cannot be displayed.", {Body: content.body})}
+                    { _t("Image '%(Body)s' cannot be displayed.", {Body: content.body}) }
                 </span>
             );
         } else {
             return (
                 <span className="mx_MImageBody">
-                    {_t("This image cannot be displayed.")}
+                    { _t("This image cannot be displayed.") }
                 </span>
             );
         }
diff --git a/src/components/views/messages/MVideoBody.js b/src/components/views/messages/MVideoBody.js
index 06c233e012..d2205f5c78 100644
--- a/src/components/views/messages/MVideoBody.js
+++ b/src/components/views/messages/MVideoBody.js
@@ -54,13 +54,12 @@ module.exports = React.createClass({
             // no scaling needs to be applied
             return 1;
         }
-        var widthMulti = thumbWidth / fullWidth;
-        var heightMulti = thumbHeight / fullHeight;
+        const widthMulti = thumbWidth / fullWidth;
+        const heightMulti = thumbHeight / fullHeight;
         if (widthMulti < heightMulti) {
             // width is the dominant dimension so scaling will be fixed on that
             return widthMulti;
-        }
-        else {
+        } else {
             // height is the dominant dimension so scaling will be fixed on that
             return heightMulti;
         }
@@ -89,15 +88,15 @@ module.exports = React.createClass({
     componentDidMount: function() {
         const content = this.props.mxEvent.getContent();
         if (content.file !== undefined && this.state.decryptedUrl === null) {
-            var thumbnailPromise = Promise.resolve(null);
+            let thumbnailPromise = Promise.resolve(null);
             if (content.info.thumbnail_file) {
                 thumbnailPromise = decryptFile(
-                    content.info.thumbnail_file
+                    content.info.thumbnail_file,
                 ).then(function(blob) {
                     return readBlobAsDataUri(blob);
                 });
             }
-            var decryptedBlob;
+            let decryptedBlob;
             thumbnailPromise.then((thumbnailUrl) => {
                 return decryptFile(content.file).then(function(blob) {
                     decryptedBlob = blob;
@@ -126,8 +125,8 @@ module.exports = React.createClass({
         if (this.state.error !== null) {
             return (
                 <span className="mx_MVideoBody" ref="body">
-                    <img src="img/warning.svg" width="16" height="16"/>
-                    {_t("Error decrypting video")}
+                    <img src="img/warning.svg" width="16" height="16" />
+                    { _t("Error decrypting video") }
                 </span>
             );
         }
@@ -144,7 +143,7 @@ module.exports = React.createClass({
                         "justify-items": "center",
                         "width": "100%",
                     }}>
-                        <img src="img/spinner.gif" alt={content.body} width="16" height="16"/>
+                        <img src="img/spinner.gif" alt={content.body} width="16" height="16" />
                     </div>
                 </span>
             );
diff --git a/src/components/views/messages/MessageEvent.js b/src/components/views/messages/MessageEvent.js
index 4ac0c0dabb..deda1d8d20 100644
--- a/src/components/views/messages/MessageEvent.js
+++ b/src/components/views/messages/MessageEvent.js
@@ -16,8 +16,8 @@ limitations under the License.
 
 'use strict';
 
-var React = require('react');
-var sdk = require('../../../index');
+const React = require('react');
+const sdk = require('../../../index');
 
 module.exports = React.createClass({
     displayName: 'MessageEvent',
@@ -47,21 +47,21 @@ module.exports = React.createClass({
     },
 
     render: function() {
-        var UnknownBody = sdk.getComponent('messages.UnknownBody');
+        const UnknownBody = sdk.getComponent('messages.UnknownBody');
 
-        var bodyTypes = {
+        const bodyTypes = {
             'm.text': sdk.getComponent('messages.TextualBody'),
             'm.notice': sdk.getComponent('messages.TextualBody'),
             'm.emote': sdk.getComponent('messages.TextualBody'),
             'm.image': sdk.getComponent('messages.MImageBody'),
             'm.file': sdk.getComponent('messages.MFileBody'),
             'm.audio': sdk.getComponent('messages.MAudioBody'),
-            'm.video': sdk.getComponent('messages.MVideoBody')
+            'm.video': sdk.getComponent('messages.MVideoBody'),
         };
 
-        var content = this.props.mxEvent.getContent();
-        var msgtype = content.msgtype;
-        var BodyType = UnknownBody;
+        const content = this.props.mxEvent.getContent();
+        const msgtype = content.msgtype;
+        let BodyType = UnknownBody;
         if (msgtype && bodyTypes[msgtype]) {
             BodyType = bodyTypes[msgtype];
         } else if (content.url) {
diff --git a/src/components/views/messages/RoomAvatarEvent.js b/src/components/views/messages/RoomAvatarEvent.js
index ed790953dc..453394249f 100644
--- a/src/components/views/messages/RoomAvatarEvent.js
+++ b/src/components/views/messages/RoomAvatarEvent.js
@@ -31,9 +31,9 @@ module.exports = React.createClass({
     },
 
     onAvatarClick: function(name) {
-        var httpUrl = MatrixClientPeg.get().mxcUrlToHttp(this.props.mxEvent.getContent().url);
-        var ImageView = sdk.getComponent("elements.ImageView");
-        var params = {
+        const httpUrl = MatrixClientPeg.get().mxcUrlToHttp(this.props.mxEvent.getContent().url);
+        const ImageView = sdk.getComponent("elements.ImageView");
+        const params = {
             src: httpUrl,
             name: name,
         };
@@ -41,12 +41,12 @@ module.exports = React.createClass({
     },
 
     render: function() {
-        var ev = this.props.mxEvent;
-        var senderDisplayName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
-        var BaseAvatar = sdk.getComponent("avatars.BaseAvatar");
+        const ev = this.props.mxEvent;
+        const senderDisplayName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
+        const BaseAvatar = sdk.getComponent("avatars.BaseAvatar");
 
-        var room = MatrixClientPeg.get().getRoom(this.props.mxEvent.getRoomId());
-        var name = _t('%(senderDisplayName)s changed the avatar for %(roomName)s', {
+        const room = MatrixClientPeg.get().getRoom(this.props.mxEvent.getRoomId());
+        const name = _t('%(senderDisplayName)s changed the avatar for %(roomName)s', {
                 senderDisplayName: senderDisplayName,
                 roomName: room ? room.name : '',
         });
@@ -59,12 +59,12 @@ module.exports = React.createClass({
             );
         }
 
-        var url = ContentRepo.getHttpUriForMxc(
+        const url = ContentRepo.getHttpUriForMxc(
                     MatrixClientPeg.get().getHomeserverUrl(),
                     ev.getContent().url,
                     Math.ceil(14 * window.devicePixelRatio),
                     Math.ceil(14 * window.devicePixelRatio),
-                    'crop'
+                    'crop',
                 );
 
         // it sucks that _tJsx doesn't support normal _t substitutions :((
@@ -79,11 +79,11 @@ module.exports = React.createClass({
                             (sub) => senderDisplayName,
                             (sub) =>
                                 <AccessibleButton key="avatar" className="mx_RoomAvatarEvent_avatar"
-                                                  onClick={ this.onAvatarClick.bind(this, name) }>
-                                    <BaseAvatar width={14} height={14} url={ url }
-                                                name={ name } />
+                                                  onClick={this.onAvatarClick.bind(this, name)}>
+                                    <BaseAvatar width={14} height={14} url={url}
+                                                name={name} />
                                 </AccessibleButton>,
-                         ]
+                         ],
                     )
                 }
             </div>
diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index aae46d343c..c0468c38c2 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -104,10 +104,10 @@ module.exports = React.createClass({
                     if (this._unmounted) return;
                     for (let i = 0; i < blocks.length; i++) {
                         if (UserSettingsStore.getSyncedSetting("enableSyntaxHighlightLanguageDetection", false)) {
-                            highlight.highlightBlock(blocks[i])
+                            highlight.highlightBlock(blocks[i]);
                         } else {
                             // Only syntax highlight if there's a class starting with language-
-                            let classes = blocks[i].className.split(/\s+/).filter(function (cl) {
+                            const classes = blocks[i].className.split(/\s+/).filter(function(cl) {
                                 return cl.startsWith('language-');
                             });
 
@@ -146,7 +146,7 @@ module.exports = React.createClass({
         //console.log("calculateUrlPreview: ShowUrlPreview for %s is %s", this.props.mxEvent.getId(), this.props.showUrlPreview);
 
         if (this.props.showUrlPreview && !this.state.links.length) {
-            var links = this.findLinks(this.refs.content.children);
+            let links = this.findLinks(this.refs.content.children);
             if (links.length) {
                 // de-dup the links (but preserve ordering)
                 const seen = new Set();
@@ -160,7 +160,7 @@ module.exports = React.createClass({
 
                 // lazy-load the hidden state of the preview widget from localstorage
                 if (global.localStorage) {
-                    var hidden = global.localStorage.getItem("hide_preview_" + this.props.mxEvent.getId());
+                    const hidden = global.localStorage.getItem("hide_preview_" + this.props.mxEvent.getId());
                     this.setState({ widgetHidden: hidden });
                 }
             }
@@ -197,21 +197,18 @@ module.exports = React.createClass({
     },
 
     findLinks: function(nodes) {
-        var links = [];
+        let links = [];
 
-        for (var i = 0; i < nodes.length; i++) {
-            var node = nodes[i];
-            if (node.tagName === "A" && node.getAttribute("href"))
-            {
+        for (let i = 0; i < nodes.length; i++) {
+            const node = nodes[i];
+            if (node.tagName === "A" && node.getAttribute("href")) {
                 if (this.isLinkPreviewable(node)) {
                     links.push(node.getAttribute("href"));
                 }
-            }
-            else if (node.tagName === "PRE" || node.tagName === "CODE" ||
+            } else if (node.tagName === "PRE" || node.tagName === "CODE" ||
                     node.tagName === "BLOCKQUOTE") {
                 continue;
-            }
-            else if (node.children && node.children.length) {
+            } else if (node.children && node.children.length) {
                 links = links.concat(this.findLinks(node.children));
             }
         }
@@ -221,8 +218,7 @@ module.exports = React.createClass({
     isLinkPreviewable: function(node) {
         // don't try to preview relative links
         if (!node.getAttribute("href").startsWith("http://") &&
-            !node.getAttribute("href").startsWith("https://"))
-        {
+            !node.getAttribute("href").startsWith("https://")) {
             return false;
         }
 
@@ -231,13 +227,11 @@ module.exports = React.createClass({
         // or from a full foo.bar/baz style schemeless URL) - or be a markdown-style
         // link, in which case we check the target text differs from the link value.
         // TODO: make this configurable?
-        if (node.textContent.indexOf("/") > -1)
-        {
+        if (node.textContent.indexOf("/") > -1) {
             return true;
-        }
-        else {
-            var url = node.getAttribute("href");
-            var host = url.match(/^https?:\/\/(.*?)(\/|$)/)[1];
+        } else {
+            const url = node.getAttribute("href");
+            const host = url.match(/^https?:\/\/(.*?)(\/|$)/)[1];
 
             // never preview matrix.to links (if anything we should give a smart
             // preview of the room/user they point to: nobody needs to be reminded
@@ -247,8 +241,7 @@ module.exports = React.createClass({
             if (node.textContent.toLowerCase().trim().startsWith(host.toLowerCase())) {
                 // it's a "foo.pl" style link
                 return false;
-            }
-            else {
+            } else {
                 // it's a [foo bar](http://foo.com) style link
                 return true;
             }
@@ -263,7 +256,7 @@ module.exports = React.createClass({
             button.onclick = (e) => {
                 const copyCode = button.parentNode.getElementsByTagName("code")[0];
                 const successful = this.copyToClipboard(copyCode.textContent);
-              
+
                 const GenericTextContextMenu = sdk.getComponent('context_menus.GenericTextContextMenu');
                 const buttonRect = e.target.getBoundingClientRect();
 
@@ -314,7 +307,7 @@ module.exports = React.createClass({
 
             getInnerText: () => {
                 return this.refs.content.innerText;
-            }
+            },
         };
     },
 
@@ -328,28 +321,28 @@ module.exports = React.createClass({
         // the window.open command occurs in the same stack frame as the onClick callback.
 
         // Go fetch a scalar token
-        let scalarClient = new ScalarAuthClient();
+        const scalarClient = new ScalarAuthClient();
         scalarClient.connect().then(() => {
-            let completeUrl = scalarClient.getStarterLink(starterLink);
-            let QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
-            let integrationsUrl = SdkConfig.get().integrations_ui_url;
+            const completeUrl = scalarClient.getStarterLink(starterLink);
+            const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
+            const integrationsUrl = SdkConfig.get().integrations_ui_url;
             Modal.createTrackedDialog('Add an integration', '', QuestionDialog, {
                 title: _t("Add an Integration"),
                 description:
                     <div>
-                        {_t("You are about to be taken to a third-party site so you can " +
+                        { _t("You are about to be taken to a third-party site so you can " +
                             "authenticate your account for use with %(integrationsUrl)s. " +
-                            "Do you wish to continue?", { integrationsUrl: integrationsUrl })}
+                            "Do you wish to continue?", { integrationsUrl: integrationsUrl }) }
                     </div>,
                 button: _t("Continue"),
                 onFinished: function(confirmed) {
                     if (!confirmed) {
                         return;
                     }
-                    let width = window.screen.width > 1024 ? 1024 : window.screen.width;
-                    let height = window.screen.height > 800 ? 800 : window.screen.height;
-                    let left = (window.screen.width - width) / 2;
-                    let top = (window.screen.height - height) / 2;
+                    const width = window.screen.width > 1024 ? 1024 : window.screen.width;
+                    const height = window.screen.height > 800 ? 800 : window.screen.height;
+                    const left = (window.screen.width - width) / 2;
+                    const top = (window.screen.height - height) / 2;
                     window.open(completeUrl, '_blank', `height=${height}, width=${width}, top=${top}, left=${left},`);
                 },
             });
@@ -358,28 +351,27 @@ module.exports = React.createClass({
 
     render: function() {
         const EmojiText = sdk.getComponent('elements.EmojiText');
-        var mxEvent = this.props.mxEvent;
-        var content = mxEvent.getContent();
+        const mxEvent = this.props.mxEvent;
+        const content = mxEvent.getContent();
 
-        var body = HtmlUtils.bodyToHtml(content, this.props.highlights, {});
+        let body = HtmlUtils.bodyToHtml(content, this.props.highlights, {});
 
         if (this.props.highlightLink) {
-            body = <a href={ this.props.highlightLink }>{ body }</a>;
-        }
-        else if (content.data && typeof content.data["org.matrix.neb.starter_link"] === "string") {
-            body = <a href="#" onClick={ this.onStarterLinkClick.bind(this, content.data["org.matrix.neb.starter_link"]) }>{ body }</a>;
+            body = <a href={this.props.highlightLink}>{ body }</a>;
+        } else if (content.data && typeof content.data["org.matrix.neb.starter_link"] === "string") {
+            body = <a href="#" onClick={this.onStarterLinkClick.bind(this, content.data["org.matrix.neb.starter_link"])}>{ body }</a>;
         }
 
-        var widgets;
+        let widgets;
         if (this.state.links.length && !this.state.widgetHidden && this.props.showUrlPreview) {
-            var LinkPreviewWidget = sdk.getComponent('rooms.LinkPreviewWidget');
+            const LinkPreviewWidget = sdk.getComponent('rooms.LinkPreviewWidget');
             widgets = this.state.links.map((link)=>{
                 return <LinkPreviewWidget
-                            key={ link }
-                            link={ link }
-                            mxEvent={ this.props.mxEvent }
-                            onCancelClick={ this.onCancelClick }
-                            onWidgetLoad={ this.props.onWidgetLoad }/>;
+                            key={link}
+                            link={link}
+                            mxEvent={this.props.mxEvent}
+                            onCancelClick={this.onCancelClick}
+                            onWidgetLoad={this.props.onWidgetLoad} />;
             });
         }
 
@@ -393,7 +385,7 @@ module.exports = React.createClass({
                             className="mx_MEmoteBody_sender"
                             onClick={this.onEmoteSenderClick}
                         >
-                            {name}
+                            { name }
                         </EmojiText>
                         &nbsp;
                         { body }
diff --git a/src/components/views/messages/TextualEvent.js b/src/components/views/messages/TextualEvent.js
index 088f7cbbc6..be0962a868 100644
--- a/src/components/views/messages/TextualEvent.js
+++ b/src/components/views/messages/TextualEvent.js
@@ -16,9 +16,9 @@ limitations under the License.
 
 'use strict';
 
-var React = require('react');
+const React = require('react');
 
-var TextForEvent = require('../../../TextForEvent');
+const TextForEvent = require('../../../TextForEvent');
 import sdk from '../../../index';
 
 module.exports = React.createClass({
@@ -28,13 +28,13 @@ module.exports = React.createClass({
         /* the MatrixEvent to show */
         mxEvent: React.PropTypes.object.isRequired,
     },
-    
+
     render: function() {
         const EmojiText = sdk.getComponent('elements.EmojiText');
-        var text = TextForEvent.textForEvent(this.props.mxEvent);
+        const text = TextForEvent.textForEvent(this.props.mxEvent);
         if (text == null || text.length === 0) return null;
         return (
-            <EmojiText element="div" className="mx_TextualEvent">{text}</EmojiText>
+            <EmojiText element="div" className="mx_TextualEvent">{ text }</EmojiText>
         );
     },
 });
diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index 94301c432d..c64e876dbe 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -15,12 +15,12 @@ limitations under the License.
 */
 
 import Promise from 'bluebird';
-var React = require('react');
-var ObjectUtils = require("../../../ObjectUtils");
-var MatrixClientPeg = require('../../../MatrixClientPeg');
-var sdk = require("../../../index");
+const React = require('react');
+const ObjectUtils = require("../../../ObjectUtils");
+const MatrixClientPeg = require('../../../MatrixClientPeg');
+const sdk = require("../../../index");
 import { _t } from '../../../languageHandler';
-var Modal = require("../../../Modal");
+const Modal = require("../../../Modal");
 
 module.exports = React.createClass({
     displayName: 'AliasSettings',
@@ -30,14 +30,14 @@ module.exports = React.createClass({
         canSetCanonicalAlias: React.PropTypes.bool.isRequired,
         canSetAliases: React.PropTypes.bool.isRequired,
         aliasEvents: React.PropTypes.array, // [MatrixEvent]
-        canonicalAliasEvent: React.PropTypes.object // MatrixEvent
+        canonicalAliasEvent: React.PropTypes.object, // MatrixEvent
     },
 
     getDefaultProps: function() {
         return {
             canSetAliases: false,
             canSetCanonicalAlias: false,
-            aliasEvents: []
+            aliasEvents: [],
         };
     },
 
@@ -48,12 +48,12 @@ module.exports = React.createClass({
     recalculateState: function(aliasEvents, canonicalAliasEvent) {
         aliasEvents = aliasEvents || [];
 
-        var state = {
+        const state = {
             domainToAliases: {}, // { domain.com => [#alias1:domain.com, #alias2:domain.com] }
             remoteDomains: [], // [ domain.com, foobar.com ]
-            canonicalAlias: null // #canonical:domain.com
+            canonicalAlias: null, // #canonical:domain.com
         };
-        var localDomain = MatrixClientPeg.get().getDomain();
+        const localDomain = MatrixClientPeg.get().getDomain();
 
         state.domainToAliases = this.aliasEventsToDictionary(aliasEvents);
 
@@ -69,26 +69,26 @@ module.exports = React.createClass({
     },
 
     saveSettings: function() {
-        var promises = [];
+        let promises = [];
 
         // save new aliases for m.room.aliases
-        var aliasOperations = this.getAliasOperations();
-        for (var i = 0; i < aliasOperations.length; i++) {
-            var alias_operation = aliasOperations[i];
+        const aliasOperations = this.getAliasOperations();
+        for (let i = 0; i < aliasOperations.length; i++) {
+            const alias_operation = aliasOperations[i];
             console.log("alias %s %s", alias_operation.place, alias_operation.val);
             switch (alias_operation.place) {
                 case 'add':
                     promises.push(
                         MatrixClientPeg.get().createAlias(
-                            alias_operation.val, this.props.roomId
-                        )
+                            alias_operation.val, this.props.roomId,
+                        ),
                     );
                     break;
                 case 'del':
                     promises.push(
                         MatrixClientPeg.get().deleteAlias(
-                            alias_operation.val
-                        )
+                            alias_operation.val,
+                        ),
                     );
                     break;
                 default:
@@ -98,7 +98,7 @@ module.exports = React.createClass({
 
 
         // save new canonical alias
-        var oldCanonicalAlias = null;
+        let oldCanonicalAlias = null;
         if (this.props.canonicalAliasEvent) {
             oldCanonicalAlias = this.props.canonicalAliasEvent.getContent().alias;
         }
@@ -107,9 +107,9 @@ module.exports = React.createClass({
             promises = [Promise.all(promises).then(
                 MatrixClientPeg.get().sendStateEvent(
                     this.props.roomId, "m.room.canonical_alias", {
-                        alias: this.state.canonicalAlias
-                    }, ""
-                )
+                        alias: this.state.canonicalAlias,
+                    }, "",
+                ),
             )];
         }
 
@@ -117,7 +117,7 @@ module.exports = React.createClass({
     },
 
     aliasEventsToDictionary: function(aliasEvents) { // m.room.alias events
-        var dict = {};
+        const dict = {};
         aliasEvents.forEach((event) => {
             dict[event.getStateKey()] = (
                 (event.getContent().aliases || []).slice() // shallow-copy
@@ -132,7 +132,7 @@ module.exports = React.createClass({
     },
 
     getAliasOperations: function() {
-        var oldAliases = this.aliasEventsToDictionary(this.props.aliasEvents);
+        const oldAliases = this.aliasEventsToDictionary(this.props.aliasEvents);
         return ObjectUtils.getKeyValueArrayDiffs(oldAliases, this.state.domainToAliases);
     },
 
@@ -191,26 +191,26 @@ module.exports = React.createClass({
 
     onCanonicalAliasChange: function(event) {
         this.setState({
-            canonicalAlias: event.target.value
+            canonicalAlias: event.target.value,
         });
     },
 
     render: function() {
-        var self = this;
-        var EditableText = sdk.getComponent("elements.EditableText");
-        var EditableItemList = sdk.getComponent("elements.EditableItemList");
-        var localDomain = MatrixClientPeg.get().getDomain();
+        const self = this;
+        const EditableText = sdk.getComponent("elements.EditableText");
+        const EditableItemList = sdk.getComponent("elements.EditableItemList");
+        const localDomain = MatrixClientPeg.get().getDomain();
 
-        var canonical_alias_section;
+        let canonical_alias_section;
         if (this.props.canSetCanonicalAlias) {
             canonical_alias_section = (
-                <select onChange={this.onCanonicalAliasChange} defaultValue={ this.state.canonicalAlias }>
+                <select onChange={this.onCanonicalAliasChange} defaultValue={this.state.canonicalAlias}>
                     <option value="" key="unset">{ _t('not specified') }</option>
                     {
                         Object.keys(self.state.domainToAliases).map(function(domain, i) {
                             return self.state.domainToAliases[domain].map(function(alias, j) {
                                 return (
-                                    <option value={ alias } key={ i + "_" + j }>
+                                    <option value={alias} key={i + "_" + j}>
                                         { alias }
                                     </option>
                                 );
@@ -219,34 +219,33 @@ module.exports = React.createClass({
                     }
                 </select>
             );
-        }
-        else {
+        } else {
             canonical_alias_section = (
                 <b>{ this.state.canonicalAlias || _t('not set') }</b>
             );
         }
 
-        var remote_aliases_section;
+        let remote_aliases_section;
         if (this.state.remoteDomains.length) {
             remote_aliases_section = (
                 <div>
                     <div className="mx_RoomSettings_aliasLabel">
-                        {_t("Remote addresses for this room:")}
+                        { _t("Remote addresses for this room:") }
                     </div>
                     <div className="mx_RoomSettings_aliasesTable">
                         { this.state.remoteDomains.map((domain, i) => {
                             return this.state.domainToAliases[domain].map(function(alias, j) {
                                 return (
-                                    <div className="mx_RoomSettings_aliasesTableRow" key={ i + "_" + j }>
+                                    <div className="mx_RoomSettings_aliasesTableRow" key={i + "_" + j}>
                                         <EditableText
                                              className="mx_RoomSettings_alias mx_RoomSettings_editable"
-                                             blurToCancel={ false }
-                                             editable={ false }
-                                             initialValue={ alias } />
+                                             blurToCancel={false}
+                                             editable={false}
+                                             initialValue={alias} />
                                     </div>
                                 );
                             });
-                        })}
+                        }) }
                     </div>
                 </div>
             );
diff --git a/src/components/views/room_settings/ColorSettings.js b/src/components/views/room_settings/ColorSettings.js
index b37802d304..d914390bd8 100644
--- a/src/components/views/room_settings/ColorSettings.js
+++ b/src/components/views/room_settings/ColorSettings.js
@@ -14,16 +14,16 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 import Promise from 'bluebird';
-var React = require('react');
+const React = require('react');
 
-var sdk = require('../../../index');
-var Tinter = require('../../../Tinter');
-var MatrixClientPeg = require("../../../MatrixClientPeg");
-var Modal = require("../../../Modal");
+const sdk = require('../../../index');
+const Tinter = require('../../../Tinter');
+const MatrixClientPeg = require("../../../MatrixClientPeg");
+const Modal = require("../../../Modal");
 
 import dis from '../../../dispatcher';
 
-var ROOM_COLORS = [
+const ROOM_COLORS = [
     // magic room default values courtesy of Ribot
     ["#76cfa6", "#eaf5f0"],
     ["#81bddb", "#eaf1f4"],
@@ -41,21 +41,21 @@ module.exports = React.createClass({
     displayName: 'ColorSettings',
 
     propTypes: {
-        room: React.PropTypes.object.isRequired
+        room: React.PropTypes.object.isRequired,
     },
 
     getInitialState: function() {
-        var data = {
+        const data = {
             index: 0,
             primary_color: ROOM_COLORS[0].primary_color,
             secondary_color: ROOM_COLORS[0].secondary_color,
-            hasChanged: false
+            hasChanged: false,
         };
-        var event = this.props.room.getAccountData("org.matrix.room.color_scheme");
+        const event = this.props.room.getAccountData("org.matrix.room.color_scheme");
         if (!event) {
             return data;
         }
-        var scheme = event.getContent();
+        const scheme = event.getContent();
         data.primary_color = scheme.primary_color;
         data.secondary_color = scheme.secondary_color;
         data.index = this._getColorIndex(data);
@@ -64,7 +64,7 @@ module.exports = React.createClass({
             // append the unrecognised colours to our palette
             data.index = ROOM_COLORS.length;
             ROOM_COLORS.push([
-                scheme.primary_color, scheme.secondary_color
+                scheme.primary_color, scheme.secondary_color,
             ]);
         }
         return data;
@@ -74,7 +74,7 @@ module.exports = React.createClass({
         if (!this.state.hasChanged) {
             return Promise.resolve(); // They didn't explicitly give a color to save.
         }
-        var originalState = this.getInitialState();
+        const originalState = this.getInitialState();
         if (originalState.primary_color !== this.state.primary_color ||
                 originalState.secondary_color !== this.state.secondary_color) {
             console.log("ColorSettings: Saving new color");
@@ -84,8 +84,8 @@ module.exports = React.createClass({
             return MatrixClientPeg.get().setRoomAccountData(
                 this.props.room.roomId, "org.matrix.room.color_scheme", {
                     primary_color: this.state.primary_color,
-                    secondary_color: this.state.secondary_color
-                }
+                    secondary_color: this.state.secondary_color,
+                },
             ).catch(function(err) {
                 if (err.errcode == 'M_GUEST_ACCESS_FORBIDDEN') {
                     dis.dispatch({action: 'view_set_mxid'});
@@ -100,8 +100,8 @@ module.exports = React.createClass({
             return -1;
         }
         // XXX: we should validate these values
-        for (var i = 0; i < ROOM_COLORS.length; i++) {
-            var room_color = ROOM_COLORS[i];
+        for (let i = 0; i < ROOM_COLORS.length; i++) {
+            const room_color = ROOM_COLORS[i];
             if (room_color[0] === String(scheme.primary_color).toLowerCase() &&
                     room_color[1] === String(scheme.secondary_color).toLowerCase()) {
                 return i;
@@ -117,34 +117,34 @@ module.exports = React.createClass({
             index: index,
             primary_color: ROOM_COLORS[index][0],
             secondary_color: ROOM_COLORS[index][1],
-            hasChanged: true
+            hasChanged: true,
         });
     },
 
     render: function() {
         return (
             <div className="mx_RoomSettings_roomColors">
-                {ROOM_COLORS.map((room_color, i) => {
-                    var selected;
+                { ROOM_COLORS.map((room_color, i) => {
+                    let selected;
                     if (i === this.state.index) {
                         selected = (
                             <div className="mx_RoomSettings_roomColor_selected">
-                                <img src="img/tick.svg" width="17" height="14" alt="./"/>
+                                <img src="img/tick.svg" width="17" height="14" alt="./" />
                             </div>
                         );
                     }
-                    var boundClick = this._onColorSchemeChanged.bind(this, i);
+                    const boundClick = this._onColorSchemeChanged.bind(this, i);
                     return (
                         <div className="mx_RoomSettings_roomColor"
-                              key={ "room_color_" + i }
+                              key={"room_color_" + i}
                               style={{ backgroundColor: room_color[1] }}
-                              onClick={ boundClick }>
+                              onClick={boundClick}>
                             { selected }
                             <div className="mx_RoomSettings_roomColorPrimary" style={{ backgroundColor: room_color[0] }}></div>
                         </div>
                     );
-                })}
+                }) }
             </div>
         );
-    }
+    },
 });
diff --git a/src/components/views/room_settings/UrlPreviewSettings.js b/src/components/views/room_settings/UrlPreviewSettings.js
index 5ee18badaa..56ae24e2f8 100644
--- a/src/components/views/room_settings/UrlPreviewSettings.js
+++ b/src/components/views/room_settings/UrlPreviewSettings.js
@@ -15,11 +15,11 @@ limitations under the License.
 */
 
 import Promise from 'bluebird';
-var React = require('react');
-var MatrixClientPeg = require('../../../MatrixClientPeg');
-var sdk = require("../../../index");
-var Modal = require("../../../Modal");
-var UserSettingsStore = require('../../../UserSettingsStore');
+const React = require('react');
+const MatrixClientPeg = require('../../../MatrixClientPeg');
+const sdk = require("../../../index");
+const Modal = require("../../../Modal");
+const UserSettingsStore = require('../../../UserSettingsStore');
 import { _t, _tJsx } from '../../../languageHandler';
 
 
@@ -31,11 +31,11 @@ module.exports = React.createClass({
     },
 
     getInitialState: function() {
-        var cli = MatrixClientPeg.get();
-        var roomState = this.props.room.currentState;
+        const cli = MatrixClientPeg.get();
+        const roomState = this.props.room.currentState;
 
-        var roomPreviewUrls = this.props.room.currentState.getStateEvents('org.matrix.room.preview_urls', '');
-        var userPreviewUrls = this.props.room.getAccountData("org.matrix.room.preview_urls");
+        const roomPreviewUrls = this.props.room.currentState.getStateEvents('org.matrix.room.preview_urls', '');
+        const userPreviewUrls = this.props.room.getAccountData("org.matrix.room.preview_urls");
 
         return {
             globalDisableUrlPreview: (roomPreviewUrls && roomPreviewUrls.getContent().disable) || false,
@@ -49,37 +49,37 @@ module.exports = React.createClass({
     },
 
     saveSettings: function() {
-        var promises = [];
+        const promises = [];
 
         if (this.state.globalDisableUrlPreview !== this.originalState.globalDisableUrlPreview) {
             console.log("UrlPreviewSettings: Updating room's preview_urls state event");
             promises.push(
                 MatrixClientPeg.get().sendStateEvent(
                     this.props.room.roomId, "org.matrix.room.preview_urls", {
-                        disable: this.state.globalDisableUrlPreview
-                    }, ""
-                )
+                        disable: this.state.globalDisableUrlPreview,
+                    }, "",
+                ),
             );
         }
 
-        var content = undefined;
+        let content = undefined;
         if (this.state.userDisableUrlPreview !== this.originalState.userDisableUrlPreview) {
             console.log("UrlPreviewSettings: Disabling user's per-room preview_urls");
-            content = this.state.userDisableUrlPreview ? { disable : true } : {};
+            content = this.state.userDisableUrlPreview ? { disable: true } : {};
         }
 
         if (this.state.userEnableUrlPreview !== this.originalState.userEnableUrlPreview) {
             console.log("UrlPreviewSettings: Enabling user's per-room preview_urls");
             if (!content || content.disable === undefined) {
-                content = this.state.userEnableUrlPreview ? { disable : false } : {};
+                content = this.state.userEnableUrlPreview ? { disable: false } : {};
             }
         }
 
         if (content) {
             promises.push(
                 MatrixClientPeg.get().setRoomAccountData(
-                    this.props.room.roomId, "org.matrix.room.preview_urls", content
-                )
+                    this.props.room.roomId, "org.matrix.room.preview_urls", content,
+                ),
             );
         }
 
@@ -109,62 +109,59 @@ module.exports = React.createClass({
     },
 
     render: function() {
-        var self = this;
-        var roomState = this.props.room.currentState;
-        var cli = MatrixClientPeg.get();
+        const self = this;
+        const roomState = this.props.room.currentState;
+        const cli = MatrixClientPeg.get();
 
-        var maySetRoomPreviewUrls = roomState.mayClientSendStateEvent('org.matrix.room.preview_urls', cli);
-        var disableRoomPreviewUrls;
+        const maySetRoomPreviewUrls = roomState.mayClientSendStateEvent('org.matrix.room.preview_urls', cli);
+        let disableRoomPreviewUrls;
         if (maySetRoomPreviewUrls) {
             disableRoomPreviewUrls =
                 <label>
                     <input type="checkbox" ref="globalDisableUrlPreview"
-                           onChange={ this.onGlobalDisableUrlPreviewChange }
-                           checked={ this.state.globalDisableUrlPreview } />
-                    {_t("Disable URL previews by default for participants in this room")}
+                           onChange={this.onGlobalDisableUrlPreviewChange}
+                           checked={this.state.globalDisableUrlPreview} />
+                    { _t("Disable URL previews by default for participants in this room") }
                 </label>;
-        }
-        else {
+        } else {
             disableRoomPreviewUrls =
                 <label>
-                    {_t("URL previews are %(globalDisableUrlPreview)s by default for participants in this room.", {globalDisableUrlPreview: this.state.globalDisableUrlPreview ? _t("disabled") : _t("enabled")})}
+                    { _t("URL previews are %(globalDisableUrlPreview)s by default for participants in this room.", {globalDisableUrlPreview: this.state.globalDisableUrlPreview ? _t("disabled") : _t("enabled")}) }
                 </label>;
         }
 
         let urlPreviewText = null;
         if (UserSettingsStore.getUrlPreviewsDisabled()) {
             urlPreviewText = (
-                _tJsx("You have <a>disabled</a> URL previews by default.", /<a>(.*?)<\/a>/, (sub)=><a href="#/settings">{sub}</a>)
+                _tJsx("You have <a>disabled</a> URL previews by default.", /<a>(.*?)<\/a>/, (sub)=><a href="#/settings">{ sub }</a>)
             );
-        }
-        else {
+        } else {
             urlPreviewText = (
-                _tJsx("You have <a>enabled</a> URL previews by default.", /<a>(.*?)<\/a>/, (sub)=><a href="#/settings">{sub}</a>)
+                _tJsx("You have <a>enabled</a> URL previews by default.", /<a>(.*?)<\/a>/, (sub)=><a href="#/settings">{ sub }</a>)
             );
         }
 
         return (
             <div className="mx_RoomSettings_toggles">
-                <h3>{_t("URL Previews")}</h3>
+                <h3>{ _t("URL Previews") }</h3>
 
                 <label>
-                {urlPreviewText}
+                { urlPreviewText }
                 </label>
                 { disableRoomPreviewUrls }
                 <label>
                     <input type="checkbox" ref="userEnableUrlPreview"
-                           onChange={ this.onUserEnableUrlPreviewChange }
-                           checked={ this.state.userEnableUrlPreview } />
-                    {_t("Enable URL previews for this room (affects only you)")}
+                           onChange={this.onUserEnableUrlPreviewChange}
+                           checked={this.state.userEnableUrlPreview} />
+                    { _t("Enable URL previews for this room (affects only you)") }
                 </label>
                 <label>
                     <input type="checkbox" ref="userDisableUrlPreview"
-                           onChange={ this.onUserDisableUrlPreviewChange }
-                           checked={ this.state.userDisableUrlPreview } />
-                    {_t("Disable URL previews for this room (affects only you)")}
+                           onChange={this.onUserDisableUrlPreviewChange}
+                           checked={this.state.userDisableUrlPreview} />
+                    { _t("Disable URL previews for this room (affects only you)") }
                 </label>
             </div>
         );
-
-    }
+    },
 });
diff --git a/src/components/views/rooms/Autocomplete.js b/src/components/views/rooms/Autocomplete.js
index 7706cc7ebd..beeecf5430 100644
--- a/src/components/views/rooms/Autocomplete.js
+++ b/src/components/views/rooms/Autocomplete.js
@@ -251,15 +251,15 @@ export default class Autocomplete extends React.Component {
 
             return completions.length > 0 ? (
                 <div key={i} className="mx_Autocomplete_ProviderSection">
-                    <EmojiText element="div" className="mx_Autocomplete_provider_name">{completionResult.provider.getName()}</EmojiText>
-                    {completionResult.provider.renderCompletions(completions)}
+                    <EmojiText element="div" className="mx_Autocomplete_provider_name">{ completionResult.provider.getName() }</EmojiText>
+                    { completionResult.provider.renderCompletions(completions) }
                 </div>
             ) : null;
         }).filter((completion) => !!completion);
 
         return !this.state.hide && renderedCompletions.length > 0 ? (
             <div className="mx_Autocomplete" ref={(e) => this.container = e}>
-                {renderedCompletions}
+                { renderedCompletions }
             </div>
         ) : null;
     }
diff --git a/src/components/views/rooms/AuxPanel.js b/src/components/views/rooms/AuxPanel.js
index 65dedad61d..726ec7ff1d 100644
--- a/src/components/views/rooms/AuxPanel.js
+++ b/src/components/views/rooms/AuxPanel.js
@@ -83,9 +83,9 @@ module.exports = React.createClass({
                 <div className="mx_RoomView_fileDropTarget">
                     <div className="mx_RoomView_fileDropTargetLabel"
                       title={_t("Drop File Here")}>
-                        <TintableSvg src="img/upload-big.svg" width="45" height="59"/>
-                        <br/>
-                        {_t("Drop file here to upload")}
+                        <TintableSvg src="img/upload-big.svg" width="45" height="59" />
+                        <br />
+                        { _t("Drop file here to upload") }
                     </div>
                 </div>
             );
@@ -99,23 +99,23 @@ module.exports = React.createClass({
                 supportedText = _t(" (unsupported)");
             } else {
                 joinNode = (<span>
-                    {_tJsx(
+                    { _tJsx(
                         "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.",
                         [/<voiceText>(.*?)<\/voiceText>/, /<videoText>(.*?)<\/videoText>/],
                         [
-                            (sub) => <a onClick={(event)=>{ this.onConferenceNotificationClick(event, 'voice');}} href="#">{sub}</a>,
-                            (sub) => <a onClick={(event)=>{ this.onConferenceNotificationClick(event, 'video');}} href="#">{sub}</a>,
-                        ]
-                    )}
+                            (sub) => <a onClick={(event)=>{ this.onConferenceNotificationClick(event, 'voice');}} href="#">{ sub }</a>,
+                            (sub) => <a onClick={(event)=>{ this.onConferenceNotificationClick(event, 'video');}} href="#">{ sub }</a>,
+                        ],
+                    ) }
                 </span>);
             }
             // XXX: the translation here isn't great: appending ' (unsupported)' is likely to not make sense in many languages,
             // but there are translations for this in the languages we do have so I'm leaving it for now.
             conferenceCallNotification = (
                 <div className="mx_RoomView_ongoingConfCallNotification">
-                    {_t("Ongoing conference call%(supportedText)s.", {supportedText: supportedText})}
+                    { _t("Ongoing conference call%(supportedText)s.", {supportedText: supportedText}) }
                     &nbsp;
-                    {joinNode}
+                    { joinNode }
                 </div>
             );
         }
diff --git a/src/components/views/rooms/EntityTile.js b/src/components/views/rooms/EntityTile.js
index 7002e45c3b..64934f3cca 100644
--- a/src/components/views/rooms/EntityTile.js
+++ b/src/components/views/rooms/EntityTile.js
@@ -16,18 +16,18 @@ limitations under the License.
 
 'use strict';
 
-var React = require('react');
+const React = require('react');
 
-var MatrixClientPeg = require('../../../MatrixClientPeg');
-var sdk = require('../../../index');
+const MatrixClientPeg = require('../../../MatrixClientPeg');
+const sdk = require('../../../index');
 import AccessibleButton from '../elements/AccessibleButton';
 import { _t } from '../../../languageHandler';
 
 
-var PRESENCE_CLASS = {
+const PRESENCE_CLASS = {
     "offline": "mx_EntityTile_offline",
     "online": "mx_EntityTile_online",
-    "unavailable": "mx_EntityTile_unavailable"
+    "unavailable": "mx_EntityTile_unavailable",
 };
 
 
@@ -62,7 +62,7 @@ module.exports = React.createClass({
         showInviteButton: React.PropTypes.bool,
         shouldComponentUpdate: React.PropTypes.func,
         onClick: React.PropTypes.func,
-        suppressOnHover: React.PropTypes.bool
+        suppressOnHover: React.PropTypes.bool,
     },
 
     getDefaultProps: function() {
@@ -73,13 +73,13 @@ module.exports = React.createClass({
             presenceLastActiveAgo: 0,
             presenceLastTs: 0,
             showInviteButton: false,
-            suppressOnHover: false
+            suppressOnHover: false,
         };
     },
 
     getInitialState: function() {
         return {
-            hover: false
+            hover: false,
         };
     },
 
@@ -98,38 +98,37 @@ module.exports = React.createClass({
 
     render: function() {
         const presenceClass = presenceClassForMember(
-            this.props.presenceState, this.props.presenceLastActiveAgo
+            this.props.presenceState, this.props.presenceLastActiveAgo,
         );
 
-        var mainClassName = "mx_EntityTile ";
+        let mainClassName = "mx_EntityTile ";
         mainClassName += presenceClass + (this.props.className ? (" " + this.props.className) : "");
-        var nameEl;
+        let nameEl;
         const {name} = this.props;
 
         const EmojiText = sdk.getComponent('elements.EmojiText');
         if (this.state.hover && !this.props.suppressOnHover) {
-            var activeAgo = this.props.presenceLastActiveAgo ?
+            const activeAgo = this.props.presenceLastActiveAgo ?
                 (Date.now() - (this.props.presenceLastTs - this.props.presenceLastActiveAgo)) : -1;
 
             mainClassName += " mx_EntityTile_hover";
-            var PresenceLabel = sdk.getComponent("rooms.PresenceLabel");
+            const PresenceLabel = sdk.getComponent("rooms.PresenceLabel");
             nameEl = (
                 <div className="mx_EntityTile_details">
-                    <img className="mx_EntityTile_chevron" src="img/member_chevron.png" width="8" height="12"/>
-                    <EmojiText element="div" className="mx_EntityTile_name_hover" dir="auto">{name}</EmojiText>
-                    <PresenceLabel activeAgo={ activeAgo }
+                    <img className="mx_EntityTile_chevron" src="img/member_chevron.png" width="8" height="12" />
+                    <EmojiText element="div" className="mx_EntityTile_name_hover" dir="auto">{ name }</EmojiText>
+                    <PresenceLabel activeAgo={activeAgo}
                         currentlyActive={this.props.presenceCurrentlyActive}
                         presenceState={this.props.presenceState} />
                 </div>
             );
-        }
-        else {
+        } else {
             nameEl = (
-                <EmojiText element="div" className="mx_EntityTile_name" dir="auto">{name}</EmojiText>
+                <EmojiText element="div" className="mx_EntityTile_name" dir="auto">{ name }</EmojiText>
             );
         }
 
-        var inviteButton;
+        let inviteButton;
         if (this.props.showInviteButton) {
             inviteButton = (
                 <div className="mx_EntityTile_invite">
@@ -138,25 +137,25 @@ module.exports = React.createClass({
             );
         }
 
-        var power;
-        var powerLevel = this.props.powerLevel;
+        let power;
+        const powerLevel = this.props.powerLevel;
         if (powerLevel >= 50 && powerLevel < 99) {
-            power = <img src="img/mod.svg" className="mx_EntityTile_power" width="16" height="17" alt={_t("Moderator")}/>;
+            power = <img src="img/mod.svg" className="mx_EntityTile_power" width="16" height="17" alt={_t("Moderator")} />;
         }
         if (powerLevel >= 99) {
-            power = <img src="img/admin.svg" className="mx_EntityTile_power" width="16" height="17" alt={_t("Admin")}/>;
+            power = <img src="img/admin.svg" className="mx_EntityTile_power" width="16" height="17" alt={_t("Admin")} />;
         }
 
 
-        var MemberAvatar = sdk.getComponent('avatars.MemberAvatar');
-        var BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
+        const MemberAvatar = sdk.getComponent('avatars.MemberAvatar');
+        const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
 
-        var av = this.props.avatarJsx || <BaseAvatar name={this.props.name} width={36} height={36} />;
+        const av = this.props.avatarJsx || <BaseAvatar name={this.props.name} width={36} height={36} />;
 
         return (
-            <AccessibleButton className={mainClassName} title={ this.props.title }
-                    onClick={ this.props.onClick } onMouseEnter={ this.mouseEnter }
-                    onMouseLeave={ this.mouseLeave }>
+            <AccessibleButton className={mainClassName} title={this.props.title}
+                    onClick={this.props.onClick} onMouseEnter={this.mouseEnter}
+                    onMouseLeave={this.mouseLeave}>
                 <div className="mx_EntityTile_avatar">
                     { av }
                     { power }
@@ -165,5 +164,5 @@ module.exports = React.createClass({
                 { inviteButton }
             </AccessibleButton>
         );
-    }
+    },
 });
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 7328cfe0b6..f92dc0b97a 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -17,38 +17,38 @@ limitations under the License.
 'use strict';
 
 
-var React = require('react');
-var classNames = require("classnames");
+const React = require('react');
+const classNames = require("classnames");
 import { _t } from '../../../languageHandler';
-var Modal = require('../../../Modal');
+const Modal = require('../../../Modal');
 
-var sdk = require('../../../index');
-var TextForEvent = require('../../../TextForEvent');
+const sdk = require('../../../index');
+const TextForEvent = require('../../../TextForEvent');
 import withMatrixClient from '../../../wrappers/withMatrixClient';
 
-var ContextualMenu = require('../../structures/ContextualMenu');
+const ContextualMenu = require('../../structures/ContextualMenu');
 import dis from '../../../dispatcher';
 
-var ObjectUtils = require('../../../ObjectUtils');
+const ObjectUtils = require('../../../ObjectUtils');
 
-var eventTileTypes = {
+const eventTileTypes = {
     'm.room.message': 'messages.MessageEvent',
-    'm.room.member' : 'messages.TextualEvent',
-    'm.call.invite' : 'messages.TextualEvent',
-    'm.call.answer' : 'messages.TextualEvent',
-    'm.call.hangup' : 'messages.TextualEvent',
-    'm.room.name'   : 'messages.TextualEvent',
-    'm.room.avatar' : 'messages.RoomAvatarEvent',
-    'm.room.topic'  : 'messages.TextualEvent',
-    'm.room.third_party_invite' : 'messages.TextualEvent',
-    'm.room.history_visibility' : 'messages.TextualEvent',
-    'm.room.encryption' : 'messages.TextualEvent',
-    'm.room.power_levels' : 'messages.TextualEvent',
+    'm.room.member': 'messages.TextualEvent',
+    'm.call.invite': 'messages.TextualEvent',
+    'm.call.answer': 'messages.TextualEvent',
+    'm.call.hangup': 'messages.TextualEvent',
+    'm.room.name': 'messages.TextualEvent',
+    'm.room.avatar': 'messages.RoomAvatarEvent',
+    'm.room.topic': 'messages.TextualEvent',
+    'm.room.third_party_invite': 'messages.TextualEvent',
+    'm.room.history_visibility': 'messages.TextualEvent',
+    'm.room.encryption': 'messages.TextualEvent',
+    'm.room.power_levels': 'messages.TextualEvent',
 
     'im.vector.modular.widgets': 'messages.TextualEvent',
 };
 
-var MAX_READ_AVATARS = 5;
+const MAX_READ_AVATARS = 5;
 
 // Our component structure for EventTiles on the timeline is:
 //
@@ -177,7 +177,7 @@ module.exports = withMatrixClient(React.createClass({
     },
 
     componentWillUnmount: function() {
-        var client = this.props.matrixClient;
+        const client = this.props.matrixClient;
         client.removeListener("deviceVerificationChanged",
                               this.onDeviceVerificationChanged);
         this.props.mxEvent.removeListener("Event.decrypted", this._onDecrypted);
@@ -204,20 +204,20 @@ module.exports = withMatrixClient(React.createClass({
 
         const verified = await this.props.matrixClient.isEventSenderVerified(mxEvent);
         this.setState({
-            verified: verified
+            verified: verified,
         });
     },
 
     _propsEqual: function(objA, objB) {
-        var keysA = Object.keys(objA);
-        var keysB = Object.keys(objB);
+        const keysA = Object.keys(objA);
+        const keysB = Object.keys(objB);
 
         if (keysA.length !== keysB.length) {
             return false;
         }
 
-        for (var i = 0; i < keysA.length; i++) {
-            var key = keysA[i];
+        for (let i = 0; i < keysA.length; i++) {
+            const key = keysA[i];
 
             if (!objB.hasOwnProperty(key)) {
                 return false;
@@ -225,8 +225,8 @@ module.exports = withMatrixClient(React.createClass({
 
             // need to deep-compare readReceipts
             if (key == 'readReceipts') {
-                var rA = objA[key];
-                var rB = objB[key];
+                const rA = objA[key];
+                const rB = objB[key];
                 if (rA === rB) {
                     continue;
                 }
@@ -238,7 +238,7 @@ module.exports = withMatrixClient(React.createClass({
                 if (rA.length !== rB.length) {
                     return false;
                 }
-                for (var j = 0; j < rA.length; j++) {
+                for (let j = 0; j < rA.length; j++) {
                     if (rA[j].roomMember.userId !== rB[j].roomMember.userId) {
                         return false;
                     }
@@ -253,12 +253,11 @@ module.exports = withMatrixClient(React.createClass({
     },
 
     shouldHighlight: function() {
-        var actions = this.props.matrixClient.getPushActionsForEvent(this.props.mxEvent);
+        const actions = this.props.matrixClient.getPushActionsForEvent(this.props.mxEvent);
         if (!actions || !actions.tweaks) { return false; }
 
         // don't show self-highlights from another of our clients
-        if (this.props.mxEvent.getSender() === this.props.matrixClient.credentials.userId)
-        {
+        if (this.props.mxEvent.getSender() === this.props.matrixClient.credentials.userId) {
             return false;
         }
 
@@ -266,13 +265,13 @@ module.exports = withMatrixClient(React.createClass({
     },
 
     onEditClicked: function(e) {
-        var MessageContextMenu = sdk.getComponent('context_menus.MessageContextMenu');
-        var buttonRect = e.target.getBoundingClientRect();
+        const MessageContextMenu = sdk.getComponent('context_menus.MessageContextMenu');
+        const buttonRect = e.target.getBoundingClientRect();
 
         // The window X and Y offsets are to adjust position when zoomed in to page
-        var x = buttonRect.right + window.pageXOffset;
-        var y = (buttonRect.top + (buttonRect.height / 2) + window.pageYOffset) - 19;
-        var self = this;
+        const x = buttonRect.right + window.pageXOffset;
+        const y = (buttonRect.top + (buttonRect.height / 2) + window.pageYOffset) - 19;
+        const self = this;
         ContextualMenu.createMenu(MessageContextMenu, {
             chevronOffset: 10,
             mxEvent: this.props.mxEvent,
@@ -281,19 +280,18 @@ module.exports = withMatrixClient(React.createClass({
             eventTileOps: this.refs.tile && this.refs.tile.getEventTileOps ? this.refs.tile.getEventTileOps() : undefined,
             onFinished: function() {
                 self.setState({menu: false});
-            }
+            },
         });
         this.setState({menu: true});
     },
 
     toggleAllReadAvatars: function() {
         this.setState({
-            allReadAvatars: !this.state.allReadAvatars
+            allReadAvatars: !this.state.allReadAvatars,
         });
     },
 
     getReadAvatars: function() {
-
         // return early if there are no read receipts
         if (!this.props.readReceipts || this.props.readReceipts.length === 0) {
             return (<span className="mx_EventTile_readAvatars"></span>);
@@ -304,11 +302,11 @@ module.exports = withMatrixClient(React.createClass({
         const receiptOffset = 15;
         let left = 0;
 
-        var receipts = this.props.readReceipts || [];
-        for (var i = 0; i < receipts.length; ++i) {
-            var receipt = receipts[i];
+        const receipts = this.props.readReceipts || [];
+        for (let i = 0; i < receipts.length; ++i) {
+            const receipt = receipts[i];
 
-            var hidden = true;
+            let hidden = true;
             if ((i < MAX_READ_AVATARS) || this.state.allReadAvatars) {
                 hidden = false;
             }
@@ -319,7 +317,7 @@ module.exports = withMatrixClient(React.createClass({
             // else set it proportional to index
             left = (hidden ? MAX_READ_AVATARS - 1 : i) * -receiptOffset;
 
-            var userId = receipt.roomMember.userId;
+            const userId = receipt.roomMember.userId;
             var readReceiptInfo;
 
             if (this.props.readReceiptMap) {
@@ -340,12 +338,12 @@ module.exports = withMatrixClient(React.createClass({
                     onClick={this.toggleAllReadAvatars}
                     timestamp={receipt.ts}
                     showTwelveHour={this.props.isTwelveHour}
-                />
+                />,
             );
         }
-        var remText;
+        let remText;
         if (!this.state.allReadAvatars) {
-            var remainder = receipts.length - MAX_READ_AVATARS;
+            const remainder = receipts.length - MAX_READ_AVATARS;
             if (remainder > 0) {
                 remText = <span className="mx_EventTile_readAvatarRemainder"
                     onClick={this.toggleAllReadAvatars}
@@ -369,7 +367,7 @@ module.exports = withMatrixClient(React.createClass({
     },
 
     onCryptoClicked: function(e) {
-        var event = this.props.mxEvent;
+        const event = this.props.mxEvent;
 
         Modal.createTrackedDialogAsync('Encrypted Event Dialog', '', (cb) => {
             require(['../../../async-components/views/dialogs/EncryptedEventDialog'], cb);
@@ -396,12 +394,12 @@ module.exports = withMatrixClient(React.createClass({
 
 
         if (ev.getContent().msgtype === 'm.bad.encrypted') {
-            return <E2ePadlockUndecryptable {...props}/>;
+            return <E2ePadlockUndecryptable {...props} />;
         } else if (ev.isEncrypted()) {
             if (this.state.verified) {
-                return <E2ePadlockVerified {...props}/>;
+                return <E2ePadlockVerified {...props} />;
             } else {
-                return <E2ePadlockUnverified {...props}/>;
+                return <E2ePadlockUnverified {...props} />;
             }
         } else {
             // XXX: if the event is being encrypted (ie eventSendStatus ===
@@ -412,7 +410,7 @@ module.exports = withMatrixClient(React.createClass({
             // open padlock
             const e2eEnabled = this.props.matrixClient.isRoomEncrypted(ev.getRoomId());
             if (e2eEnabled) {
-                return <E2ePadlockUnencrypted {...props}/>;
+                return <E2ePadlockUnencrypted {...props} />;
             }
         }
 
@@ -421,27 +419,27 @@ module.exports = withMatrixClient(React.createClass({
     },
 
     render: function() {
-        var MessageTimestamp = sdk.getComponent('messages.MessageTimestamp');
-        var SenderProfile = sdk.getComponent('messages.SenderProfile');
-        var MemberAvatar = sdk.getComponent('avatars.MemberAvatar');
+        const MessageTimestamp = sdk.getComponent('messages.MessageTimestamp');
+        const SenderProfile = sdk.getComponent('messages.SenderProfile');
+        const MemberAvatar = sdk.getComponent('avatars.MemberAvatar');
 
         //console.log("EventTile showUrlPreview for %s is %s", this.props.mxEvent.getId(), this.props.showUrlPreview);
 
-        var content = this.props.mxEvent.getContent();
-        var msgtype = content.msgtype;
-        var eventType = this.props.mxEvent.getType();
+        const content = this.props.mxEvent.getContent();
+        const msgtype = content.msgtype;
+        const eventType = this.props.mxEvent.getType();
 
         // Info messages are basically information about commands processed on a room
-        var isInfoMessage = (eventType !== 'm.room.message');
+        const isInfoMessage = (eventType !== 'm.room.message');
 
-        var EventTileType = sdk.getComponent(eventTileTypes[eventType]);
+        const EventTileType = sdk.getComponent(eventTileTypes[eventType]);
         // This shouldn't happen: the caller should check we support this type
         // before trying to instantiate us
         if (!EventTileType) {
             throw new Error("Event type not supported");
         }
 
-        var isSending = (['sending', 'queued', 'encrypting'].indexOf(this.props.eventSendStatus) !== -1);
+        const isSending = (['sending', 'queued', 'encrypting'].indexOf(this.props.eventSendStatus) !== -1);
         const isRedacted = (eventType === 'm.room.message') && this.props.isRedacted;
 
         const classes = classNames({
@@ -468,9 +466,9 @@ module.exports = withMatrixClient(React.createClass({
             this.props.mxEvent.getRoomId() + "/" +
             this.props.mxEvent.getId();
 
-        var readAvatars = this.getReadAvatars();
+        const readAvatars = this.getReadAvatars();
 
-        var avatar, sender;
+        let avatar, sender;
         let avatarSize;
         let needsSenderProfile;
 
@@ -508,15 +506,14 @@ module.exports = withMatrixClient(React.createClass({
                 if (msgtype === 'm.image') aux = _t('sent an image');
                 else if (msgtype === 'm.video') aux = _t('sent a video');
                 else if (msgtype === 'm.file') aux = _t('uploaded a file');
-                sender = <SenderProfile onClick={ this.onSenderProfileClick } mxEvent={this.props.mxEvent} enableFlair={!aux} aux={aux} />;
-            }
-            else {
+                sender = <SenderProfile onClick={this.onSenderProfileClick} mxEvent={this.props.mxEvent} enableFlair={!aux} aux={aux} />;
+            } else {
                 sender = <SenderProfile mxEvent={this.props.mxEvent} enableFlair={true} />;
             }
         }
 
         const editButton = (
-            <span className="mx_EventTile_editButton" title={ _t("Options") } onClick={this.onEditClicked} />
+            <span className="mx_EventTile_editButton" title={_t("Options")} onClick={this.onEditClicked} />
         );
 
         const timestamp = this.props.mxEvent.getTs() ?
@@ -527,13 +524,13 @@ module.exports = withMatrixClient(React.createClass({
             return (
                 <div className={classes}>
                     <div className="mx_EventTile_roomName">
-                        <a href={ permalink } onClick={this.onPermalinkClicked}>
+                        <a href={permalink} onClick={this.onPermalinkClicked}>
                             { room ? room.name : '' }
                         </a>
                     </div>
                     <div className="mx_EventTile_senderDetails">
                         { avatar }
-                        <a href={ permalink } onClick={this.onPermalinkClicked}>
+                        <a href={permalink} onClick={this.onPermalinkClicked}>
                             { sender }
                             { timestamp }
                         </a>
@@ -548,8 +545,7 @@ module.exports = withMatrixClient(React.createClass({
                     </div>
                 </div>
             );
-        }
-        else if (this.props.tileShape === "file_grid") {
+        } else if (this.props.tileShape === "file_grid") {
             return (
                 <div className={classes}>
                     <div className="mx_EventTile_line" >
@@ -563,7 +559,7 @@ module.exports = withMatrixClient(React.createClass({
                     </div>
                     <a
                         className="mx_EventTile_senderDetailsLink"
-                        href={ permalink }
+                        href={permalink}
                         onClick={this.onPermalinkClicked}
                     >
                         <div className="mx_EventTile_senderDetails">
@@ -573,8 +569,7 @@ module.exports = withMatrixClient(React.createClass({
                     </a>
                 </div>
             );
-        }
-        else {
+        } else {
             return (
                 <div className={classes}>
                     <div className="mx_EventTile_msgOption">
@@ -583,7 +578,7 @@ module.exports = withMatrixClient(React.createClass({
                     { avatar }
                     { sender }
                     <div className="mx_EventTile_line">
-                        <a href={ permalink } onClick={this.onPermalinkClicked}>
+                        <a href={permalink} onClick={this.onPermalinkClicked}>
                             { timestamp }
                         </a>
                         { this._renderE2EPadlock() }
diff --git a/src/components/views/rooms/LinkPreviewWidget.js b/src/components/views/rooms/LinkPreviewWidget.js
index 35e6d28b1f..10c809e0f1 100644
--- a/src/components/views/rooms/LinkPreviewWidget.js
+++ b/src/components/views/rooms/LinkPreviewWidget.js
@@ -16,16 +16,16 @@ limitations under the License.
 
 'use strict';
 
-var React = require('react');
+const React = require('react');
 
-var sdk = require('../../../index');
-var MatrixClientPeg = require('../../../MatrixClientPeg');
-var ImageUtils = require('../../../ImageUtils');
-var Modal = require('../../../Modal');
+const sdk = require('../../../index');
+const MatrixClientPeg = require('../../../MatrixClientPeg');
+const ImageUtils = require('../../../ImageUtils');
+const Modal = require('../../../Modal');
 
-var linkify = require('linkifyjs');
-var linkifyElement = require('linkifyjs/element');
-var linkifyMatrix = require('../../../linkify-matrix');
+const linkify = require('linkifyjs');
+const linkifyElement = require('linkifyjs/element');
+const linkifyMatrix = require('../../../linkify-matrix');
 linkifyMatrix(linkify);
 
 module.exports = React.createClass({
@@ -40,7 +40,7 @@ module.exports = React.createClass({
 
     getInitialState: function() {
         return {
-            preview: null
+            preview: null,
         };
     },
 
@@ -52,7 +52,7 @@ module.exports = React.createClass({
             }
             this.setState(
                 { preview: res },
-                this.props.onWidgetLoad
+                this.props.onWidgetLoad,
             );
         }, (error)=>{
             console.error("Failed to get preview for " + this.props.link + " " + error);
@@ -76,17 +76,17 @@ module.exports = React.createClass({
     },
 
     onImageClick: function(ev) {
-        var p = this.state.preview;
+        const p = this.state.preview;
         if (ev.button != 0 || ev.metaKey) return;
         ev.preventDefault();
-        var ImageView = sdk.getComponent("elements.ImageView");
+        const ImageView = sdk.getComponent("elements.ImageView");
 
-        var src = p["og:image"];
+        let src = p["og:image"];
         if (src && src.startsWith("mxc://")) {
             src = MatrixClientPeg.get().mxcUrlToHttp(src);
         }
 
-        var params = {
+        const params = {
             src: src,
             width: p["og:image:width"],
             height: p["og:image:height"],
@@ -99,27 +99,27 @@ module.exports = React.createClass({
     },
 
     render: function() {
-        var p = this.state.preview;
+        const p = this.state.preview;
         if (!p || Object.keys(p).length === 0) {
-            return <div/>;
+            return <div />;
         }
 
         // FIXME: do we want to factor out all image displaying between this and MImageBody - especially for lightboxing?
-        var image = p["og:image"];
-        var imageMaxWidth = 100, imageMaxHeight = 100;
+        let image = p["og:image"];
+        let imageMaxWidth = 100, imageMaxHeight = 100;
         if (image && image.startsWith("mxc://")) {
             image = MatrixClientPeg.get().mxcUrlToHttp(image, imageMaxWidth, imageMaxHeight);
         }
 
-        var thumbHeight = imageMaxHeight;
+        let thumbHeight = imageMaxHeight;
         if (p["og:image:width"] && p["og:image:height"]) {
             thumbHeight = ImageUtils.thumbHeight(p["og:image:width"], p["og:image:height"], imageMaxWidth, imageMaxHeight);
         }
 
-        var img;
+        let img;
         if (image) {
             img = <div className="mx_LinkPreviewWidget_image" style={{ height: thumbHeight }}>
-                    <img style={{ maxWidth: imageMaxWidth, maxHeight: imageMaxHeight }} src={ image } onClick={ this.onImageClick }/>
+                    <img style={{ maxWidth: imageMaxWidth, maxHeight: imageMaxHeight }} src={image} onClick={this.onImageClick} />
                   </div>;
         }
 
@@ -127,15 +127,15 @@ module.exports = React.createClass({
             <div className="mx_LinkPreviewWidget" >
                 { img }
                 <div className="mx_LinkPreviewWidget_caption">
-                    <div className="mx_LinkPreviewWidget_title"><a href={ this.props.link } target="_blank" rel="noopener">{ p["og:title"] }</a></div>
+                    <div className="mx_LinkPreviewWidget_title"><a href={this.props.link} target="_blank" rel="noopener">{ p["og:title"] }</a></div>
                     <div className="mx_LinkPreviewWidget_siteName">{ p["og:site_name"] ? (" - " + p["og:site_name"]) : null }</div>
                     <div className="mx_LinkPreviewWidget_description" ref="description">
                         { p["og:description"] }
                     </div>
                 </div>
                 <img className="mx_LinkPreviewWidget_cancel" src="img/cancel.svg" width="18" height="18"
-                     onClick={ this.props.onCancelClick }/>
+                     onClick={this.props.onCancelClick} />
             </div>
         );
-    }
+    },
 });
diff --git a/src/components/views/rooms/MemberDeviceInfo.js b/src/components/views/rooms/MemberDeviceInfo.js
index 33b919835c..6e284fc886 100644
--- a/src/components/views/rooms/MemberDeviceInfo.js
+++ b/src/components/views/rooms/MemberDeviceInfo.js
@@ -20,30 +20,30 @@ import { _t } from '../../../languageHandler';
 
 export default class MemberDeviceInfo extends React.Component {
     render() {
-        var indicator = null;
-        var DeviceVerifyButtons = sdk.getComponent('elements.DeviceVerifyButtons');
+        let indicator = null;
+        const DeviceVerifyButtons = sdk.getComponent('elements.DeviceVerifyButtons');
 
         if (this.props.device.isBlocked()) {
             indicator = (
                     <div className="mx_MemberDeviceInfo_blacklisted">
-                    <img src="img/e2e-blocked.svg" width="12" height="12" style={{ marginLeft: "-1px" }} alt={_t("Blacklisted")}/>
+                    <img src="img/e2e-blocked.svg" width="12" height="12" style={{ marginLeft: "-1px" }} alt={_t("Blacklisted")} />
                     </div>
             );
         } else if (this.props.device.isVerified()) {
             indicator = (
                     <div className="mx_MemberDeviceInfo_verified">
-                    <img src="img/e2e-verified.svg" width="10" height="12" alt={_t("Verified")}/>
+                    <img src="img/e2e-verified.svg" width="10" height="12" alt={_t("Verified")} />
                     </div>
             );
         } else {
             indicator = (
                     <div className="mx_MemberDeviceInfo_unverified">
-                    <img src="img/e2e-warning.svg" width="15" height="12" style={{ marginLeft: "-2px" }} alt={_t("Unverified")}/>
+                    <img src="img/e2e-warning.svg" width="15" height="12" style={{ marginLeft: "-2px" }} alt={_t("Unverified")} />
                     </div>
             );
         }
 
-        var deviceName = this.props.device.ambiguous ?
+        const deviceName = this.props.device.ambiguous ?
             (this.props.device.getDisplayName() ? this.props.device.getDisplayName() : "") + " (" + this.props.device.deviceId + ")" :
             this.props.device.getDisplayName();
 
@@ -53,8 +53,8 @@ export default class MemberDeviceInfo extends React.Component {
                     title={_t("device id: ") + this.props.device.deviceId} >
                 <div className="mx_MemberDeviceInfo_deviceInfo">
                     <div className="mx_MemberDeviceInfo_deviceId">
-                        {deviceName}
-                        {indicator}
+                        { deviceName }
+                        { indicator }
                     </div>
                 </div>
                 <DeviceVerifyButtons userId={this.props.userId} device={this.props.device} />
diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index f705cf97d2..856d3ebad4 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -55,7 +55,7 @@ module.exports = withMatrixClient(React.createClass({
                 kick: false,
                 ban: false,
                 mute: false,
-                modifyLevel: false
+                modifyLevel: false,
             },
             muted: false,
             isTargetMod: false,
@@ -97,7 +97,7 @@ module.exports = withMatrixClient(React.createClass({
     },
 
     componentWillUnmount: function() {
-        var client = this.props.matrixClient;
+        const client = this.props.matrixClient;
         if (client) {
             client.removeListener("deviceVerificationChanged", this.onDeviceVerificationChanged);
             client.removeListener("Room", this.onRoom);
@@ -120,10 +120,10 @@ module.exports = withMatrixClient(React.createClass({
     },
 
     _disambiguateDevices: function(devices) {
-        var names = Object.create(null);
-        for (var i = 0; i < devices.length; i++) {
+        const names = Object.create(null);
+        for (let i = 0; i < devices.length; i++) {
             var name = devices[i].getDisplayName();
-            var indexList = names[name] || [];
+            const indexList = names[name] || [];
             indexList.push(i);
             names[name] = indexList;
         }
@@ -193,7 +193,7 @@ module.exports = withMatrixClient(React.createClass({
     },
 
     _updateStateForNewMember: function(member) {
-        var newState = this._calculateOpsPermissions(member);
+        const newState = this._calculateOpsPermissions(member);
         newState.devicesLoading = true;
         newState.devices = null;
         this.setState(newState);
@@ -211,11 +211,11 @@ module.exports = withMatrixClient(React.createClass({
             return;
         }
 
-        var cancelled = false;
+        let cancelled = false;
         this._cancelDeviceList = function() { cancelled = true; };
 
-        var client = this.props.matrixClient;
-        var self = this;
+        const client = this.props.matrixClient;
+        const self = this;
         client.downloadKeys([member.userId], true).then(() => {
             return client.getStoredDevicesForUser(member.userId);
         }).finally(function() {
@@ -260,7 +260,7 @@ module.exports = withMatrixClient(React.createClass({
                 this.setState({ updating: this.state.updating + 1 });
                 this.props.matrixClient.kick(
                     this.props.member.roomId, this.props.member.userId,
-                    reason || undefined
+                    reason || undefined,
                 ).then(function() {
                         // NO-OP; rely on the m.room.member event coming down else we could
                         // get out of sync if we force setState here!
@@ -272,11 +272,11 @@ module.exports = withMatrixClient(React.createClass({
                             title: _t("Failed to kick"),
                             description: ((err && err.message) ? err.message : "Operation failed"),
                         });
-                    }
+                    },
                 ).finally(()=>{
                     this.setState({ updating: this.state.updating - 1 });
                 });
-            }
+            },
         });
     },
 
@@ -299,7 +299,7 @@ module.exports = withMatrixClient(React.createClass({
                 } else {
                     promise = this.props.matrixClient.ban(
                         this.props.member.roomId, this.props.member.userId,
-                        reason || undefined
+                        reason || undefined,
                     );
                 }
                 promise.then(
@@ -314,7 +314,7 @@ module.exports = withMatrixClient(React.createClass({
                             title: _t("Error"),
                             description: _t("Failed to ban user"),
                         });
-                    }
+                    },
                 ).finally(()=>{
                     this.setState({ updating: this.state.updating - 1 });
                 });
@@ -323,30 +323,29 @@ module.exports = withMatrixClient(React.createClass({
     },
 
     onMuteToggle: function() {
-        var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-        var roomId = this.props.member.roomId;
-        var target = this.props.member.userId;
-        var room = this.props.matrixClient.getRoom(roomId);
+        const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+        const roomId = this.props.member.roomId;
+        const target = this.props.member.userId;
+        const room = this.props.matrixClient.getRoom(roomId);
         if (!room) {
             return;
         }
-        var powerLevelEvent = room.currentState.getStateEvents(
-            "m.room.power_levels", ""
+        const powerLevelEvent = room.currentState.getStateEvents(
+            "m.room.power_levels", "",
         );
         if (!powerLevelEvent) {
             return;
         }
-        var isMuted = this.state.muted;
-        var powerLevels = powerLevelEvent.getContent();
-        var levelToSend = (
+        const isMuted = this.state.muted;
+        const powerLevels = powerLevelEvent.getContent();
+        const levelToSend = (
             (powerLevels.events ? powerLevels.events["m.room.message"] : null) ||
             powerLevels.events_default
         );
-        var level;
+        let level;
         if (isMuted) { // unmute
             level = levelToSend;
-        }
-        else { // mute
+        } else { // mute
             level = levelToSend - 1;
         }
         level = parseInt(level);
@@ -364,7 +363,7 @@ module.exports = withMatrixClient(React.createClass({
                         title: _t("Error"),
                         description: _t("Failed to mute user"),
                     });
-                }
+                },
             ).finally(()=>{
                 this.setState({ updating: this.state.updating - 1 });
             });
@@ -372,28 +371,28 @@ module.exports = withMatrixClient(React.createClass({
     },
 
     onModToggle: function() {
-        var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-        var roomId = this.props.member.roomId;
-        var target = this.props.member.userId;
-        var room = this.props.matrixClient.getRoom(roomId);
+        const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+        const roomId = this.props.member.roomId;
+        const target = this.props.member.userId;
+        const room = this.props.matrixClient.getRoom(roomId);
         if (!room) {
             return;
         }
-        var powerLevelEvent = room.currentState.getStateEvents(
-            "m.room.power_levels", ""
+        const powerLevelEvent = room.currentState.getStateEvents(
+            "m.room.power_levels", "",
         );
         if (!powerLevelEvent) {
             return;
         }
-        var me = room.getMember(this.props.matrixClient.credentials.userId);
+        const me = room.getMember(this.props.matrixClient.credentials.userId);
         if (!me) {
             return;
         }
-        var defaultLevel = powerLevelEvent.getContent().users_default;
-        var modLevel = me.powerLevel - 1;
+        const defaultLevel = powerLevelEvent.getContent().users_default;
+        let modLevel = me.powerLevel - 1;
         if (modLevel > 50 && defaultLevel < 50) modLevel = 50; // try to stick with the vector level defaults
         // toggle the level
-        var newLevel = this.state.isTargetMod ? defaultLevel : modLevel;
+        const newLevel = this.state.isTargetMod ? defaultLevel : modLevel;
         this.setState({ updating: this.state.updating + 1 });
         this.props.matrixClient.setPowerLevel(roomId, target, parseInt(newLevel), powerLevelEvent).then(
             function() {
@@ -410,7 +409,7 @@ module.exports = withMatrixClient(React.createClass({
                         description: _t("Failed to toggle moderator status"),
                     });
                 }
-            }
+            },
         ).finally(()=>{
             this.setState({ updating: this.state.updating - 1 });
         });
@@ -430,36 +429,36 @@ module.exports = withMatrixClient(React.createClass({
                     title: _t("Error"),
                     description: _t("Failed to change power level"),
                 });
-            }
+            },
         ).finally(()=>{
             this.setState({ updating: this.state.updating - 1 });
         }).done();
     },
 
     onPowerChange: function(powerLevel) {
-        var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-        var roomId = this.props.member.roomId;
-        var target = this.props.member.userId;
-        var room = this.props.matrixClient.getRoom(roomId);
-        var self = this;
+        const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+        const roomId = this.props.member.roomId;
+        const target = this.props.member.userId;
+        const room = this.props.matrixClient.getRoom(roomId);
+        const self = this;
         if (!room) {
             return;
         }
-        var powerLevelEvent = room.currentState.getStateEvents(
-            "m.room.power_levels", ""
+        const powerLevelEvent = room.currentState.getStateEvents(
+            "m.room.power_levels", "",
         );
         if (!powerLevelEvent) {
             return;
         }
         if (powerLevelEvent.getContent().users) {
-            var myPower = powerLevelEvent.getContent().users[this.props.matrixClient.credentials.userId];
+            const myPower = powerLevelEvent.getContent().users[this.props.matrixClient.credentials.userId];
             if (parseInt(myPower) === parseInt(powerLevel)) {
-                var QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
+                const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
                 Modal.createTrackedDialog('Promote to PL100 Warning', '', QuestionDialog, {
                     title: _t("Warning!"),
                     description:
                         <div>
-                            { _t("You will not be able to undo this change as you are promoting the user to have the same power level as yourself.") }<br/>
+                            { _t("You will not be able to undo this change as you are promoting the user to have the same power level as yourself.") }<br />
                             { _t("Are you sure?") }
                         </div>,
                     button: _t("Continue"),
@@ -469,12 +468,10 @@ module.exports = withMatrixClient(React.createClass({
                         }
                     },
                 });
-            }
-            else {
+            } else {
                 this._applyPowerChange(roomId, target, powerLevel, powerLevelEvent);
             }
-        }
-        else {
+        } else {
             this._applyPowerChange(roomId, target, powerLevel, powerLevelEvent);
         }
     },
@@ -497,14 +494,14 @@ module.exports = withMatrixClient(React.createClass({
         const defaultPerms = {
             can: {},
             muted: false,
-            modifyLevel: false
+            modifyLevel: false,
         };
         const room = this.props.matrixClient.getRoom(member.roomId);
         if (!room) {
             return defaultPerms;
         }
         const powerLevels = room.currentState.getStateEvents(
-            "m.room.power_levels", ""
+            "m.room.power_levels", "",
         );
         if (!powerLevels) {
             return defaultPerms;
@@ -516,10 +513,10 @@ module.exports = withMatrixClient(React.createClass({
         const them = member;
         return {
             can: this._calculateCanPermissions(
-                me, them, powerLevels.getContent()
+                me, them, powerLevels.getContent(),
             ),
             muted: this._isMuted(them, powerLevels.getContent()),
-            isTargetMod: them.powerLevel > powerLevels.getContent().users_default
+            isTargetMod: them.powerLevel > powerLevels.getContent().users_default,
         };
     },
 
@@ -528,7 +525,7 @@ module.exports = withMatrixClient(React.createClass({
             kick: false,
             ban: false,
             mute: false,
-            modifyLevel: false
+            modifyLevel: false,
         };
         const canAffectUser = them.powerLevel < me.powerLevel;
         if (!canAffectUser) {
@@ -556,7 +553,7 @@ module.exports = withMatrixClient(React.createClass({
         if (!powerLevelContent || !member) {
             return false;
         }
-        var levelToSend = (
+        const levelToSend = (
             (powerLevelContent.events ? powerLevelContent.events["m.room.message"] : null) ||
             powerLevelContent.events_default
         );
@@ -566,19 +563,19 @@ module.exports = withMatrixClient(React.createClass({
     onCancel: function(e) {
         dis.dispatch({
             action: "view_user",
-            member: null
+            member: null,
         });
     },
 
     onMemberAvatarClick: function() {
-        var avatarUrl = this.props.member.user ? this.props.member.user.avatarUrl : this.props.member.events.member.getContent().avatar_url;
+        const avatarUrl = this.props.member.user ? this.props.member.user.avatarUrl : this.props.member.events.member.getContent().avatar_url;
         if(!avatarUrl) return;
 
-        var httpUrl = this.props.matrixClient.mxcUrlToHttp(avatarUrl);
-        var ImageView = sdk.getComponent("elements.ImageView");
-        var params = {
+        const httpUrl = this.props.matrixClient.mxcUrlToHttp(avatarUrl);
+        const ImageView = sdk.getComponent("elements.ImageView");
+        const params = {
             src: httpUrl,
-            name: this.props.member.name
+            name: this.props.member.name,
         };
 
         Modal.createDialog(ImageView, params, "mx_Dialog_lightbox");
@@ -596,11 +593,11 @@ module.exports = withMatrixClient(React.createClass({
             return null;
         }
 
-        var devices = this.state.devices;
-        var MemberDeviceInfo = sdk.getComponent('rooms.MemberDeviceInfo');
-        var Spinner = sdk.getComponent("elements.Spinner");
+        const devices = this.state.devices;
+        const MemberDeviceInfo = sdk.getComponent('rooms.MemberDeviceInfo');
+        const Spinner = sdk.getComponent("elements.Spinner");
 
-        var devComponents;
+        let devComponents;
         if (this.state.devicesLoading) {
             // still loading
             devComponents = <Spinner />;
@@ -610,10 +607,10 @@ module.exports = withMatrixClient(React.createClass({
             devComponents = _t("No devices with registered encryption keys");
         } else {
             devComponents = [];
-            for (var i = 0; i < devices.length; i++) {
+            for (let i = 0; i < devices.length; i++) {
                 devComponents.push(<MemberDeviceInfo key={i}
                                        userId={this.props.member.userId}
-                                       device={devices[i]}/>);
+                                       device={devices[i]} />);
             }
         }
 
@@ -621,7 +618,7 @@ module.exports = withMatrixClient(React.createClass({
             <div>
                 <h3>{ _t("Devices") }</h3>
                 <div className="mx_MemberInfo_devices">
-                    {devComponents}
+                    { devComponents }
                 </div>
             </div>
         );
@@ -633,7 +630,7 @@ module.exports = withMatrixClient(React.createClass({
         if (this.props.member.userId !== this.props.matrixClient.getUserId()) {
             ignoreButton = (
                 <AccessibleButton onClick={this.onIgnoreToggle} className="mx_MemberInfo_field">
-                    {this.state.isIgnoring ? _t("Unignore") : _t("Ignore")}
+                    { this.state.isIgnoring ? _t("Unignore") : _t("Ignore") }
                 </AccessibleButton>
             );
         }
@@ -644,14 +641,14 @@ module.exports = withMatrixClient(React.createClass({
             <div>
                 <h3>{ _t("User Options") }</h3>
                 <div className="mx_MemberInfo_buttons">
-                    {ignoreButton}
+                    { ignoreButton }
                 </div>
             </div>
         );
     },
 
     render: function() {
-        var startChat, kickButton, banButton, muteButton, giveModButton, spinner;
+        let startChat, kickButton, banButton, muteButton, giveModButton, spinner;
         if (this.props.member.userId !== this.props.matrixClient.credentials.userId) {
             const dmRoomMap = new DMRoomMap(this.props.matrixClient);
             const dmRooms = dmRoomMap.getDMRoomsForUserId(this.props.member.userId);
@@ -675,7 +672,7 @@ module.exports = withMatrixClient(React.createClass({
                             highlight={highlight}
                             isInvite={me.membership == "invite"}
                             onClick={this.onRoomTileClick}
-                        />
+                        />,
                     );
                 }
             }
@@ -696,14 +693,14 @@ module.exports = withMatrixClient(React.createClass({
 
             startChat = <div>
                 <h3>{ _t("Direct chats") }</h3>
-                {tiles}
-                {startNewChat}
+                { tiles }
+                { startNewChat }
             </div>;
         }
 
         if (this.state.updating) {
-            var Loader = sdk.getComponent("elements.Spinner");
-            spinner = <Loader imgClassName="mx_ContextualMenu_spinner"/>;
+            const Loader = sdk.getComponent("elements.Spinner");
+            spinner = <Loader imgClassName="mx_ContextualMenu_spinner" />;
         }
 
         if (this.state.can.kick) {
@@ -712,7 +709,7 @@ module.exports = withMatrixClient(React.createClass({
             kickButton = (
                 <AccessibleButton className="mx_MemberInfo_field"
                         onClick={this.onKick}>
-                    {kickLabel}
+                    { kickLabel }
                 </AccessibleButton>
             );
         }
@@ -724,7 +721,7 @@ module.exports = withMatrixClient(React.createClass({
             banButton = (
                 <AccessibleButton className="mx_MemberInfo_field"
                         onClick={this.onBanOrUnban}>
-                    {label}
+                    { label }
                 </AccessibleButton>
             );
         }
@@ -733,31 +730,31 @@ module.exports = withMatrixClient(React.createClass({
             muteButton = (
                 <AccessibleButton className="mx_MemberInfo_field"
                         onClick={this.onMuteToggle}>
-                    {muteLabel}
+                    { muteLabel }
                 </AccessibleButton>
             );
         }
         if (this.state.can.toggleMod) {
-            var giveOpLabel = this.state.isTargetMod ? _t("Revoke Moderator") : _t("Make Moderator");
+            const giveOpLabel = this.state.isTargetMod ? _t("Revoke Moderator") : _t("Make Moderator");
             giveModButton = <AccessibleButton className="mx_MemberInfo_field" onClick={this.onModToggle}>
-                {giveOpLabel}
+                { giveOpLabel }
             </AccessibleButton>;
         }
 
         // TODO: we should have an invite button if this MemberInfo is showing a user who isn't actually in the current room yet
         // e.g. clicking on a linkified userid in a room
 
-        var adminTools;
+        let adminTools;
         if (kickButton || banButton || muteButton || giveModButton) {
             adminTools =
                 <div>
-                    <h3>{_t("Admin Tools")}</h3>
+                    <h3>{ _t("Admin Tools") }</h3>
 
                     <div className="mx_MemberInfo_buttons">
-                        {muteButton}
-                        {kickButton}
-                        {banButton}
-                        {giveModButton}
+                        { muteButton }
+                        { kickButton }
+                        { banButton }
+                        { giveModButton }
                     </div>
                 </div>;
         }
@@ -767,35 +764,35 @@ module.exports = withMatrixClient(React.createClass({
         if (this.props.member.user) {
             var presenceState = this.props.member.user.presence;
             var presenceLastActiveAgo = this.props.member.user.lastActiveAgo;
-            var presenceLastTs = this.props.member.user.lastPresenceTs;
+            const presenceLastTs = this.props.member.user.lastPresenceTs;
             var presenceCurrentlyActive = this.props.member.user.currentlyActive;
         }
 
-        var MemberAvatar = sdk.getComponent('avatars.MemberAvatar');
-        var PowerSelector = sdk.getComponent('elements.PowerSelector');
-        var PresenceLabel = sdk.getComponent('rooms.PresenceLabel');
+        const MemberAvatar = sdk.getComponent('avatars.MemberAvatar');
+        const PowerSelector = sdk.getComponent('elements.PowerSelector');
+        const PresenceLabel = sdk.getComponent('rooms.PresenceLabel');
         const EmojiText = sdk.getComponent('elements.EmojiText');
         return (
             <div className="mx_MemberInfo">
                 <GeminiScrollbar autoshow={true}>
-                    <AccessibleButton className="mx_MemberInfo_cancel" onClick={this.onCancel}> <img src="img/cancel.svg" width="18" height="18"/></AccessibleButton>
+                    <AccessibleButton className="mx_MemberInfo_cancel" onClick={this.onCancel}> <img src="img/cancel.svg" width="18" height="18" /></AccessibleButton>
                     <div className="mx_MemberInfo_avatar">
                         <MemberAvatar onClick={this.onMemberAvatarClick} member={this.props.member} width={48} height={48} />
                     </div>
 
-                    <EmojiText element="h2">{memberName}</EmojiText>
+                    <EmojiText element="h2">{ memberName }</EmojiText>
 
                     <div className="mx_MemberInfo_profile">
                         <div className="mx_MemberInfo_profileField">
                             { this.props.member.userId }
                         </div>
                         <div className="mx_MemberInfo_profileField">
-                            { _t("Level:") } <b><PowerSelector controlled={true} value={ parseInt(this.props.member.powerLevel) } disabled={ !this.state.can.modifyLevel } onChange={ this.onPowerChange }/></b>
+                            { _t("Level:") } <b><PowerSelector controlled={true} value={parseInt(this.props.member.powerLevel)} disabled={!this.state.can.modifyLevel} onChange={this.onPowerChange} /></b>
                         </div>
                         <div className="mx_MemberInfo_profileField">
-                            <PresenceLabel activeAgo={ presenceLastActiveAgo }
-                                currentlyActive={ presenceCurrentlyActive }
-                                presenceState={ presenceState } />
+                            <PresenceLabel activeAgo={presenceLastActiveAgo}
+                                currentlyActive={presenceCurrentlyActive}
+                                presenceState={presenceState} />
                         </div>
                     </div>
 
@@ -811,5 +808,5 @@ module.exports = withMatrixClient(React.createClass({
                 </GeminiScrollbar>
             </div>
         );
-    }
+    },
 }));
diff --git a/src/components/views/rooms/MemberList.js b/src/components/views/rooms/MemberList.js
index d1b456025f..0713a4ae8a 100644
--- a/src/components/views/rooms/MemberList.js
+++ b/src/components/views/rooms/MemberList.js
@@ -18,11 +18,11 @@ limitations under the License.
 
 import React from 'react';
 import { _t } from '../../../languageHandler';
-var MatrixClientPeg = require("../../../MatrixClientPeg");
-var sdk = require('../../../index');
-var GeminiScrollbar = require('react-gemini-scrollbar');
-var rate_limited_func = require('../../../ratelimitedfunc');
-var CallHandler = require("../../../CallHandler");
+const MatrixClientPeg = require("../../../MatrixClientPeg");
+const sdk = require('../../../index');
+const GeminiScrollbar = require('react-gemini-scrollbar');
+const rate_limited_func = require('../../../ratelimitedfunc');
+const CallHandler = require("../../../CallHandler");
 
 const INITIAL_LOAD_NUM_MEMBERS = 30;
 const INITIAL_LOAD_NUM_INVITED = 5;
@@ -49,7 +49,7 @@ module.exports = React.createClass({
     },
 
     componentWillMount: function() {
-        var cli = MatrixClientPeg.get();
+        const cli = MatrixClientPeg.get();
         cli.on("RoomState.members", this.onRoomStateMember);
         cli.on("RoomMember.name", this.onRoomMemberName);
         cli.on("RoomState.events", this.onRoomStateEvent);
@@ -62,7 +62,7 @@ module.exports = React.createClass({
     },
 
     componentWillUnmount: function() {
-        var cli = MatrixClientPeg.get();
+        const cli = MatrixClientPeg.get();
         if (cli) {
             cli.removeListener("RoomState.members", this.onRoomStateMember);
             cli.removeListener("RoomMember.name", this.onRoomMemberName);
@@ -109,7 +109,7 @@ module.exports = React.createClass({
         // member tile and re-render it. This is more efficient than every tile
         // evar attaching their own listener.
         // console.log("explicit presence from " + user.userId);
-        var tile = this.refs[user.userId];
+        const tile = this.refs[user.userId];
         if (tile) {
             this._updateList(); // reorder the membership list
         }
@@ -153,11 +153,11 @@ module.exports = React.createClass({
 
     getMemberDict: function() {
         if (!this.props.roomId) return {};
-        var cli = MatrixClientPeg.get();
-        var room = cli.getRoom(this.props.roomId);
+        const cli = MatrixClientPeg.get();
+        const room = cli.getRoom(this.props.roomId);
         if (!room) return {};
 
-        var all_members = room.currentState.members;
+        const all_members = room.currentState.members;
 
         Object.keys(all_members).map(function(userId) {
             // work around a race where you might have a room member object
@@ -175,17 +175,17 @@ module.exports = React.createClass({
     },
 
     roomMembers: function() {
-        var all_members = this.memberDict || {};
-        var all_user_ids = Object.keys(all_members);
-        var ConferenceHandler = CallHandler.getConferenceHandler();
+        const all_members = this.memberDict || {};
+        const all_user_ids = Object.keys(all_members);
+        const ConferenceHandler = CallHandler.getConferenceHandler();
 
         all_user_ids.sort(this.memberSort);
 
-        var to_display = [];
-        var count = 0;
-        for (var i = 0; i < all_user_ids.length; ++i) {
-            var user_id = all_user_ids[i];
-            var m = all_members[user_id];
+        const to_display = [];
+        let count = 0;
+        for (let i = 0; i < all_user_ids.length; ++i) {
+            const user_id = all_user_ids[i];
+            const m = all_members[user_id];
 
             if (m.membership == 'join' || m.membership == 'invite') {
                 if ((ConferenceHandler && !ConferenceHandler.isConferenceUser(user_id)) || !ConferenceHandler) {
@@ -233,8 +233,7 @@ module.exports = React.createClass({
     memberString: function(member) {
         if (!member) {
             return "(null)";
-        }
-        else {
+        } else {
             return "(" + member.name + ", " + member.powerLevel + ", " + member.user.lastActiveAgo + ", " + member.user.currentlyActive + ")";
         }
     },
@@ -248,10 +247,10 @@ module.exports = React.createClass({
             // ...and then alphabetically.
             // We could tiebreak instead by "last recently spoken in this room" if we wanted to.
 
-            var memberA = this.memberDict[userIdA];
-            var memberB = this.memberDict[userIdB];
-            var userA = memberA.user;
-            var userB = memberB.user;
+            const memberA = this.memberDict[userIdA];
+            const memberB = this.memberDict[userIdB];
+            const userA = memberA.user;
+            const userB = memberB.user;
 
             // if (!userA || !userB) {
             //     console.log("comparing " + memberA.name + " user=" + memberA.user + " with " + memberB.name + " user=" + memberB.user);
@@ -269,15 +268,13 @@ module.exports = React.createClass({
                     // console.log(memberA + " and " + memberB + " have same power level");
                     if (memberA.name && memberB.name) {
                         // console.log("comparing names: " + memberA.name + " and " + memberB.name);
-                        var nameA = memberA.name[0] === '@' ? memberA.name.substr(1) : memberA.name;
-                        var nameB = memberB.name[0] === '@' ? memberB.name.substr(1) : memberB.name;
+                        const nameA = memberA.name[0] === '@' ? memberA.name.substr(1) : memberA.name;
+                        const nameB = memberB.name[0] === '@' ? memberB.name.substr(1) : memberB.name;
                         return nameA.localeCompare(nameB);
-                    }
-                    else {
+                    } else {
                         return 0;
                     }
-                }
-                else {
+                } else {
                     // console.log("comparing power: " + memberA.powerLevel + " and " + memberB.powerLevel);
                     return memberB.powerLevel - memberA.powerLevel;
                 }
@@ -336,25 +333,25 @@ module.exports = React.createClass({
             // The HS may have already converted these into m.room.member invites so
             // we shouldn't add them if the 3pid invite state key (token) is in the
             // member invite (content.third_party_invite.signed.token)
-            var room = MatrixClientPeg.get().getRoom(this.props.roomId);
-            var EntityTile = sdk.getComponent("rooms.EntityTile");
+            const room = MatrixClientPeg.get().getRoom(this.props.roomId);
+            const EntityTile = sdk.getComponent("rooms.EntityTile");
             if (room) {
                 room.currentState.getStateEvents("m.room.third_party_invite").forEach(
                 function(e) {
                     // any events without these keys are not valid 3pid invites, so we ignore them
-                    var required_keys = ['key_validity_url', 'public_key', 'display_name'];
-                    for (var i = 0; i < required_keys.length; ++i) {
+                    const required_keys = ['key_validity_url', 'public_key', 'display_name'];
+                    for (let i = 0; i < required_keys.length; ++i) {
                         if (e.getContent()[required_keys[i]] === undefined) return;
                     }
 
                     // discard all invites which have a m.room.member event since we've
                     // already added them.
-                    var memberEvent = room.currentState.getInviteForThreePidToken(e.getStateKey());
+                    const memberEvent = room.currentState.getInviteForThreePidToken(e.getStateKey());
                     if (memberEvent) {
                         return;
                     }
                     memberList.push(
-                        <EntityTile key={e.getStateKey()} name={e.getContent().display_name} suppressOnHover={true} />
+                        <EntityTile key={e.getStateKey()} name={e.getContent().display_name} suppressOnHover={true} />,
                     );
                 });
             }
@@ -402,7 +399,7 @@ module.exports = React.createClass({
             <form autoComplete="off">
                 <input className="mx_MemberList_query" id="mx_MemberList_query" type="text"
                         onChange={this.onSearchQueryChanged} value={this.state.searchQuery}
-                        placeholder={ _t('Filter room members') } />
+                        placeholder={_t('Filter room members')} />
             </form>
         );
 
@@ -415,9 +412,9 @@ module.exports = React.createClass({
                             getChildren={this._getChildrenJoined}
                             getChildCount={this._getChildCountJoined}
                     />
-                    {invitedSection}
+                    { invitedSection }
                 </GeminiScrollbar>
             </div>
         );
-    }
+    },
 });
diff --git a/src/components/views/rooms/MemberTile.js b/src/components/views/rooms/MemberTile.js
index d7e6b4a1ec..e21f7c91f4 100644
--- a/src/components/views/rooms/MemberTile.js
+++ b/src/components/views/rooms/MemberTile.js
@@ -16,12 +16,12 @@ limitations under the License.
 
 'use strict';
 
-var React = require('react');
+const React = require('react');
 
-var MatrixClientPeg = require('../../../MatrixClientPeg');
-var sdk = require('../../../index');
-var dis = require('../../../dispatcher');
-var Modal = require("../../../Modal");
+const MatrixClientPeg = require('../../../MatrixClientPeg');
+const sdk = require('../../../index');
+const dis = require('../../../dispatcher');
+const Modal = require("../../../Modal");
 import { _t } from '../../../languageHandler';
 
 module.exports = React.createClass({
@@ -68,16 +68,16 @@ module.exports = React.createClass({
     },
 
     render: function() {
-        var MemberAvatar = sdk.getComponent('avatars.MemberAvatar');
-        var BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
-        var EntityTile = sdk.getComponent('rooms.EntityTile');
+        const MemberAvatar = sdk.getComponent('avatars.MemberAvatar');
+        const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
+        const EntityTile = sdk.getComponent('rooms.EntityTile');
 
-        var member = this.props.member;
-        var name = this._getDisplayName();
-        var active = -1;
-        var presenceState = member.user ? member.user.presence : null;
+        const member = this.props.member;
+        const name = this._getDisplayName();
+        const active = -1;
+        const presenceState = member.user ? member.user.presence : null;
 
-        var av = (
+        const av = (
             <MemberAvatar member={member} width={36} height={36} />
         );
 
@@ -88,11 +88,11 @@ module.exports = React.createClass({
 
         return (
             <EntityTile {...this.props} presenceState={presenceState}
-                presenceLastActiveAgo={ member.user ? member.user.lastActiveAgo : 0 }
-                presenceLastTs={ member.user ? member.user.lastPresenceTs : 0 }
-                presenceCurrentlyActive={ member.user ? member.user.currentlyActive : false }
+                presenceLastActiveAgo={member.user ? member.user.lastActiveAgo : 0}
+                presenceLastTs={member.user ? member.user.lastPresenceTs : 0}
+                presenceCurrentlyActive={member.user ? member.user.currentlyActive : false}
                 avatarJsx={av} title={this.getPowerLabel()} onClick={this.onClick}
                 name={name} powerLevel={this.props.member.powerLevel} />
         );
-    }
+    },
 });
diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index fd8c73eb80..00659520c3 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -89,13 +89,13 @@ export default class MessageComposer extends React.Component {
     }
 
     uploadFiles(files) {
-        let QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
-        let TintableSvg = sdk.getComponent("elements.TintableSvg");
+        const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
+        const TintableSvg = sdk.getComponent("elements.TintableSvg");
 
-        let fileList = [];
+        const fileList = [];
         for (let i=0; i<files.length; i++) {
             fileList.push(<li key={i}>
-                <TintableSvg key={i} src="img/files.svg" width="16" height="16" /> {files[i].name || _t('Attachment')}
+                <TintableSvg key={i} src="img/files.svg" width="16" height="16" /> { files[i].name || _t('Attachment') }
             </li>);
         }
 
@@ -105,7 +105,7 @@ export default class MessageComposer extends React.Component {
                 <div>
                     <p>{ _t('Are you sure you want to upload the following files?') }</p>
                     <ul style={{listStyle: 'none', textAlign: 'left'}}>
-                        {fileList}
+                        { fileList }
                     </ul>
                 </div>
             ),
@@ -271,16 +271,16 @@ export default class MessageComposer extends React.Component {
         if (this.props.callState && this.props.callState !== 'ended') {
             hangupButton =
                 <div key="controls_hangup" className="mx_MessageComposer_hangup" onClick={this.onHangupClick}>
-                    <img src="img/hangup.svg" alt={ _t('Hangup') } title={ _t('Hangup') } width="25" height="26"/>
+                    <img src="img/hangup.svg" alt={_t('Hangup')} title={_t('Hangup')} width="25" height="26" />
                 </div>;
         } else {
             callButton =
-                <div key="controls_call" className="mx_MessageComposer_voicecall" onClick={this.onVoiceCallClick} title={ _t('Voice call') }>
-                    <TintableSvg src="img/icon-call.svg" width="35" height="35"/>
+                <div key="controls_call" className="mx_MessageComposer_voicecall" onClick={this.onVoiceCallClick} title={_t('Voice call')}>
+                    <TintableSvg src="img/icon-call.svg" width="35" height="35" />
                 </div>;
             videoCallButton =
-                <div key="controls_videocall" className="mx_MessageComposer_videocall" onClick={this.onCallClick} title={ _t('Video call') }>
-                    <TintableSvg src="img/icons-video.svg" width="35" height="35"/>
+                <div key="controls_videocall" className="mx_MessageComposer_videocall" onClick={this.onCallClick} title={_t('Video call')}>
+                    <TintableSvg src="img/icons-video.svg" width="35" height="35" />
                 </div>;
         }
 
@@ -289,12 +289,12 @@ export default class MessageComposer extends React.Component {
             if (this.props.showApps) {
                 hideAppsButton =
                     <div key="controls_hide_apps" className="mx_MessageComposer_apps" onClick={this.onHideAppsClick} title={_t("Hide Apps")}>
-                        <TintableSvg src="img/icons-hide-apps.svg" width="35" height="35"/>
+                        <TintableSvg src="img/icons-hide-apps.svg" width="35" height="35" />
                     </div>;
             } else {
                 showAppsButton =
                     <div key="show_apps" className="mx_MessageComposer_apps" onClick={this.onShowAppsClick} title={_t("Show Apps")}>
-                        <TintableSvg src="img/icons-show-apps.svg" width="35" height="35"/>
+                        <TintableSvg src="img/icons-show-apps.svg" width="35" height="35" />
                     </div>;
             }
         }
@@ -308,8 +308,8 @@ export default class MessageComposer extends React.Component {
             // complex because of conference calls.
             const uploadButton = (
                 <div key="controls_upload" className="mx_MessageComposer_upload"
-                        onClick={this.onUploadClick} title={ _t('Upload file') }>
-                    <TintableSvg src="img/icons-upload.svg" width="35" height="35"/>
+                        onClick={this.onUploadClick} title={_t('Upload file')}>
+                    <TintableSvg src="img/icons-upload.svg" width="35" height="35" />
                     <input ref="uploadInput" type="file"
                         style={uploadInputStyle}
                         multiple
@@ -363,7 +363,7 @@ export default class MessageComposer extends React.Component {
                 const onFormatButtonClicked = this.onFormatButtonClicked.bind(this, name);
                 const className = 'mx_MessageComposer_format_button mx_filterFlipColor';
                 return <img className={className}
-                            title={ _t(name) }
+                            title={_t(name)}
                             onMouseDown={onFormatButtonClicked}
                             key={name}
                             src={`img/button-text-${name}${suffix}.svg`}
@@ -375,18 +375,18 @@ export default class MessageComposer extends React.Component {
             <div className="mx_MessageComposer mx_fadable" style={{ opacity: this.props.opacity }}>
                 <div className="mx_MessageComposer_wrapper">
                     <div className="mx_MessageComposer_row">
-                        {controls}
+                        { controls }
                     </div>
                 </div>
                 <div className="mx_MessageComposer_formatbar_wrapper">
                     <div className="mx_MessageComposer_formatbar" style={this.state.showFormatting ? {} : {display: 'none'}}>
-                        {formatButtons}
+                        { formatButtons }
                         <div style={{flex: 1}}></div>
-                        <img title={ this.state.inputState.isRichtextEnabled ? _t("Turn Markdown on") : _t("Turn Markdown off") }
+                        <img title={this.state.inputState.isRichtextEnabled ? _t("Turn Markdown on") : _t("Turn Markdown off")}
                              onMouseDown={this.onToggleMarkdownClicked}
                             className="mx_MessageComposer_formatbar_markdown mx_filterFlipColor"
                             src={`img/button-md-${!this.state.inputState.isRichtextEnabled}.png`} />
-                        <img title={ _t("Hide Text Formatting Toolbar") }
+                        <img title={_t("Hide Text Formatting Toolbar")}
                              onClick={this.onToggleFormattingClicked}
                              className="mx_MessageComposer_formatbar_cancel mx_filterFlipColor"
                              src="img/icon-text-cancel.svg" />
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 39666c94a4..4850428621 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -224,7 +224,7 @@ export default class MessageComposerInput extends React.Component {
 
                 return (
                     <a href={url} data-offset-key={entityProps.offsetKey}>
-                        {entityProps.children}
+                        { entityProps.children }
                     </a>
                 );
             },
@@ -286,7 +286,7 @@ export default class MessageComposerInput extends React.Component {
                 /// XXX: Not doing rich-text quoting from formatted-body because draft-js
                 /// has regressed such that when links are quoted, errors are thrown. See
                 /// https://github.com/vector-im/riot-web/issues/4756.
-                let body = escape(payload.text);
+                const body = escape(payload.text);
                 if (body) {
                     let content = RichText.htmlToContentState(`<blockquote>${body}</blockquote>`);
                     if (!this.state.isRichtextEnabled) {
@@ -464,7 +464,7 @@ export default class MessageComposerInput extends React.Component {
             // autocomplete will probably have different completions to show.
             if (
                 !state.editorState.getSelection().equals(
-                    this.state.editorState.getSelection()
+                    this.state.editorState.getSelection(),
                 )
                 && state.editorState.getCurrentContent().getPlainText() ===
                 this.state.editorState.getCurrentContent().getPlainText()
@@ -974,7 +974,6 @@ export default class MessageComposerInput extends React.Component {
                 editorState = EditorState.forceSelection(editorState,
                     editorState.getSelection());
                 this.setState({editorState});
-
             }
             return false;
         }
@@ -1134,12 +1133,12 @@ export default class MessageComposerInput extends React.Component {
                         onConfirm={this.setDisplayedCompletion}
                         onSelectionChange={this.setDisplayedCompletion}
                         query={this.getAutocompleteQuery(content)}
-                        selection={selection}/>
+                        selection={selection} />
                 </div>
                 <div className={className}>
                     <img className="mx_MessageComposer_input_markdownIndicator mx_filterFlipColor"
                          onMouseDown={this.onMarkdownToggleClicked}
-                         title={ this.state.isRichtextEnabled ? _t("Markdown is disabled") : _t("Markdown is enabled")}
+                         title={this.state.isRichtextEnabled ? _t("Markdown is disabled") : _t("Markdown is enabled")}
                          src={`img/button-md-${!this.state.isRichtextEnabled}.png`} />
                     <Editor ref="editor"
                             dir="auto"
@@ -1157,7 +1156,7 @@ export default class MessageComposerInput extends React.Component {
                             onUpArrow={this.onUpArrow}
                             onDownArrow={this.onDownArrow}
                             onEscape={this.onEscape}
-                            spellCheck={true}/>
+                            spellCheck={true} />
                 </div>
             </div>
         );
diff --git a/src/components/views/rooms/PresenceLabel.js b/src/components/views/rooms/PresenceLabel.js
index 87b218e2e2..69ba7c39c3 100644
--- a/src/components/views/rooms/PresenceLabel.js
+++ b/src/components/views/rooms/PresenceLabel.js
@@ -34,23 +34,23 @@ module.exports = React.createClass({
         currentlyActive: React.PropTypes.bool,
 
         // offline, online, etc
-        presenceState: React.PropTypes.string
+        presenceState: React.PropTypes.string,
     },
 
     getDefaultProps: function() {
         return {
             ago: -1,
-            presenceState: null
+            presenceState: null,
         };
     },
 
     getDuration: function(time) {
         if (!time) return;
-        var t = parseInt(time / 1000);
-        var s = t % 60;
-        var m = parseInt(t / 60) % 60;
-        var h = parseInt(t / (60 * 60)) % 24;
-        var d = parseInt(t / (60 * 60 * 24));
+        const t = parseInt(time / 1000);
+        const s = t % 60;
+        const m = parseInt(t / 60) % 60;
+        const h = parseInt(t / (60 * 60)) % 24;
+        const d = parseInt(t / (60 * 60 * 24));
         if (t < 60) {
             if (t < 0) {
                 return _t("for %(amount)ss", {amount: 0});
@@ -58,12 +58,12 @@ module.exports = React.createClass({
             return _t("for %(amount)ss", {amount: s});
         }
         if (t < 60 * 60) {
-            return  _t("for %(amount)sm", {amount: m});
+            return _t("for %(amount)sm", {amount: m});
         }
         if (t < 24 * 60 * 60) {
-            return  _t("for %(amount)sh", {amount: h});
+            return _t("for %(amount)sh", {amount: h});
         }
-        return  _t("for %(amount)sd", {amount: d});
+        return _t("for %(amount)sd", {amount: d});
     },
 
     getPrettyPresence: function(presence) {
@@ -75,20 +75,19 @@ module.exports = React.createClass({
 
     render: function() {
         if (this.props.activeAgo >= 0) {
-            let duration = this.getDuration(this.props.activeAgo);
-            let ago = this.props.currentlyActive || !duration ? "" : duration;
+            const duration = this.getDuration(this.props.activeAgo);
+            const ago = this.props.currentlyActive || !duration ? "" : duration;
             return (
                 <div className="mx_PresenceLabel">
                     { this.getPrettyPresence(this.props.presenceState) } { ago }
                 </div>
             );
-        }
-        else {
+        } else {
             return (
                 <div className="mx_PresenceLabel">
                     { this.getPrettyPresence(this.props.presenceState) }
                 </div>
             );
         }
-    }
+    },
 });
diff --git a/src/components/views/rooms/ReadReceiptMarker.js b/src/components/views/rooms/ReadReceiptMarker.js
index 44d1e651d7..69ea81cdfa 100644
--- a/src/components/views/rooms/ReadReceiptMarker.js
+++ b/src/components/views/rooms/ReadReceiptMarker.js
@@ -16,18 +16,18 @@ limitations under the License.
 
 'use strict';
 
-var React = require('react');
-var ReactDOM = require('react-dom');
+const React = require('react');
+const ReactDOM = require('react-dom');
 
-var sdk = require('../../../index');
+const sdk = require('../../../index');
 
-var Velociraptor = require('../../../Velociraptor');
+const Velociraptor = require('../../../Velociraptor');
 require('../../../VelocityBounce');
 import { _t } from '../../../languageHandler';
 
 import DateUtils from '../../../DateUtils';
 
-var bounce = false;
+let bounce = false;
 try {
     if (global.localStorage) {
         bounce = global.localStorage.getItem('avatar_bounce') == 'true';
@@ -90,7 +90,7 @@ module.exports = React.createClass({
     componentWillUnmount: function() {
         // before we remove the rr, store its location in the map, so that if
         // it reappears, it can be animated from the right place.
-        var rrInfo = this.props.readReceiptInfo;
+        const rrInfo = this.props.readReceiptInfo;
         if (!rrInfo) {
             return;
         }
@@ -102,7 +102,7 @@ module.exports = React.createClass({
             return;
         }
 
-        var avatarNode = ReactDOM.findDOMNode(this);
+        const avatarNode = ReactDOM.findDOMNode(this);
         rrInfo.top = avatarNode.offsetTop;
         rrInfo.left = avatarNode.offsetLeft;
         rrInfo.parent = avatarNode.offsetParent;
@@ -115,14 +115,14 @@ module.exports = React.createClass({
         }
 
         // treat new RRs as though they were off the top of the screen
-        var oldTop = -15;
+        let oldTop = -15;
 
-        var oldInfo = this.props.readReceiptInfo;
+        const oldInfo = this.props.readReceiptInfo;
         if (oldInfo && oldInfo.parent) {
             oldTop = oldInfo.top + oldInfo.parent.getBoundingClientRect().top;
         }
 
-        var newElement = ReactDOM.findDOMNode(this);
+        const newElement = ReactDOM.findDOMNode(this);
         let startTopOffset;
         if (!newElement.offsetParent) {
             // this seems to happen sometimes for reasons I don't understand
@@ -137,8 +137,8 @@ module.exports = React.createClass({
             startTopOffset = oldTop - newElement.offsetParent.getBoundingClientRect().top;
         }
 
-        var startStyles = [];
-        var enterTransitionOpts = [];
+        const startStyles = [];
+        const enterTransitionOpts = [];
 
         if (oldInfo && oldInfo.left) {
             // start at the old height and in the old h pos
@@ -146,7 +146,7 @@ module.exports = React.createClass({
             startStyles.push({ top: startTopOffset+"px",
                                left: oldInfo.left+"px" });
 
-            var reorderTransitionOpts = {
+            const reorderTransitionOpts = {
                 duration: 100,
                 easing: 'easeOut',
             };
@@ -171,12 +171,12 @@ module.exports = React.createClass({
 
 
     render: function() {
-        var MemberAvatar = sdk.getComponent('avatars.MemberAvatar');
+        const MemberAvatar = sdk.getComponent('avatars.MemberAvatar');
         if (this.state.suppressDisplay) {
-            return <div/>;
+            return <div />;
         }
 
-        var style = {
+        const style = {
             left: this.props.leftOffset+'px',
             top: '0px',
             visibility: this.props.hidden ? 'hidden' : 'visible',
diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index a6d34f9b08..da77174dff 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -16,20 +16,20 @@ limitations under the License.
 */
 
 'use strict';
-var React = require("react");
-var ReactDOM = require("react-dom");
+const React = require("react");
+const ReactDOM = require("react-dom");
 import { _t, _tJsx } from '../../../languageHandler';
-var GeminiScrollbar = require('react-gemini-scrollbar');
-var MatrixClientPeg = require("../../../MatrixClientPeg");
-var CallHandler = require('../../../CallHandler');
-var RoomListSorter = require("../../../RoomListSorter");
-var Unread = require('../../../Unread');
-var dis = require("../../../dispatcher");
-var sdk = require('../../../index');
-var rate_limited_func = require('../../../ratelimitedfunc');
-var Rooms = require('../../../Rooms');
+const GeminiScrollbar = require('react-gemini-scrollbar');
+const MatrixClientPeg = require("../../../MatrixClientPeg");
+const CallHandler = require('../../../CallHandler');
+const RoomListSorter = require("../../../RoomListSorter");
+const Unread = require('../../../Unread');
+const dis = require("../../../dispatcher");
+const sdk = require('../../../index');
+const rate_limited_func = require('../../../ratelimitedfunc');
+const Rooms = require('../../../Rooms');
 import DMRoomMap from '../../../utils/DMRoomMap';
-var Receipt = require('../../../utils/Receipt');
+const Receipt = require('../../../utils/Receipt');
 
 const HIDE_CONFERENCE_CHANS = true;
 
@@ -55,7 +55,7 @@ function phraseForSection(section) {
             return _t('Drop here to tag %(section)s', {section: section});
     }
     return _t('Drop here %(toAction)s', {toAction: verb});
-};
+}
 
 module.exports = React.createClass({
     displayName: 'RoomList',
@@ -78,7 +78,7 @@ module.exports = React.createClass({
     componentWillMount: function() {
         this.mounted = false;
 
-        var cli = MatrixClientPeg.get();
+        const cli = MatrixClientPeg.get();
         cli.on("Room", this.onRoom);
         cli.on("deleteRoom", this.onDeleteRoom);
         cli.on("Room.timeline", this.onRoomTimeline);
@@ -98,7 +98,7 @@ module.exports = React.createClass({
 
         // loop count to stop a stack overflow if the user keeps waggling the
         // mouse for >30s in a row, or if running under mocha
-        this._delayedRefreshRoomListLoopCount = 0
+        this._delayedRefreshRoomListLoopCount = 0;
     },
 
     componentDidMount: function() {
@@ -124,13 +124,12 @@ module.exports = React.createClass({
                 var call = CallHandler.getCall(payload.room_id);
                 if (call && call.call_state === 'ringing') {
                     this.setState({
-                        incomingCall: call
+                        incomingCall: call,
                     });
                     this._repositionIncomingCallBox(undefined, true);
-                }
-                else {
+                } else {
                     this.setState({
-                        incomingCall: null
+                        incomingCall: null,
                     });
                 }
                 break;
@@ -174,7 +173,7 @@ module.exports = React.createClass({
 
     onArchivedHeaderClick: function(isHidden, scrollToPosition) {
         if (!isHidden) {
-            var self = this;
+            const self = this;
             this.setState({ isLoadingLeftRooms: true });
 
             // Try scrolling to position
@@ -265,7 +264,7 @@ module.exports = React.createClass({
     },
 
     getRoomLists: function() {
-        var self = this;
+        const self = this;
         const lists = {};
 
         lists["im.vector.fake.invite"] = [];
@@ -288,35 +287,28 @@ module.exports = React.createClass({
 
             if (me.membership == "invite") {
                 lists["im.vector.fake.invite"].push(room);
-            }
-            else if (HIDE_CONFERENCE_CHANS && Rooms.isConfCallRoom(room, me, self.props.ConferenceHandler)) {
+            } else if (HIDE_CONFERENCE_CHANS && Rooms.isConfCallRoom(room, me, self.props.ConferenceHandler)) {
                 // skip past this room & don't put it in any lists
-            }
-            else if (me.membership == "join" || me.membership === "ban" ||
-                     (me.membership === "leave" && me.events.member.getSender() !== me.events.member.getStateKey()))
-            {
+            } else if (me.membership == "join" || me.membership === "ban" ||
+                     (me.membership === "leave" && me.events.member.getSender() !== me.events.member.getStateKey())) {
                 // Used to split rooms via tags
-                var tagNames = Object.keys(room.tags);
+                const tagNames = Object.keys(room.tags);
 
                 if (tagNames.length) {
-                    for (var i = 0; i < tagNames.length; i++) {
-                        var tagName = tagNames[i];
+                    for (let i = 0; i < tagNames.length; i++) {
+                        const tagName = tagNames[i];
                         lists[tagName] = lists[tagName] || [];
                         lists[tagName].push(room);
                     }
-                }
-                else if (dmRoomMap.getUserIdForRoomId(room.roomId)) {
+                } else if (dmRoomMap.getUserIdForRoomId(room.roomId)) {
                     // "Direct Message" rooms (that we're still in and that aren't otherwise tagged)
                     lists["im.vector.fake.direct"].push(room);
-                }
-                else {
+                } else {
                     lists["im.vector.fake.recent"].push(room);
                 }
-            }
-            else if (me.membership === "leave") {
+            } else if (me.membership === "leave") {
                 lists["im.vector.fake.archived"].push(room);
-            }
-            else {
+            } else {
                 console.error("unrecognised membership: " + me.membership + " - this should never happen");
             }
         });
@@ -343,7 +335,7 @@ module.exports = React.createClass({
 
     _getScrollNode: function() {
         if (!this.mounted) return null;
-        var panel = ReactDOM.findDOMNode(this);
+        const panel = ReactDOM.findDOMNode(this);
         if (!panel) return null;
 
         if (panel.classList.contains('gm-prevented')) {
@@ -367,22 +359,22 @@ module.exports = React.createClass({
     },
 
     _repositionIncomingCallBox: function(e, firstTime) {
-        var incomingCallBox = document.getElementById("incomingCallBox");
+        const incomingCallBox = document.getElementById("incomingCallBox");
         if (incomingCallBox && incomingCallBox.parentElement) {
-            var scrollArea = this._getScrollNode();
+            const scrollArea = this._getScrollNode();
             if (!scrollArea) return;
             // Use the offset of the top of the scroll area from the window
             // as this is used to calculate the CSS fixed top position for the stickies
-            var scrollAreaOffset = scrollArea.getBoundingClientRect().top + window.pageYOffset;
+            const scrollAreaOffset = scrollArea.getBoundingClientRect().top + window.pageYOffset;
             // Use the offset of the top of the component from the window
             // as this is used to calculate the CSS fixed top position for the stickies
-            var scrollAreaHeight = ReactDOM.findDOMNode(this).getBoundingClientRect().height;
+            const scrollAreaHeight = ReactDOM.findDOMNode(this).getBoundingClientRect().height;
 
-            var top = (incomingCallBox.parentElement.getBoundingClientRect().top + window.pageYOffset);
+            let top = (incomingCallBox.parentElement.getBoundingClientRect().top + window.pageYOffset);
             // Make sure we don't go too far up, if the headers aren't sticky
             top = (top < scrollAreaOffset) ? scrollAreaOffset : top;
             // make sure we don't go too far down, if the headers aren't sticky
-            var bottomMargin = scrollAreaOffset + (scrollAreaHeight - 45);
+            const bottomMargin = scrollAreaOffset + (scrollAreaHeight - 45);
             top = (top > bottomMargin) ? bottomMargin : top;
 
             incomingCallBox.style.top = top + "px";
@@ -393,14 +385,14 @@ module.exports = React.createClass({
     // Doing the sticky headers as raw DOM, for speed, as it gets very stuttery if done
     // properly through React
     _initAndPositionStickyHeaders: function(initialise, scrollToPosition) {
-        var scrollArea = this._getScrollNode();
+        const scrollArea = this._getScrollNode();
         if (!scrollArea) return;
         // Use the offset of the top of the scroll area from the window
         // as this is used to calculate the CSS fixed top position for the stickies
-        var scrollAreaOffset = scrollArea.getBoundingClientRect().top + window.pageYOffset;
+        const scrollAreaOffset = scrollArea.getBoundingClientRect().top + window.pageYOffset;
         // Use the offset of the top of the componet from the window
         // as this is used to calculate the CSS fixed top position for the stickies
-        var scrollAreaHeight = ReactDOM.findDOMNode(this).getBoundingClientRect().height;
+        const scrollAreaHeight = ReactDOM.findDOMNode(this).getBoundingClientRect().height;
 
         if (initialise) {
             // Get a collection of sticky header containers references
@@ -420,7 +412,7 @@ module.exports = React.createClass({
                     sticky.dataset.originalPosition = sticky.offsetTop - scrollArea.offsetTop;
 
                     // Save and set the sticky heights
-                    var originalHeight = sticky.getBoundingClientRect().height;
+                    const originalHeight = sticky.getBoundingClientRect().height;
                     sticky.dataset.originalHeight = originalHeight;
                     sticky.style.height = originalHeight;
 
@@ -429,8 +421,8 @@ module.exports = React.createClass({
             }
         }
 
-        var self = this;
-        var scrollStuckOffset = 0;
+        const self = this;
+        let scrollStuckOffset = 0;
         // Scroll to the passed in position, i.e. a header was clicked and in a scroll to state
         // rather than a collapsable one (see RoomSubList.isCollapsableOnClick method for details)
         if (scrollToPosition !== undefined) {
@@ -438,11 +430,11 @@ module.exports = React.createClass({
         }
         // Stick headers to top and bottom, or free them
         Array.prototype.forEach.call(this.stickies, function(sticky, i, stickyWrappers) {
-            var stickyPosition = sticky.dataset.originalPosition;
-            var stickyHeight = sticky.dataset.originalHeight;
-            var stickyHeader = sticky.childNodes[0];
-            var topStuckHeight = stickyHeight * i;
-            var bottomStuckHeight = stickyHeight * (stickyWrappers.length - i);
+            const stickyPosition = sticky.dataset.originalPosition;
+            const stickyHeight = sticky.dataset.originalHeight;
+            const stickyHeader = sticky.childNodes[0];
+            const topStuckHeight = stickyHeight * i;
+            const bottomStuckHeight = stickyHeight * (stickyWrappers.length - i);
 
             if (self.scrollAreaSufficient && stickyPosition < (scrollArea.scrollTop + topStuckHeight)) {
                 // Top stickies
@@ -472,7 +464,7 @@ module.exports = React.createClass({
     },
 
     _updateStickyHeaders: function(initialise, scrollToPosition) {
-        var self = this;
+        const self = this;
 
         if (initialise) {
             // Useing setTimeout to ensure that the code is run after the painting
@@ -507,25 +499,25 @@ module.exports = React.createClass({
         switch (section) {
             case 'im.vector.fake.direct':
                 return <div className="mx_RoomList_emptySubListTip">
-                    {_tJsx(
+                    { _tJsx(
                         "Press <StartChatButton> to start a chat with someone",
                         [/<StartChatButton>/],
                         [
-                            (sub) => <StartChatButton size="16" callout={true}/>
-                        ]
-                    )}
+                            (sub) => <StartChatButton size="16" callout={true} />,
+                        ],
+                    ) }
                 </div>;
             case 'im.vector.fake.recent':
                 return <div className="mx_RoomList_emptySubListTip">
-                    {_tJsx(
+                    { _tJsx(
                         "You're not in any rooms yet! Press <CreateRoomButton> to make a room or"+
                         " <RoomDirectoryButton> to browse the directory",
                         [/<CreateRoomButton>/, /<RoomDirectoryButton>/],
                         [
-                            (sub) => <CreateRoomButton size="16" callout={true}/>,
-                            (sub) => <RoomDirectoryButton size="16" callout={true}/>
-                        ]
-                    )}
+                            (sub) => <CreateRoomButton size="16" callout={true} />,
+                            (sub) => <RoomDirectoryButton size="16" callout={true} />,
+                        ],
+                    ) }
                 </div>;
         }
 
@@ -574,113 +566,112 @@ module.exports = React.createClass({
 
         const inviteSectionExtraTiles = this._makeGroupInviteTiles();
 
-        var self = this;
+        const self = this;
         return (
             <GeminiScrollbar className="mx_RoomList_scrollbar"
-                 autoshow={true} onScroll={ self._whenScrolling } ref="gemscroll">
+                 autoshow={true} onScroll={self._whenScrolling} ref="gemscroll">
             <div className="mx_RoomList">
-                <RoomSubList list={ self.state.lists['im.vector.fake.invite'] }
-                             label={ _t('Invites') }
-                             editable={ false }
+                <RoomSubList list={self.state.lists['im.vector.fake.invite']}
+                             label={_t('Invites')}
+                             editable={false}
                              order="recent"
                              isInvite={true}
-                             selectedRoom={ self.props.selectedRoom }
-                             incomingCall={ self.state.incomingCall }
-                             collapsed={ self.props.collapsed }
-                             searchFilter={ self.props.searchFilter }
-                             onHeaderClick={ self.onSubListHeaderClick }
-                             onShowMoreRooms={ self.onShowMoreRooms }
-                             extraTiles={ inviteSectionExtraTiles }
+                             selectedRoom={self.props.selectedRoom}
+                             incomingCall={self.state.incomingCall}
+                             collapsed={self.props.collapsed}
+                             searchFilter={self.props.searchFilter}
+                             onHeaderClick={self.onSubListHeaderClick}
+                             onShowMoreRooms={self.onShowMoreRooms}
+                             extraTiles={inviteSectionExtraTiles}
                 />
 
-                <RoomSubList list={ self.state.lists['m.favourite'] }
-                             label={ _t('Favourites') }
+                <RoomSubList list={self.state.lists['m.favourite']}
+                             label={_t('Favourites')}
                              tagName="m.favourite"
                              emptyContent={this._getEmptyContent('m.favourite')}
-                             editable={ true }
+                             editable={true}
                              order="manual"
-                             selectedRoom={ self.props.selectedRoom }
-                             incomingCall={ self.state.incomingCall }
-                             collapsed={ self.props.collapsed }
-                             searchFilter={ self.props.searchFilter }
-                             onHeaderClick={ self.onSubListHeaderClick }
-                             onShowMoreRooms={ self.onShowMoreRooms } />
+                             selectedRoom={self.props.selectedRoom}
+                             incomingCall={self.state.incomingCall}
+                             collapsed={self.props.collapsed}
+                             searchFilter={self.props.searchFilter}
+                             onHeaderClick={self.onSubListHeaderClick}
+                             onShowMoreRooms={self.onShowMoreRooms} />
 
-                <RoomSubList list={ self.state.lists['im.vector.fake.direct'] }
-                             label={ _t('People') }
+                <RoomSubList list={self.state.lists['im.vector.fake.direct']}
+                             label={_t('People')}
                              tagName="im.vector.fake.direct"
                              emptyContent={this._getEmptyContent('im.vector.fake.direct')}
                              headerItems={this._getHeaderItems('im.vector.fake.direct')}
-                             editable={ true }
+                             editable={true}
                              order="recent"
-                             selectedRoom={ self.props.selectedRoom }
-                             incomingCall={ self.state.incomingCall }
-                             collapsed={ self.props.collapsed }
-                             alwaysShowHeader={ true }
-                             searchFilter={ self.props.searchFilter }
-                             onHeaderClick={ self.onSubListHeaderClick }
-                             onShowMoreRooms={ self.onShowMoreRooms } />
+                             selectedRoom={self.props.selectedRoom}
+                             incomingCall={self.state.incomingCall}
+                             collapsed={self.props.collapsed}
+                             alwaysShowHeader={true}
+                             searchFilter={self.props.searchFilter}
+                             onHeaderClick={self.onSubListHeaderClick}
+                             onShowMoreRooms={self.onShowMoreRooms} />
 
-                <RoomSubList list={ self.state.lists['im.vector.fake.recent'] }
-                             label={ _t('Rooms') }
-                             editable={ true }
+                <RoomSubList list={self.state.lists['im.vector.fake.recent']}
+                             label={_t('Rooms')}
+                             editable={true}
                              emptyContent={this._getEmptyContent('im.vector.fake.recent')}
                              headerItems={this._getHeaderItems('im.vector.fake.recent')}
                              order="recent"
-                             selectedRoom={ self.props.selectedRoom }
-                             incomingCall={ self.state.incomingCall }
-                             collapsed={ self.props.collapsed }
-                             searchFilter={ self.props.searchFilter }
-                             onHeaderClick={ self.onSubListHeaderClick }
-                             onShowMoreRooms={ self.onShowMoreRooms } />
+                             selectedRoom={self.props.selectedRoom}
+                             incomingCall={self.state.incomingCall}
+                             collapsed={self.props.collapsed}
+                             searchFilter={self.props.searchFilter}
+                             onHeaderClick={self.onSubListHeaderClick}
+                             onShowMoreRooms={self.onShowMoreRooms} />
 
                 { Object.keys(self.state.lists).map((tagName) => {
                     if (!tagName.match(/^(m\.(favourite|lowpriority)|im\.vector\.fake\.(invite|recent|direct|archived))$/)) {
-                        return <RoomSubList list={ self.state.lists[tagName] }
-                             key={ tagName }
-                             label={ tagName }
-                             tagName={ tagName }
+                        return <RoomSubList list={self.state.lists[tagName]}
+                             key={tagName}
+                             label={tagName}
+                             tagName={tagName}
                              emptyContent={this._getEmptyContent(tagName)}
-                             editable={ true }
+                             editable={true}
                              order="manual"
-                             selectedRoom={ self.props.selectedRoom }
-                             incomingCall={ self.state.incomingCall }
-                             collapsed={ self.props.collapsed }
-                             searchFilter={ self.props.searchFilter }
-                             onHeaderClick={ self.onSubListHeaderClick }
-                             onShowMoreRooms={ self.onShowMoreRooms } />;
-
+                             selectedRoom={self.props.selectedRoom}
+                             incomingCall={self.state.incomingCall}
+                             collapsed={self.props.collapsed}
+                             searchFilter={self.props.searchFilter}
+                             onHeaderClick={self.onSubListHeaderClick}
+                             onShowMoreRooms={self.onShowMoreRooms} />;
                     }
                 }) }
 
-                <RoomSubList list={ self.state.lists['m.lowpriority'] }
-                             label={ _t('Low priority') }
+                <RoomSubList list={self.state.lists['m.lowpriority']}
+                             label={_t('Low priority')}
                              tagName="m.lowpriority"
                              emptyContent={this._getEmptyContent('m.lowpriority')}
-                             editable={ true }
+                             editable={true}
                              order="recent"
-                             selectedRoom={ self.props.selectedRoom }
-                             incomingCall={ self.state.incomingCall }
-                             collapsed={ self.props.collapsed }
-                             searchFilter={ self.props.searchFilter }
-                             onHeaderClick={ self.onSubListHeaderClick }
-                             onShowMoreRooms={ self.onShowMoreRooms } />
+                             selectedRoom={self.props.selectedRoom}
+                             incomingCall={self.state.incomingCall}
+                             collapsed={self.props.collapsed}
+                             searchFilter={self.props.searchFilter}
+                             onHeaderClick={self.onSubListHeaderClick}
+                             onShowMoreRooms={self.onShowMoreRooms} />
 
-                <RoomSubList list={ self.state.lists['im.vector.fake.archived'] }
-                             label={ _t('Historical') }
-                             editable={ false }
+                <RoomSubList list={self.state.lists['im.vector.fake.archived']}
+                             label={_t('Historical')}
+                             editable={false}
                              order="recent"
-                             selectedRoom={ self.props.selectedRoom }
-                             collapsed={ self.props.collapsed }
-                             alwaysShowHeader={ true }
-                             startAsHidden={ true }
-                             showSpinner={ self.state.isLoadingLeftRooms }
-                             onHeaderClick= { self.onArchivedHeaderClick }
-                             incomingCall={ self.state.incomingCall }
-                             searchFilter={ self.props.searchFilter }
-                             onShowMoreRooms={ self.onShowMoreRooms } />
+                             selectedRoom={self.props.selectedRoom}
+                             collapsed={self.props.collapsed}
+                             alwaysShowHeader={true}
+                             startAsHidden={true}
+                             showSpinner={self.state.isLoadingLeftRooms}
+                             onHeaderClick= {self.onArchivedHeaderClick}
+                             incomingCall={self.state.incomingCall}
+                             searchFilter={self.props.searchFilter}
+                             onShowMoreRooms={self.onShowMoreRooms} />
             </div>
             </GeminiScrollbar>
         );
-    }
+    },
 });
diff --git a/src/components/views/rooms/RoomNameEditor.js b/src/components/views/rooms/RoomNameEditor.js
index c21e155933..c6ebea864e 100644
--- a/src/components/views/rooms/RoomNameEditor.js
+++ b/src/components/views/rooms/RoomNameEditor.js
@@ -16,9 +16,9 @@ limitations under the License.
 
 'use strict';
 
-var React = require('react');
-var sdk = require('../../../index');
-var MatrixClientPeg = require('../../../MatrixClientPeg');
+const React = require('react');
+const sdk = require('../../../index');
+const MatrixClientPeg = require('../../../MatrixClientPeg');
 import { _t } from '../../../languageHandler';
 
 module.exports = React.createClass({
@@ -29,10 +29,10 @@ module.exports = React.createClass({
     },
 
     componentWillMount: function() {
-        var room = this.props.room;
-        var name = room.currentState.getStateEvents('m.room.name', '');
-        var myId = MatrixClientPeg.get().credentials.userId;
-        var defaultName = room.getDefaultRoomName(myId);
+        const room = this.props.room;
+        const name = room.currentState.getStateEvents('m.room.name', '');
+        const myId = MatrixClientPeg.get().credentials.userId;
+        const defaultName = room.getDefaultRoomName(myId);
 
         this._initialName = name ? name.getContent().name : '';
 
@@ -47,16 +47,16 @@ module.exports = React.createClass({
     },
 
     render: function() {
-        var EditableText = sdk.getComponent("elements.EditableText");
+        const EditableText = sdk.getComponent("elements.EditableText");
 
         return (
                 <div className="mx_RoomHeader_name">
                     <EditableText ref="editor"
                          className="mx_RoomHeader_nametext mx_RoomHeader_editable"
                          placeholderClassName="mx_RoomHeader_placeholder"
-                         placeholder={ this._placeholderName }
-                         blurToCancel={ false }
-                         initialValue={ this._initialName }
+                         placeholder={this._placeholderName}
+                         blurToCancel={false}
+                         initialValue={this._initialName}
                          dir="auto" />
                 </div>
         );
diff --git a/src/components/views/rooms/RoomPreviewBar.js b/src/components/views/rooms/RoomPreviewBar.js
index 34166452cb..368d81e606 100644
--- a/src/components/views/rooms/RoomPreviewBar.js
+++ b/src/components/views/rooms/RoomPreviewBar.js
@@ -17,9 +17,9 @@ limitations under the License.
 
 'use strict';
 
-var React = require('react');
-var sdk = require('../../../index');
-var MatrixClientPeg = require('../../../MatrixClientPeg');
+const React = require('react');
+const sdk = require('../../../index');
+const MatrixClientPeg = require('../../../MatrixClientPeg');
 
 import { _t, _tJsx } from '../../../languageHandler';
 
@@ -61,7 +61,7 @@ module.exports = React.createClass({
 
     getInitialState: function() {
         return {
-            busy: false
+            busy: false,
         };
     },
 
@@ -72,7 +72,7 @@ module.exports = React.createClass({
         if (this.props.inviterName && this.props.invitedEmail) {
             this.setState({busy: true});
             MatrixClientPeg.get().lookupThreePid(
-                'email', this.props.invitedEmail
+                'email', this.props.invitedEmail,
             ).finally(() => {
                 this.setState({busy: false});
             }).done((result) => {
@@ -90,10 +90,10 @@ module.exports = React.createClass({
     },
 
     render: function() {
-        var joinBlock, previewBlock;
+        let joinBlock, previewBlock;
 
         if (this.props.spinner || this.state.busy) {
-            var Spinner = sdk.getComponent("elements.Spinner");
+            const Spinner = sdk.getComponent("elements.Spinner");
             return (<div className="mx_RoomPreviewBar">
                 <Spinner />
             </div>);
@@ -110,11 +110,11 @@ module.exports = React.createClass({
         const banned = myMember && myMember.membership == 'ban';
 
         if (this.props.inviterName) {
-            var emailMatchBlock;
+            let emailMatchBlock;
             if (this.props.invitedEmail) {
                 if (this.state.threePidFetchError) {
                     emailMatchBlock = <div className="error">
-                        {_t("Unable to ascertain that the address this invite was sent to matches one associated with your account.")}
+                        { _t("Unable to ascertain that the address this invite was sent to matches one associated with your account.") }
                     </div>;
                 } else if (this.state.invitedEmailMxid != MatrixClientPeg.get().credentials.userId) {
                     emailMatchBlock =
@@ -123,10 +123,10 @@ module.exports = React.createClass({
                                 <img src="img/warning.svg" width="24" height="23" title= "/!\\" alt="/!\\" />
                             </div>
                             <div className="mx_RoomPreviewBar_warningText">
-                                {_t("This invitation was sent to an email address which is not associated with this account:")}
-                                <b><span className="email">{this.props.invitedEmail}</span></b>
-                                <br/>
-                                {_t("You may wish to login with a different account, or add this email to this account.")}
+                                { _t("This invitation was sent to an email address which is not associated with this account:") }
+                                <b><span className="email">{ this.props.invitedEmail }</span></b>
+                                <br />
+                                { _t("You may wish to login with a different account, or add this email to this account.") }
                             </div>
                         </div>;
                 }
@@ -141,53 +141,51 @@ module.exports = React.createClass({
                             'Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?',
                             [/<acceptText>(.*?)<\/acceptText>/, /<declineText>(.*?)<\/declineText>/],
                             [
-                                (sub) => <a onClick={ this.props.onJoinClick }>{sub}</a>,
-                                (sub) => <a onClick={ this.props.onRejectClick }>{sub}</a>
-                            ]
-                        )}
+                                (sub) => <a onClick={this.props.onJoinClick}>{ sub }</a>,
+                                (sub) => <a onClick={this.props.onRejectClick}>{ sub }</a>,
+                            ],
+                        ) }
                     </div>
-                    {emailMatchBlock}
+                    { emailMatchBlock }
                 </div>
             );
-
         } else if (kicked || banned) {
             const roomName = this._roomNameElement(_t('This room'));
             const kickerMember = this.props.room.currentState.getMember(
-                myMember.events.member.getSender()
+                myMember.events.member.getSender(),
             );
             const kickerName = kickerMember ?
                 kickerMember.name : myMember.events.member.getSender();
             let reason;
             if (myMember.events.member.getContent().reason) {
-                reason = <div>{_t("Reason: %(reasonText)s", {reasonText: myMember.events.member.getContent().reason})}</div>
+                reason = <div>{ _t("Reason: %(reasonText)s", {reasonText: myMember.events.member.getContent().reason}) }</div>;
             }
             let rejoinBlock;
             if (!banned) {
-                rejoinBlock = <div><a onClick={ this.props.onJoinClick }><b>{_t("Rejoin")}</b></a></div>;
+                rejoinBlock = <div><a onClick={this.props.onJoinClick}><b>{ _t("Rejoin") }</b></a></div>;
             }
 
             let actionText;
             if (kicked) {
                 actionText = _t("You have been kicked from %(roomName)s by %(userName)s.", {roomName: roomName, userName: kickerName});
-            }
-            else if (banned) {
+            } else if (banned) {
                 actionText = _t("You have been banned from %(roomName)s by %(userName)s.", {roomName: roomName, userName: kickerName});
             } // no other options possible due to the kicked || banned check above.
 
             joinBlock = (
                 <div>
                     <div className="mx_RoomPreviewBar_join_text">
-                        {actionText}
+                        { actionText }
                         <br />
-                        {reason}
-                        {rejoinBlock}
-                        <a onClick={ this.props.onForgetClick }><b>{_t("Forget room")}</b></a>
+                        { reason }
+                        { rejoinBlock }
+                        <a onClick={this.props.onForgetClick}><b>{ _t("Forget room") }</b></a>
                     </div>
                 </div>
             );
         } else if (this.props.error) {
-            var name = this.props.roomAlias || _t("This room");
-            var error;
+            const name = this.props.roomAlias || _t("This room");
+            let error;
             if (this.props.error.errcode == 'M_NOT_FOUND') {
                 error = _t("%(roomName)s does not exist.", {roomName: name});
             } else {
@@ -206,11 +204,11 @@ module.exports = React.createClass({
                 <div>
                     <div className="mx_RoomPreviewBar_join_text">
                         { _t('You are trying to access %(roomName)s.', {roomName: name}) }
-                        <br/>
+                        <br />
                         { _tJsx("<a>Click here</a> to join the discussion!",
                             /<a>(.*?)<\/a>/,
-                            (sub) => <a onClick={ this.props.onJoinClick }><b>{sub}</b></a>
-                        )}
+                            (sub) => <a onClick={this.props.onJoinClick}><b>{ sub }</b></a>,
+                        ) }
                     </div>
                 </div>
             );
@@ -232,5 +230,5 @@ module.exports = React.createClass({
                 </div>
             </div>
         );
-    }
+    },
 });
diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js
index 8739254966..9934456597 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -31,7 +31,7 @@ import AccessibleButton from '../elements/AccessibleButton';
 // parse a string as an integer; if the input is undefined, or cannot be parsed
 // as an integer, return a default.
 function parseIntWithDefault(val, def) {
-    var res = parseInt(val);
+    const res = parseInt(val);
     return isNaN(res) ? def : res;
 }
 
@@ -57,7 +57,7 @@ const plEventsToShow = {
     "m.room.topic": {isState: true},
 
     "im.vector.modular.widgets": {isState: true},
-}
+};
 
 const BannedUser = React.createClass({
     propTypes: {
@@ -103,8 +103,8 @@ const BannedUser = React.createClass({
             <li>
                 { unbanButton }
                 <span title={_t("Banned by %(displayName)s", {displayName: this.props.by})}>
-                    <strong>{this.props.member.name}</strong> {this.props.member.userId}
-                    {this.props.reason ? " " +_t('Reason') + ": " + this.props.reason : ""}
+                    <strong>{ this.props.member.name }</strong> { this.props.member.userId }
+                    { this.props.reason ? " " +_t('Reason') + ": " + this.props.reason : "" }
                 </span>
             </li>
         );
@@ -120,7 +120,7 @@ module.exports = React.createClass({
     },
 
     getInitialState: function() {
-        var tags = {};
+        const tags = {};
         Object.keys(this.props.room.tags).forEach(function(tagName) {
             tags[tagName] = ['yep'];
         });
@@ -149,7 +149,7 @@ module.exports = React.createClass({
         MatrixClientPeg.get().on("RoomMember.membership", this._onRoomMemberMembership);
 
         MatrixClientPeg.get().getRoomDirectoryVisibility(
-            this.props.room.roomId
+            this.props.room.roomId,
         ).done((result) => {
             this.setState({ isRoomPublished: result.visibility === "public" });
             this._originalIsRoomPublished = result.visibility === "public";
@@ -179,13 +179,13 @@ module.exports = React.createClass({
 
     setName: function(name) {
         this.setState({
-            name: name
+            name: name,
         });
     },
 
     setTopic: function(topic) {
         this.setState({
-            topic: topic
+            topic: topic,
         });
     },
 
@@ -196,7 +196,7 @@ module.exports = React.createClass({
      * `{ state: "fulfilled", value: v }` or `{ state: "rejected", reason: r }`.
      */
     save: function() {
-        var stateWasSetDefer = Promise.defer();
+        const stateWasSetDefer = Promise.defer();
         // the caller may have JUST called setState on stuff, so we need to re-render before saving
         // else we won't use the latest values of things.
         // We can be a bit cheeky here and set a loading flag, and listen for the callback on that
@@ -223,8 +223,8 @@ module.exports = React.createClass({
 
     _calcSavePromises: function() {
         const roomId = this.props.room.roomId;
-        var promises = this.saveAliases(); // returns Promise[]
-        var originalState = this.getInitialState();
+        const promises = this.saveAliases(); // returns Promise[]
+        const originalState = this.getInitialState();
 
         // diff between original state and this.state to work out what has been changed
         console.log("Original: %s", JSON.stringify(originalState));
@@ -242,14 +242,14 @@ module.exports = React.createClass({
             promises.push(MatrixClientPeg.get().sendStateEvent(
                 roomId, "m.room.history_visibility",
                 { history_visibility: this.state.history_visibility },
-                ""
+                "",
             ));
         }
 
         if (this.state.isRoomPublished !== originalState.isRoomPublished) {
             promises.push(MatrixClientPeg.get().setRoomDirectoryVisibility(
                 roomId,
-                this.state.isRoomPublished ? "public" : "private"
+                this.state.isRoomPublished ? "public" : "private",
             ));
         }
 
@@ -257,7 +257,7 @@ module.exports = React.createClass({
             promises.push(MatrixClientPeg.get().sendStateEvent(
                 roomId, "m.room.join_rules",
                 { join_rule: this.state.join_rule },
-                ""
+                "",
             ));
         }
 
@@ -265,33 +265,33 @@ module.exports = React.createClass({
             promises.push(MatrixClientPeg.get().sendStateEvent(
                 roomId, "m.room.guest_access",
                 { guest_access: this.state.guest_access },
-                ""
+                "",
             ));
         }
 
 
         // power levels
-        var powerLevels = this._getPowerLevels();
+        const powerLevels = this._getPowerLevels();
         if (powerLevels) {
             promises.push(MatrixClientPeg.get().sendStateEvent(
-                roomId, "m.room.power_levels", powerLevels, ""
+                roomId, "m.room.power_levels", powerLevels, "",
             ));
         }
 
         // tags
         if (this.state.tags_changed) {
-            var tagDiffs = ObjectUtils.getKeyValueArrayDiffs(originalState.tags, this.state.tags);
+            const tagDiffs = ObjectUtils.getKeyValueArrayDiffs(originalState.tags, this.state.tags);
             // [ {place: add, key: "m.favourite", val: ["yep"]} ]
             tagDiffs.forEach(function(diff) {
                 switch (diff.place) {
                     case "add":
                         promises.push(
-                            MatrixClientPeg.get().setRoomTag(roomId, diff.key, {})
+                            MatrixClientPeg.get().setRoomTag(roomId, diff.key, {}),
                         );
                         break;
                     case "del":
                         promises.push(
-                            MatrixClientPeg.get().deleteRoomTag(roomId, diff.key)
+                            MatrixClientPeg.get().deleteRoomTag(roomId, diff.key),
                         );
                         break;
                     default:
@@ -302,14 +302,14 @@ module.exports = React.createClass({
         }
 
         // color scheme
-        var p;
+        let p;
         p = this.saveColor();
         if (!p.isFulfilled()) {
             promises.push(p);
         }
 
         // url preview settings
-        var ps = this.saveUrlPreviewSettings();
+        const ps = this.saveUrlPreviewSettings();
         if (ps.length > 0) {
             promises.push(ps);
         }
@@ -352,13 +352,13 @@ module.exports = React.createClass({
     saveEnableEncryption: function() {
         if (!this.refs.encrypt) { return Promise.resolve(); }
 
-        var encrypt = this.refs.encrypt.checked;
+        const encrypt = this.refs.encrypt.checked;
         if (!encrypt) { return Promise.resolve(); }
 
-        var roomId = this.props.room.roomId;
+        const roomId = this.props.room.roomId;
         return MatrixClientPeg.get().sendStateEvent(
             roomId, "m.room.encryption",
-            { algorithm: "m.megolm.v1.aes-sha2" }
+            { algorithm: "m.megolm.v1.aes-sha2" },
         );
     },
 
@@ -370,7 +370,7 @@ module.exports = React.createClass({
     },
 
     _isRoomBlacklistUnverified: function() {
-        var blacklistUnverifiedDevicesPerRoom = UserSettingsStore.getLocalSettings().blacklistUnverifiedDevicesPerRoom;
+        const blacklistUnverifiedDevicesPerRoom = UserSettingsStore.getLocalSettings().blacklistUnverifiedDevicesPerRoom;
         if (blacklistUnverifiedDevicesPerRoom) {
             return blacklistUnverifiedDevicesPerRoom[this.props.room.roomId];
         }
@@ -378,7 +378,7 @@ module.exports = React.createClass({
     },
 
     _setRoomBlacklistUnverified: function(value) {
-        var blacklistUnverifiedDevicesPerRoom = UserSettingsStore.getLocalSettings().blacklistUnverifiedDevicesPerRoom || {};
+        const blacklistUnverifiedDevicesPerRoom = UserSettingsStore.getLocalSettings().blacklistUnverifiedDevicesPerRoom || {};
         blacklistUnverifiedDevicesPerRoom[this.props.room.roomId] = value;
         UserSettingsStore.setLocalSetting('blacklistUnverifiedDevicesPerRoom', blacklistUnverifiedDevicesPerRoom);
 
@@ -396,15 +396,15 @@ module.exports = React.createClass({
     _getPowerLevels: function() {
         if (!this.state.power_levels_changed) return undefined;
 
-        var powerLevels = this.props.room.currentState.getStateEvents('m.room.power_levels', '');
+        let powerLevels = this.props.room.currentState.getStateEvents('m.room.power_levels', '');
         powerLevels = powerLevels ? powerLevels.getContent() : {};
 
-        for (let key of Object.keys(this.refs).filter(k => k.startsWith("event_levels_"))) {
+        for (const key of Object.keys(this.refs).filter((k) => k.startsWith("event_levels_"))) {
             const eventType = key.substring("event_levels_".length);
             powerLevels.events[eventType] = parseInt(this.refs[key].getValue());
         }
 
-        var newPowerLevels = {
+        const newPowerLevels = {
             ban: parseInt(this.refs.ban.getValue()),
             kick: parseInt(this.refs.kick.getValue()),
             redact: parseInt(this.refs.redact.getValue()),
@@ -421,7 +421,7 @@ module.exports = React.createClass({
 
     onPowerLevelsChanged: function() {
         this.setState({
-            power_levels_changed: true
+            power_levels_changed: true,
         });
     },
 
@@ -436,25 +436,25 @@ module.exports = React.createClass({
     },
 
     _onHistoryRadioToggle: function(ev) {
-        var self = this;
-        var QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
+        const self = this;
+        const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
 
         // cancel the click unless the user confirms it
         ev.preventDefault();
-        var value = ev.target.value;
+        const value = ev.target.value;
 
         Modal.createTrackedDialog('Privacy warning', '', QuestionDialog, {
             title: _t('Privacy warning'),
             description:
                 <div>
-                    { _t('Changes to who can read history will only apply to future messages in this room') }.<br/>
+                    { _t('Changes to who can read history will only apply to future messages in this room') }.<br />
                     { _t('The visibility of existing history will be unchanged') }.
                 </div>,
             button: _t('Continue'),
             onFinished: function(confirmed) {
                 if (confirmed) {
                     self.setState({
-                        history_visibility: value
+                        history_visibility: value,
                     });
                 }
             },
@@ -462,7 +462,6 @@ module.exports = React.createClass({
     },
 
     _onRoomAccessRadioToggle: function(ev) {
-
         //                         join_rule
         //                      INVITE  |  PUBLIC
         //        ----------------------+----------------
@@ -500,7 +499,7 @@ module.exports = React.createClass({
 
     _onToggle: function(keyName, checkedValue, uncheckedValue, ev) {
         console.log("Checkbox toggle: %s %s", keyName, ev.target.checked);
-        var state = {};
+        const state = {};
         state[keyName] = ev.target.checked ? checkedValue : uncheckedValue;
         this.setState(state);
     },
@@ -509,26 +508,24 @@ module.exports = React.createClass({
         if (event.target.checked) {
             if (tagName === 'm.favourite') {
                 delete this.state.tags['m.lowpriority'];
-            }
-            else if (tagName === 'm.lowpriority') {
+            } else if (tagName === 'm.lowpriority') {
                 delete this.state.tags['m.favourite'];
             }
 
             this.state.tags[tagName] = this.state.tags[tagName] || ["yep"];
-        }
-        else {
+        } else {
             delete this.state.tags[tagName];
         }
 
         this.setState({
             tags: this.state.tags,
-            tags_changed: true
+            tags_changed: true,
         });
     },
 
     mayChangeRoomAccess: function() {
-        var cli = MatrixClientPeg.get();
-        var roomState = this.props.room.currentState;
+        const cli = MatrixClientPeg.get();
+        const roomState = this.props.room.currentState;
         return (roomState.mayClientSendStateEvent("m.room.join_rules", cli) &&
                 roomState.mayClientSendStateEvent("m.room.guest_access", cli));
     },
@@ -545,8 +542,8 @@ module.exports = React.createClass({
         MatrixClientPeg.get().forget(this.props.room.roomId).done(function() {
             dis.dispatch({ action: 'view_next_room' });
         }, function(err) {
-            var errCode = err.errcode || _t('unknown error code');
-            var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+            const errCode = err.errcode || _t('unknown error code');
+            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             Modal.createTrackedDialog('Failed to forget room', '', ErrorDialog, {
                 title: _t('Error'),
                 description: _t("Failed to forget room %(errCode)s", { errCode: errCode }),
@@ -557,7 +554,7 @@ module.exports = React.createClass({
     onEnableEncryptionClick() {
         if (!this.refs.encrypt.checked) return;
 
-        var QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
+        const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
         Modal.createTrackedDialog('E2E Enable Warning', '', QuestionDialog, {
             title: _t('Warning!'),
             description: (
@@ -569,7 +566,7 @@ module.exports = React.createClass({
                     <p>{ _t('Encrypted messages will not be visible on clients that do not yet implement encryption') }.</p>
                 </div>
             ),
-            onFinished: confirm=>{
+            onFinished: (confirm)=>{
                 if (!confirm) {
                     this.refs.encrypt.checked = false;
                 }
@@ -583,7 +580,7 @@ module.exports = React.createClass({
     },
 
     _populateDefaultPlEvents: function(eventsSection, stateLevel, eventsLevel) {
-        for (let desiredEvent of Object.keys(plEventsToShow)) {
+        for (const desiredEvent of Object.keys(plEventsToShow)) {
             if (!(desiredEvent in eventsSection)) {
                 eventsSection[desiredEvent] = (plEventsToShow[desiredEvent].isState ? stateLevel : eventsLevel);
             }
@@ -591,17 +588,17 @@ module.exports = React.createClass({
     },
 
     _renderEncryptionSection: function() {
-        var cli = MatrixClientPeg.get();
-        var roomState = this.props.room.currentState;
-        var isEncrypted = cli.isRoomEncrypted(this.props.room.roomId);
-        var isGlobalBlacklistUnverified = UserSettingsStore.getLocalSettings().blacklistUnverifiedDevices;
-        var isRoomBlacklistUnverified = this._isRoomBlacklistUnverified();
+        const cli = MatrixClientPeg.get();
+        const roomState = this.props.room.currentState;
+        const isEncrypted = cli.isRoomEncrypted(this.props.room.roomId);
+        const isGlobalBlacklistUnverified = UserSettingsStore.getLocalSettings().blacklistUnverifiedDevices;
+        const isRoomBlacklistUnverified = this._isRoomBlacklistUnverified();
 
-        var settings =
+        const settings =
             <label>
                 <input type="checkbox" ref="blacklistUnverified"
-                       defaultChecked={ isGlobalBlacklistUnverified || isRoomBlacklistUnverified }
-                       disabled={ isGlobalBlacklistUnverified || (this.refs.encrypt && !this.refs.encrypt.checked) }/>
+                       defaultChecked={isGlobalBlacklistUnverified || isRoomBlacklistUnverified}
+                       disabled={isGlobalBlacklistUnverified || (this.refs.encrypt && !this.refs.encrypt.checked)} />
                 { _t('Never send encrypted messages to unverified devices in this room from this device') }.
             </label>;
 
@@ -609,7 +606,7 @@ module.exports = React.createClass({
             return (
                 <div>
                     <label>
-                        <input type="checkbox" ref="encrypt" onClick={ this.onEnableEncryptionClick }/>
+                        <input type="checkbox" ref="encrypt" onClick={this.onEnableEncryptionClick} />
                         <img className="mx_RoomSettings_e2eIcon mx_filterFlipColor" src="img/e2e-unencrypted.svg" width="12" height="12" />
                         { _t('Enable encryption') } { _t('(warning: cannot be disabled again!)') }
                     </label>
@@ -636,43 +633,43 @@ module.exports = React.createClass({
         // TODO: go through greying out things you don't have permission to change
         // (or turning them into informative stuff)
 
-        var AliasSettings = sdk.getComponent("room_settings.AliasSettings");
-        var ColorSettings = sdk.getComponent("room_settings.ColorSettings");
-        var UrlPreviewSettings = sdk.getComponent("room_settings.UrlPreviewSettings");
-        var RelatedGroupSettings = sdk.getComponent("room_settings.RelatedGroupSettings");
-        var EditableText = sdk.getComponent('elements.EditableText');
-        var PowerSelector = sdk.getComponent('elements.PowerSelector');
-        var Loader = sdk.getComponent("elements.Spinner");
+        const AliasSettings = sdk.getComponent("room_settings.AliasSettings");
+        const ColorSettings = sdk.getComponent("room_settings.ColorSettings");
+        const UrlPreviewSettings = sdk.getComponent("room_settings.UrlPreviewSettings");
+        const RelatedGroupSettings = sdk.getComponent("room_settings.RelatedGroupSettings");
+        const EditableText = sdk.getComponent('elements.EditableText');
+        const PowerSelector = sdk.getComponent('elements.PowerSelector');
+        const Loader = sdk.getComponent("elements.Spinner");
 
-        var cli = MatrixClientPeg.get();
-        var roomState = this.props.room.currentState;
-        var user_id = cli.credentials.userId;
+        const cli = MatrixClientPeg.get();
+        const roomState = this.props.room.currentState;
+        const user_id = cli.credentials.userId;
 
-        var power_level_event = roomState.getStateEvents('m.room.power_levels', '');
-        var power_levels = power_level_event ? power_level_event.getContent() : {};
-        var events_levels = power_levels.events || {};
-        var user_levels = power_levels.users || {};
+        const power_level_event = roomState.getStateEvents('m.room.power_levels', '');
+        const power_levels = power_level_event ? power_level_event.getContent() : {};
+        const events_levels = power_levels.events || {};
+        const user_levels = power_levels.users || {};
 
-        var ban_level = parseIntWithDefault(power_levels.ban, 50);
-        var kick_level = parseIntWithDefault(power_levels.kick, 50);
-        var redact_level = parseIntWithDefault(power_levels.redact, 50);
-        var invite_level = parseIntWithDefault(power_levels.invite, 50);
-        var send_level = parseIntWithDefault(power_levels.events_default, 0);
-        var state_level = power_level_event ? parseIntWithDefault(power_levels.state_default, 50) : 0;
-        var default_user_level = parseIntWithDefault(power_levels.users_default, 0);
+        const ban_level = parseIntWithDefault(power_levels.ban, 50);
+        const kick_level = parseIntWithDefault(power_levels.kick, 50);
+        const redact_level = parseIntWithDefault(power_levels.redact, 50);
+        const invite_level = parseIntWithDefault(power_levels.invite, 50);
+        const send_level = parseIntWithDefault(power_levels.events_default, 0);
+        const state_level = power_level_event ? parseIntWithDefault(power_levels.state_default, 50) : 0;
+        const default_user_level = parseIntWithDefault(power_levels.users_default, 0);
 
         this._populateDefaultPlEvents(events_levels, state_level, send_level);
 
-        var current_user_level = user_levels[user_id];
+        let current_user_level = user_levels[user_id];
         if (current_user_level === undefined) {
             current_user_level = default_user_level;
         }
 
-        var can_change_levels = roomState.mayClientSendStateEvent("m.room.power_levels", cli);
+        const can_change_levels = roomState.mayClientSendStateEvent("m.room.power_levels", cli);
 
-        var canSetTag = !cli.isGuest();
+        const canSetTag = !cli.isGuest();
 
-        var self = this;
+        const self = this;
 
         let relatedGroupsSection;
         if (UserSettingsStore.isFeatureEnabled('feature_groups')) {
@@ -682,23 +679,22 @@ module.exports = React.createClass({
                 relatedGroupsEvent={this.props.room.currentState.getStateEvents('m.room.related_groups', '')} />;
         }
 
-        var userLevelsSection;
+        let userLevelsSection;
         if (Object.keys(user_levels).length) {
             userLevelsSection =
                 <div>
                     <h3>{ _t('Privileged Users') }</h3>
                     <ul className="mx_RoomSettings_userLevels">
-                        {Object.keys(user_levels).map(function(user, i) {
+                        { Object.keys(user_levels).map(function(user, i) {
                             return (
                                 <li className="mx_RoomSettings_userLevel" key={user}>
-                                    { _t("%(user)s is a", {user: user}) } <PowerSelector value={ user_levels[user] } disabled={true}/>
+                                    { _t("%(user)s is a", {user: user}) } <PowerSelector value={user_levels[user]} disabled={true} />
                                 </li>
                             );
-                        })}
+                        }) }
                     </ul>
                 </div>;
-        }
-        else {
+        } else {
             userLevelsSection = <div>{ _t('No users have specific privileges in this room') }.</div>;
         }
 
@@ -710,7 +706,7 @@ module.exports = React.createClass({
                 <div>
                     <h3>{ _t('Banned users') }</h3>
                     <ul className="mx_RoomSettings_banned">
-                        {banned.map(function(member) {
+                        { banned.map(function(member) {
                             const banEvent = member.events.member.getContent();
                             const sender = self.props.room.getMember(member.events.member.getSender());
                             let bannedBy = member.events.member.getSender(); // start by falling back to mxid
@@ -718,12 +714,12 @@ module.exports = React.createClass({
                             return (
                                 <BannedUser key={member.userId} canUnban={canBanUsers} member={member} reason={banEvent.reason} by={bannedBy} />
                             );
-                        })}
+                        }) }
                     </ul>
                 </div>;
         }
 
-        var unfederatableSection;
+        let unfederatableSection;
         if (this._yankValueFromEvent("m.room.create", "m.federate", true) === false) {
              unfederatableSection = (
                 <div className="mx_RoomSettings_powerLevel">
@@ -732,19 +728,18 @@ module.exports = React.createClass({
             );
         }
 
-        var leaveButton = null;
-        var myMember = this.props.room.getMember(user_id);
+        let leaveButton = null;
+        const myMember = this.props.room.getMember(user_id);
         if (myMember) {
             if (myMember.membership === "join") {
                 leaveButton = (
-                    <AccessibleButton className="mx_RoomSettings_leaveButton" onClick={ this.onLeaveClick }>
+                    <AccessibleButton className="mx_RoomSettings_leaveButton" onClick={this.onLeaveClick}>
                         { _t('Leave room') }
                     </AccessibleButton>
                 );
-            }
-            else if (myMember.membership === "leave") {
+            } else if (myMember.membership === "leave") {
                 leaveButton = (
-                    <AccessibleButton className="mx_RoomSettings_leaveButton" onClick={ this.onForgetClick }>
+                    <AccessibleButton className="mx_RoomSettings_leaveButton" onClick={this.onForgetClick}>
                         { _t('Forget room') }
                     </AccessibleButton>
                 );
@@ -754,7 +749,7 @@ module.exports = React.createClass({
         // TODO: support editing custom events_levels
         // TODO: support editing custom user_levels
 
-        var tags = [
+        const tags = [
             { name: "m.favourite", label: _t('Favourite'), ref: "tag_favourite" },
             { name: "m.lowpriority", label: _t('Low priority'), ref: "tag_lowpriority" },
         ];
@@ -769,13 +764,13 @@ module.exports = React.createClass({
         if (canSetTag || self.state.tags) {
             var tagsSection =
                 <div className="mx_RoomSettings_tags">
-                    {_t("Tagged as: ")}{ canSetTag ?
+                    { _t("Tagged as: ") }{ canSetTag ?
                         (tags.map(function(tag, i) {
-                            return (<label key={ i }>
+                            return (<label key={i}>
                                         <input type="checkbox"
-                                               ref={ tag.ref }
-                                               checked={ tag.name in self.state.tags }
-                                               onChange={ self._onTagChange.bind(self, tag.name) }/>
+                                               ref={tag.ref}
+                                               checked={tag.name in self.state.tags}
+                                               onChange={self._onTagChange.bind(self, tag.name)} />
                                         { tag.label }
                                     </label>);
                         })) : (self.state.tags && self.state.tags.join) ? self.state.tags.join(", ") : ""
@@ -785,11 +780,11 @@ module.exports = React.createClass({
 
         // If there is no history_visibility, it is assumed to be 'shared'.
         // http://matrix.org/docs/spec/r0.0.0/client_server.html#id31
-        var historyVisibility = this.state.history_visibility || "shared";
+        const historyVisibility = this.state.history_visibility || "shared";
 
-        var addressWarning;
-        var aliasEvents = this.props.room.currentState.getStateEvents('m.room.aliases') || [];
-        var aliasCount = 0;
+        let addressWarning;
+        const aliasEvents = this.props.room.currentState.getStateEvents('m.room.aliases') || [];
+        let aliasCount = 0;
         aliasEvents.forEach((event) => {
             aliasCount += event.getContent().aliases.length;
         });
@@ -800,16 +795,16 @@ module.exports = React.createClass({
                         { _tJsx(
                             'To link to a room it must have <a>an address</a>.',
                             /<a>(.*?)<\/a>/,
-                            (sub) => <a href="#addresses">{sub}</a>
-                        )}
+                            (sub) => <a href="#addresses">{ sub }</a>,
+                        ) }
                 </div>;
         }
 
-        var inviteGuestWarning;
+        let inviteGuestWarning;
         if (this.state.join_rule !== "public" && this.state.guest_access === "forbidden") {
             inviteGuestWarning =
                 <div className="mx_RoomSettings_warning">
-                    { _t('Guests cannot join this room even if explicitly invited.') } <a href="#" onClick={ (e) => {
+                    { _t('Guests cannot join this room even if explicitly invited.') } <a href="#" onClick={(e) => {
                         this.setState({ join_rule: "invite", guest_access: "can_join" });
                         e.preventDefault();
                     }}>{ _t('Click here to fix') }</a>.
@@ -829,61 +824,61 @@ module.exports = React.createClass({
                         { inviteGuestWarning }
                         <label>
                             <input type="radio" name="roomVis" value="invite_only"
-                                disabled={ !this.mayChangeRoomAccess() }
+                                disabled={!this.mayChangeRoomAccess()}
                                 onChange={this._onRoomAccessRadioToggle}
-                                checked={this.state.join_rule !== "public"}/>
+                                checked={this.state.join_rule !== "public"} />
                             { _t('Only people who have been invited') }
                         </label>
                         <label>
                             <input type="radio" name="roomVis" value="public_no_guests"
-                                disabled={ !this.mayChangeRoomAccess() }
+                                disabled={!this.mayChangeRoomAccess()}
                                 onChange={this._onRoomAccessRadioToggle}
-                                checked={this.state.join_rule === "public" && this.state.guest_access !== "can_join"}/>
+                                checked={this.state.join_rule === "public" && this.state.guest_access !== "can_join"} />
                             { _t('Anyone who knows the room\'s link, apart from guests') }
                         </label>
                         <label>
                             <input type="radio" name="roomVis" value="public_with_guests"
-                                disabled={ !this.mayChangeRoomAccess() }
+                                disabled={!this.mayChangeRoomAccess()}
                                 onChange={this._onRoomAccessRadioToggle}
-                                checked={this.state.join_rule === "public" && this.state.guest_access === "can_join"}/>
+                                checked={this.state.join_rule === "public" && this.state.guest_access === "can_join"} />
                             { _t('Anyone who knows the room\'s link, including guests') }
                         </label>
                         { addressWarning }
-                        <br/>
+                        <br />
                         { this._renderEncryptionSection() }
                         <label>
-                            <input type="checkbox" disabled={ !roomState.mayClientSendStateEvent("m.room.aliases", cli) }
-                                   onChange={ this._onToggle.bind(this, "isRoomPublished", true, false)}
-                                   checked={this.state.isRoomPublished}/>
-                            {_t("Publish this room to the public in %(domain)s's room directory?", { domain: MatrixClientPeg.get().getDomain() })}
+                            <input type="checkbox" disabled={!roomState.mayClientSendStateEvent("m.room.aliases", cli)}
+                                   onChange={this._onToggle.bind(this, "isRoomPublished", true, false)}
+                                   checked={this.state.isRoomPublished} />
+                            { _t("Publish this room to the public in %(domain)s's room directory?", { domain: MatrixClientPeg.get().getDomain() }) }
                         </label>
                     </div>
                     <div className="mx_RoomSettings_settings">
                         <h3>{ _t('Who can read history?') }</h3>
                         <label>
                             <input type="radio" name="historyVis" value="world_readable"
-                                    disabled={ !roomState.mayClientSendStateEvent("m.room.history_visibility", cli) }
+                                    disabled={!roomState.mayClientSendStateEvent("m.room.history_visibility", cli)}
                                     checked={historyVisibility === "world_readable"}
                                     onChange={this._onHistoryRadioToggle} />
-                            {_t("Anyone")}
+                            { _t("Anyone") }
                         </label>
                         <label>
                             <input type="radio" name="historyVis" value="shared"
-                                    disabled={ !roomState.mayClientSendStateEvent("m.room.history_visibility", cli) }
+                                    disabled={!roomState.mayClientSendStateEvent("m.room.history_visibility", cli)}
                                     checked={historyVisibility === "shared"}
                                     onChange={this._onHistoryRadioToggle} />
                             { _t('Members only') } ({ _t('since the point in time of selecting this option') })
                         </label>
                         <label>
                             <input type="radio" name="historyVis" value="invited"
-                                    disabled={ !roomState.mayClientSendStateEvent("m.room.history_visibility", cli) }
+                                    disabled={!roomState.mayClientSendStateEvent("m.room.history_visibility", cli)}
                                     checked={historyVisibility === "invited"}
                                     onChange={this._onHistoryRadioToggle} />
                             { _t('Members only') } ({ _t('since they were invited') })
                         </label>
                         <label >
                             <input type="radio" name="historyVis" value="joined"
-                                    disabled={ !roomState.mayClientSendStateEvent("m.room.history_visibility", cli) }
+                                    disabled={!roomState.mayClientSendStateEvent("m.room.history_visibility", cli)}
                                     checked={historyVisibility === "joined"}
                                     onChange={this._onHistoryRadioToggle} />
                             { _t('Members only') } ({ _t('since they joined') })
@@ -897,11 +892,11 @@ module.exports = React.createClass({
                     <ColorSettings ref="color_settings" room={this.props.room} />
                 </div>
 
-                <a id="addresses"/>
+                <a id="addresses" />
 
                 <AliasSettings ref="alias_settings"
                     roomId={this.props.room.roomId}
-                    canSetCanonicalAlias={ roomState.mayClientSendStateEvent("m.room.canonical_alias", cli) }
+                    canSetCanonicalAlias={roomState.mayClientSendStateEvent("m.room.canonical_alias", cli)}
                     canSetAliases={
                         true
                         /* Originally, we arbitrarily restricted creating aliases to room admins: roomState.mayClientSendStateEvent("m.room.aliases", cli) */
@@ -917,45 +912,45 @@ module.exports = React.createClass({
                 <div className="mx_RoomSettings_powerLevels mx_RoomSettings_settings">
                     <div className="mx_RoomSettings_powerLevel">
                         <span className="mx_RoomSettings_powerLevelKey">{ _t('The default role for new room members is') } </span>
-                        <PowerSelector ref="users_default" value={default_user_level} controlled={false} disabled={!can_change_levels || current_user_level < default_user_level} onChange={this.onPowerLevelsChanged}/>
+                        <PowerSelector ref="users_default" value={default_user_level} controlled={false} disabled={!can_change_levels || current_user_level < default_user_level} onChange={this.onPowerLevelsChanged} />
                     </div>
                     <div className="mx_RoomSettings_powerLevel">
                         <span className="mx_RoomSettings_powerLevelKey">{ _t('To send messages, you must be a') } </span>
-                        <PowerSelector ref="events_default" value={send_level} controlled={false} disabled={!can_change_levels || current_user_level < send_level} onChange={this.onPowerLevelsChanged}/>
+                        <PowerSelector ref="events_default" value={send_level} controlled={false} disabled={!can_change_levels || current_user_level < send_level} onChange={this.onPowerLevelsChanged} />
                     </div>
                     <div className="mx_RoomSettings_powerLevel">
                         <span className="mx_RoomSettings_powerLevelKey">{ _t('To invite users into the room, you must be a') } </span>
-                        <PowerSelector ref="invite" value={invite_level} controlled={false} disabled={!can_change_levels || current_user_level < invite_level} onChange={this.onPowerLevelsChanged}/>
+                        <PowerSelector ref="invite" value={invite_level} controlled={false} disabled={!can_change_levels || current_user_level < invite_level} onChange={this.onPowerLevelsChanged} />
                     </div>
                     <div className="mx_RoomSettings_powerLevel">
                         <span className="mx_RoomSettings_powerLevelKey">{ _t('To configure the room, you must be a') } </span>
-                        <PowerSelector ref="state_default" value={state_level} controlled={false} disabled={!can_change_levels || current_user_level < state_level} onChange={this.onPowerLevelsChanged}/>
+                        <PowerSelector ref="state_default" value={state_level} controlled={false} disabled={!can_change_levels || current_user_level < state_level} onChange={this.onPowerLevelsChanged} />
                     </div>
                     <div className="mx_RoomSettings_powerLevel">
                         <span className="mx_RoomSettings_powerLevelKey">{ _t('To kick users, you must be a') } </span>
-                        <PowerSelector ref="kick" value={kick_level} controlled={false} disabled={!can_change_levels || current_user_level < kick_level} onChange={this.onPowerLevelsChanged}/>
+                        <PowerSelector ref="kick" value={kick_level} controlled={false} disabled={!can_change_levels || current_user_level < kick_level} onChange={this.onPowerLevelsChanged} />
                     </div>
                     <div className="mx_RoomSettings_powerLevel">
                         <span className="mx_RoomSettings_powerLevelKey">{ _t('To ban users, you must be a') } </span>
-                        <PowerSelector ref="ban" value={ban_level} controlled={false} disabled={!can_change_levels || current_user_level < ban_level} onChange={this.onPowerLevelsChanged}/>
+                        <PowerSelector ref="ban" value={ban_level} controlled={false} disabled={!can_change_levels || current_user_level < ban_level} onChange={this.onPowerLevelsChanged} />
                     </div>
                     <div className="mx_RoomSettings_powerLevel">
                         <span className="mx_RoomSettings_powerLevelKey">{ _t('To remove other users\' messages, you must be a') } </span>
-                        <PowerSelector ref="redact" value={redact_level} controlled={false} disabled={!can_change_levels || current_user_level < redact_level} onChange={this.onPowerLevelsChanged}/>
+                        <PowerSelector ref="redact" value={redact_level} controlled={false} disabled={!can_change_levels || current_user_level < redact_level} onChange={this.onPowerLevelsChanged} />
                     </div>
 
-                    {Object.keys(events_levels).map(function(event_type, i) {
+                    { Object.keys(events_levels).map(function(event_type, i) {
                         let label = plEventsToLabels[event_type];
                         if (label) label = _t(label);
                         else label = _tJsx("To send events of type <eventType/>, you must be a", /<eventType\/>/, () => <code>{ event_type }</code>);
                         return (
                             <div className="mx_RoomSettings_powerLevel" key={event_type}>
                                 <span className="mx_RoomSettings_powerLevelKey">{ label } </span>
-                                <PowerSelector ref={"event_levels_"+event_type} value={ events_levels[event_type] } onChange={self.onPowerLevelsChanged}
+                                <PowerSelector ref={"event_levels_"+event_type} value={events_levels[event_type]} onChange={self.onPowerLevelsChanged}
                                                controlled={false} disabled={!can_change_levels || current_user_level < events_levels[event_type]} />
                             </div>
                         );
-                    })}
+                    }) }
 
                 { unfederatableSection }
                 </div>
@@ -970,5 +965,5 @@ module.exports = React.createClass({
                 </div>
             </div>
         );
-    }
+    },
 });
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index a6065d8e92..90a763b6f1 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -17,17 +17,17 @@ limitations under the License.
 
 'use strict';
 
-var React = require('react');
-var ReactDOM = require("react-dom");
-var classNames = require('classnames');
-var MatrixClientPeg = require('../../../MatrixClientPeg');
+const React = require('react');
+const ReactDOM = require("react-dom");
+const classNames = require('classnames');
+const MatrixClientPeg = require('../../../MatrixClientPeg');
 import DMRoomMap from '../../../utils/DMRoomMap';
-var sdk = require('../../../index');
-var ContextualMenu = require('../../structures/ContextualMenu');
-var RoomNotifs = require('../../../RoomNotifs');
-var FormattingUtils = require('../../../utils/FormattingUtils');
+const sdk = require('../../../index');
+const ContextualMenu = require('../../structures/ContextualMenu');
+const RoomNotifs = require('../../../RoomNotifs');
+const FormattingUtils = require('../../../utils/FormattingUtils');
 import AccessibleButton from '../elements/AccessibleButton';
-var UserSettingsStore = require('../../../UserSettingsStore');
+const UserSettingsStore = require('../../../UserSettingsStore');
 import ActiveRoomObserver from '../../../ActiveRoomObserver';
 import RoomViewStore from '../../../stores/RoomViewStore';
 
@@ -56,8 +56,8 @@ module.exports = React.createClass({
 
     getInitialState: function() {
         return({
-            hover : false,
-            badgeHover : false,
+            hover: false,
+            badgeHover: false,
             menuDisplayed: false,
             notifState: RoomNotifs.getRoomNotifsState(this.props.room.roomId),
             selected: this.props.room.roomId === RoomViewStore.getRoomId(),
@@ -74,7 +74,7 @@ module.exports = React.createClass({
     },
 
     _isDirectMessageRoom: function(roomId) {
-        var dmRooms = DMRoomMap.shared().getUserIdForRoomId(roomId);
+        const dmRooms = DMRoomMap.shared().getUserIdForRoomId(roomId);
         if (dmRooms) {
             return true;
         } else {
@@ -102,7 +102,7 @@ module.exports = React.createClass({
     },
 
     componentWillUnmount: function() {
-        var cli = MatrixClientPeg.get();
+        const cli = MatrixClientPeg.get();
         if (cli) {
             MatrixClientPeg.get().removeListener("accountData", this.onAccountData);
         }
@@ -116,12 +116,12 @@ module.exports = React.createClass({
     },
 
     onMouseEnter: function() {
-        this.setState( { hover : true });
+        this.setState( { hover: true });
         this.badgeOnMouseEnter();
     },
 
     onMouseLeave: function() {
-        this.setState( { hover : false });
+        this.setState( { hover: false });
         this.badgeOnMouseLeave();
     },
 
@@ -129,25 +129,24 @@ module.exports = React.createClass({
         // Only allow non-guests to access the context menu
         // and only change it if it needs to change
         if (!MatrixClientPeg.get().isGuest() && !this.state.badgeHover) {
-            this.setState( { badgeHover : true } );
+            this.setState( { badgeHover: true } );
         }
     },
 
     badgeOnMouseLeave: function() {
-        this.setState( { badgeHover : false } );
+        this.setState( { badgeHover: false } );
     },
 
     onBadgeClicked: function(e) {
         // Only allow none guests to access the context menu
         if (!MatrixClientPeg.get().isGuest()) {
-
             // If the badge is clicked, then no longer show tooltip
             if (this.props.collapsed) {
                 this.setState({ hover: false });
             }
 
-            var RoomTileContextMenu = sdk.getComponent('context_menus.RoomTileContextMenu');
-            var elementRect = e.target.getBoundingClientRect();
+            const RoomTileContextMenu = sdk.getComponent('context_menus.RoomTileContextMenu');
+            const elementRect = e.target.getBoundingClientRect();
 
             // The window X and Y offsets are to adjust position when zoomed in to page
             const x = elementRect.right + window.pageXOffset + 3;
@@ -155,7 +154,7 @@ module.exports = React.createClass({
             let y = (elementRect.top + (elementRect.height / 2) + window.pageYOffset);
             y = y - (chevronOffset + 8); // where 8 is half the height of the chevron
 
-            var self = this;
+            const self = this;
             ContextualMenu.createMenu(RoomTileContextMenu, {
                 chevronOffset: chevronOffset,
                 left: x,
@@ -164,7 +163,7 @@ module.exports = React.createClass({
                 onFinished: function() {
                     self.setState({ menuDisplayed: false });
                     self.props.refreshSubList();
-                }
+                },
             });
             this.setState({ menuDisplayed: true });
         }
@@ -173,17 +172,17 @@ module.exports = React.createClass({
     },
 
     render: function() {
-        var myUserId = MatrixClientPeg.get().credentials.userId;
-        var me = this.props.room.currentState.members[myUserId];
+        const myUserId = MatrixClientPeg.get().credentials.userId;
+        const me = this.props.room.currentState.members[myUserId];
 
-        var notificationCount = this.props.room.getUnreadNotificationCount();
+        const notificationCount = this.props.room.getUnreadNotificationCount();
         // var highlightCount = this.props.room.getUnreadNotificationCount("highlight");
 
         const notifBadges = notificationCount > 0 && this._shouldShowNotifBadge();
         const mentionBadges = this.props.highlight && this._shouldShowMentionBadge();
         const badges = notifBadges || mentionBadges;
 
-        var classes = classNames({
+        const classes = classNames({
             'mx_RoomTile': true,
             'mx_RoomTile_selected': this.state.selected,
             'mx_RoomTile_unread': this.props.unread,
@@ -194,53 +193,53 @@ module.exports = React.createClass({
             'mx_RoomTile_noBadges': !badges,
         });
 
-        var avatarClasses = classNames({
+        const avatarClasses = classNames({
             'mx_RoomTile_avatar': true,
         });
 
-        var badgeClasses = classNames({
+        const badgeClasses = classNames({
             'mx_RoomTile_badge': true,
             'mx_RoomTile_badgeButton': this.state.badgeHover || this.state.menuDisplayed,
         });
 
         // XXX: We should never display raw room IDs, but sometimes the
         // room name js sdk gives is undefined (cannot repro this -- k)
-        var name = this.props.room.name || this.props.room.roomId;
+        let name = this.props.room.name || this.props.room.roomId;
         name = name.replace(":", ":\u200b"); // add a zero-width space to allow linewrapping after the colon
 
-        var badge;
-        var badgeContent;
+        let badge;
+        let badgeContent;
 
         if (this.state.badgeHover || this.state.menuDisplayed) {
             badgeContent = "\u00B7\u00B7\u00B7";
         } else if (badges) {
-            var limitedCount = FormattingUtils.formatCount(notificationCount);
+            const limitedCount = FormattingUtils.formatCount(notificationCount);
             badgeContent = notificationCount ? limitedCount : '!';
         } else {
             badgeContent = '\u200B';
         }
 
-        badge = <div className={ badgeClasses } onClick={this.onBadgeClicked}>{ badgeContent }</div>;
+        badge = <div className={badgeClasses} onClick={this.onBadgeClicked}>{ badgeContent }</div>;
 
         const EmojiText = sdk.getComponent('elements.EmojiText');
-        var label;
-        var tooltip;
+        let label;
+        let tooltip;
         if (!this.props.collapsed) {
-            var nameClasses = classNames({
+            const nameClasses = classNames({
                 'mx_RoomTile_name': true,
                 'mx_RoomTile_invite': this.props.isInvite,
                 'mx_RoomTile_badgeShown': badges || this.state.badgeHover || this.state.menuDisplayed,
             });
 
             if (this.state.selected) {
-                let nameSelected = <EmojiText>{name}</EmojiText>;
+                const nameSelected = <EmojiText>{ name }</EmojiText>;
 
-                label = <div title={ name } className={ nameClasses } dir="auto">{ nameSelected }</div>;
+                label = <div title={name} className={nameClasses} dir="auto">{ nameSelected }</div>;
             } else {
-                label = <EmojiText element="div" title={ name } className={ nameClasses } dir="auto">{name}</EmojiText>;
+                label = <EmojiText element="div" title={name} className={nameClasses} dir="auto">{ name }</EmojiText>;
             }
         } else if (this.state.hover) {
-            var RoomTooltip = sdk.getComponent("rooms.RoomTooltip");
+            const RoomTooltip = sdk.getComponent("rooms.RoomTooltip");
             tooltip = <RoomTooltip className="mx_RoomTile_tooltip" room={this.props.room} dir="auto" />;
         }
 
@@ -250,34 +249,34 @@ module.exports = React.createClass({
         //    incomingCallBox = <IncomingCallBox incomingCall={ this.props.incomingCall }/>;
         //}
 
-        var RoomAvatar = sdk.getComponent('avatars.RoomAvatar');
+        const RoomAvatar = sdk.getComponent('avatars.RoomAvatar');
 
-        var directMessageIndicator;
+        let directMessageIndicator;
         if (this._isDirectMessageRoom(this.props.room.roomId)) {
-         directMessageIndicator = <img src="img/icon_person.svg" className="mx_RoomTile_dm" width="11" height="13" alt="dm"/>;
+         directMessageIndicator = <img src="img/icon_person.svg" className="mx_RoomTile_dm" width="11" height="13" alt="dm" />;
         }
 
         // These props are injected by React DnD,
         // as defined by your `collect` function above:
-        var isDragging = this.props.isDragging;
-        var connectDragSource = this.props.connectDragSource;
-        var connectDropTarget = this.props.connectDropTarget;
+        const isDragging = this.props.isDragging;
+        const connectDragSource = this.props.connectDragSource;
+        const connectDropTarget = this.props.connectDropTarget;
 
 
         let ret = (
-            <div> { /* Only native elements can be wrapped in a DnD object. */}
+            <div> { /* Only native elements can be wrapped in a DnD object. */ }
             <AccessibleButton className={classes} tabIndex="0" onClick={this.onClick} onMouseEnter={this.onMouseEnter} onMouseLeave={this.onMouseLeave}>
                 <div className={avatarClasses}>
                     <div className="mx_RoomTile_avatar_container">
                         <RoomAvatar room={this.props.room} width={24} height={24} />
-                        {directMessageIndicator}
+                        { directMessageIndicator }
                     </div>
                 </div>
                 <div className="mx_RoomTile_nameContainer">
                     { label }
                     { badge }
                 </div>
-                {/* { incomingCallBox } */}
+                { /* { incomingCallBox } */ }
                 { tooltip }
             </AccessibleButton>
             </div>
@@ -287,5 +286,5 @@ module.exports = React.createClass({
         if (connectDragSource) ret = connectDragSource(ret);
 
         return ret;
-    }
+    },
 });
diff --git a/src/components/views/rooms/RoomTopicEditor.js b/src/components/views/rooms/RoomTopicEditor.js
index 9305381b6c..320730f341 100644
--- a/src/components/views/rooms/RoomTopicEditor.js
+++ b/src/components/views/rooms/RoomTopicEditor.js
@@ -16,8 +16,8 @@ limitations under the License.
 
 'use strict';
 
-var React = require('react');
-var sdk = require('../../../index');
+const React = require('react');
+const sdk = require('../../../index');
 import { _t } from "../../../languageHandler";
 
 module.exports = React.createClass({
@@ -28,8 +28,8 @@ module.exports = React.createClass({
     },
 
     componentWillMount: function() {
-        var room = this.props.room;
-        var topic = room.currentState.getStateEvents('m.room.topic', '');
+        const room = this.props.room;
+        const topic = room.currentState.getStateEvents('m.room.topic', '');
         this._initialTopic = topic ? topic.getContent().topic : '';
     },
 
@@ -38,15 +38,15 @@ module.exports = React.createClass({
     },
 
     render: function() {
-        var EditableText = sdk.getComponent("elements.EditableText");
+        const EditableText = sdk.getComponent("elements.EditableText");
 
         return (
                 <EditableText ref="editor"
                      className="mx_RoomHeader_topic mx_RoomHeader_editable"
                      placeholderClassName="mx_RoomHeader_placeholder"
                      placeholder={_t("Add a topic")}
-                     blurToCancel={ false }
-                     initialValue={ this._initialTopic }
+                     blurToCancel={false}
+                     initialValue={this._initialTopic}
                      dir="auto" />
         );
     },
diff --git a/src/components/views/rooms/SearchResultTile.js b/src/components/views/rooms/SearchResultTile.js
index 1aba7c9196..1c5cc175ae 100644
--- a/src/components/views/rooms/SearchResultTile.js
+++ b/src/components/views/rooms/SearchResultTile.js
@@ -16,8 +16,8 @@ limitations under the License.
 
 'use strict';
 
-var React = require('react');
-var sdk = require('../../../index');
+const React = require('react');
+const sdk = require('../../../index');
 
 module.exports = React.createClass({
     displayName: 'SearchResult',
@@ -36,20 +36,20 @@ module.exports = React.createClass({
     },
 
     render: function() {
-        var DateSeparator = sdk.getComponent('messages.DateSeparator');
-        var EventTile = sdk.getComponent('rooms.EventTile');
-        var result = this.props.searchResult;
-        var mxEv = result.context.getEvent();
-        var eventId = mxEv.getId();
+        const DateSeparator = sdk.getComponent('messages.DateSeparator');
+        const EventTile = sdk.getComponent('rooms.EventTile');
+        const result = this.props.searchResult;
+        const mxEv = result.context.getEvent();
+        const eventId = mxEv.getId();
 
-        var ts1 = mxEv.getTs();
-        var ret = [<DateSeparator key={ts1 + "-search"} ts={ts1}/>];
+        const ts1 = mxEv.getTs();
+        const ret = [<DateSeparator key={ts1 + "-search"} ts={ts1} />];
 
-        var timeline = result.context.getTimeline();
+        const timeline = result.context.getTimeline();
         for (var j = 0; j < timeline.length; j++) {
-            var ev = timeline[j];
+            const ev = timeline[j];
             var highlights;
-            var contextual = (j != result.context.getOurEventIndex());
+            const contextual = (j != result.context.getOurEventIndex());
             if (!contextual) {
                 highlights = this.props.searchHighlights;
             }
@@ -61,7 +61,7 @@ module.exports = React.createClass({
         }
         return (
             <li data-scroll-tokens={eventId+"+"+j}>
-                {ret}
+                { ret }
             </li>);
     },
 });
diff --git a/src/components/views/rooms/SearchableEntityList.js b/src/components/views/rooms/SearchableEntityList.js
index 45ad2c6b9e..c71acdb454 100644
--- a/src/components/views/rooms/SearchableEntityList.js
+++ b/src/components/views/rooms/SearchableEntityList.js
@@ -13,16 +13,16 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-var React = require('react');
-var MatrixClientPeg = require("../../../MatrixClientPeg");
-var Modal = require("../../../Modal");
-var sdk = require("../../../index");
+const React = require('react');
+const MatrixClientPeg = require("../../../MatrixClientPeg");
+const Modal = require("../../../Modal");
+const sdk = require("../../../index");
 import { _t } from '../../../languageHandler';
-var GeminiScrollbar = require('react-gemini-scrollbar');
+const GeminiScrollbar = require('react-gemini-scrollbar');
 
 // A list capable of displaying entities which conform to the SearchableEntity
 // interface which is an object containing getJsx(): Jsx and matches(query: string): boolean
-var SearchableEntityList = React.createClass({
+const SearchableEntityList = React.createClass({
     displayName: 'SearchableEntityList',
 
     propTypes: {
@@ -31,7 +31,7 @@ var SearchableEntityList = React.createClass({
         onQueryChanged: React.PropTypes.func, // fn(inputText)
         onSubmit: React.PropTypes.func, // fn(inputText)
         entities: React.PropTypes.array,
-        truncateAt: React.PropTypes.number
+        truncateAt: React.PropTypes.number,
     },
 
     getDefaultProps: function() {
@@ -40,7 +40,7 @@ var SearchableEntityList = React.createClass({
             entities: [],
             emptyQueryShowsAll: false,
             onSubmit: function() {},
-            onQueryChanged: function(input) {}
+            onQueryChanged: function(input) {},
         };
     },
 
@@ -49,14 +49,14 @@ var SearchableEntityList = React.createClass({
             query: "",
             focused: false,
             truncateAt: this.props.truncateAt,
-            results: this.getSearchResults("", this.props.entities)
+            results: this.getSearchResults("", this.props.entities),
         };
     },
 
     componentWillReceiveProps: function(newProps) {
         // recalculate the search results in case we got new entities
         this.setState({
-            results: this.getSearchResults(this.state.query, newProps.entities)
+            results: this.getSearchResults(this.state.query, newProps.entities),
         });
     },
 
@@ -73,17 +73,17 @@ var SearchableEntityList = React.createClass({
     setQuery: function(input) {
         this.setState({
             query: input,
-            results: this.getSearchResults(input, this.props.entities)
+            results: this.getSearchResults(input, this.props.entities),
         });
     },
 
     onQueryChanged: function(ev) {
-        var q = ev.target.value;
+        const q = ev.target.value;
         this.setState({
             query: q,
             // reset truncation if they back out the entire text
             truncateAt: (q.length === 0 ? this.props.truncateAt : this.state.truncateAt),
-            results: this.getSearchResults(q, this.props.entities)
+            results: this.getSearchResults(q, this.props.entities),
         }, () => {
             // invoke the callback AFTER we've flushed the new state. We need to
             // do this because onQueryChanged can result in new props being passed
@@ -110,13 +110,13 @@ var SearchableEntityList = React.createClass({
 
     _showAll: function() {
         this.setState({
-            truncateAt: -1
+            truncateAt: -1,
         });
     },
 
     _createOverflowEntity: function(overflowCount, totalCount) {
-        var EntityTile = sdk.getComponent("rooms.EntityTile");
-        var BaseAvatar = sdk.getComponent("avatars.BaseAvatar");
+        const EntityTile = sdk.getComponent("rooms.EntityTile");
+        const BaseAvatar = sdk.getComponent("avatars.BaseAvatar");
         const text = _t("and %(count)s others...", { count: overflowCount });
         return (
             <EntityTile className="mx_EntityTile_ellipsis" avatarJsx={
@@ -127,7 +127,7 @@ var SearchableEntityList = React.createClass({
     },
 
     render: function() {
-        var inputBox;
+        let inputBox;
 
         if (this.props.showInputBox) {
             inputBox = (
@@ -136,31 +136,30 @@ var SearchableEntityList = React.createClass({
                         onChange={this.onQueryChanged} value={this.state.query}
                         onFocus= {() => { this.setState({ focused: true }); }}
                         onBlur= {() => { this.setState({ focused: false }); }}
-                        placeholder={ _t("Search") } />
+                        placeholder={_t("Search")} />
                 </form>
             );
         }
 
-        var list;
+        let list;
         if (this.state.results.length > 1 || this.state.focused) {
             if (this.props.truncateAt) { // caller wants list truncated
-                var TruncatedList = sdk.getComponent("elements.TruncatedList");
+                const TruncatedList = sdk.getComponent("elements.TruncatedList");
                 list = (
                     <TruncatedList className="mx_SearchableEntityList_list"
                             truncateAt={this.state.truncateAt} // use state truncation as it may be expanded
                             createOverflowElement={this._createOverflowEntity}>
-                        {this.state.results.map((entity) => {
+                        { this.state.results.map((entity) => {
                             return entity.getJsx();
-                        })}
+                        }) }
                     </TruncatedList>
                 );
-            }
-            else {
+            } else {
                 list = (
                     <div className="mx_SearchableEntityList_list">
-                        {this.state.results.map((entity) => {
+                        { this.state.results.map((entity) => {
                             return entity.getJsx();
-                        })}
+                        }) }
                     </div>
                 );
             }
@@ -173,13 +172,13 @@ var SearchableEntityList = React.createClass({
         }
 
         return (
-            <div className={ "mx_SearchableEntityList " + (list ? "mx_SearchableEntityList_expanded" : "") }>
+            <div className={"mx_SearchableEntityList " + (list ? "mx_SearchableEntityList_expanded" : "")}>
                 { inputBox }
                 { list }
-                { list ? <div className="mx_SearchableEntityList_hrWrapper"><hr/></div> : '' }
+                { list ? <div className="mx_SearchableEntityList_hrWrapper"><hr /></div> : '' }
             </div>
         );
-    }
+    },
 });
 
  module.exports = SearchableEntityList;
diff --git a/src/components/views/rooms/TopUnreadMessagesBar.js b/src/components/views/rooms/TopUnreadMessagesBar.js
index aa1f86483e..c32777abad 100644
--- a/src/components/views/rooms/TopUnreadMessagesBar.js
+++ b/src/components/views/rooms/TopUnreadMessagesBar.js
@@ -17,9 +17,9 @@ limitations under the License.
 
 'use strict';
 
-var React = require('react');
+const React = require('react');
 import { _t } from '../../../languageHandler';
-var sdk = require('../../../index');
+const sdk = require('../../../index');
 
 module.exports = React.createClass({
     displayName: 'TopUnreadMessagesBar',
@@ -35,8 +35,8 @@ module.exports = React.createClass({
                 <div className="mx_TopUnreadMessagesBar_scrollUp"
                         onClick={this.props.onScrollUpClick}>
                     <img src="img/scrollto.svg" width="24" height="24"
-                        alt={ _t('Scroll to unread messages') }
-                        title={ _t('Scroll to unread messages') }/>
+                        alt={_t('Scroll to unread messages')}
+                        title={_t('Scroll to unread messages')} />
                     { _t("Jump to first unread message.") }
                 </div>
                 <img className="mx_TopUnreadMessagesBar_close mx_filterFlipColor"
diff --git a/src/components/views/rooms/UserTile.js b/src/components/views/rooms/UserTile.js
index 66d736f3bb..0acc71cf48 100644
--- a/src/components/views/rooms/UserTile.js
+++ b/src/components/views/rooms/UserTile.js
@@ -16,41 +16,41 @@ limitations under the License.
 
 'use strict';
 
-var React = require('react');
+const React = require('react');
 
-var Avatar = require("../../../Avatar");
-var MatrixClientPeg = require('../../../MatrixClientPeg');
-var sdk = require('../../../index');
-var dis = require('../../../dispatcher');
-var Modal = require("../../../Modal");
+const Avatar = require("../../../Avatar");
+const MatrixClientPeg = require('../../../MatrixClientPeg');
+const sdk = require('../../../index');
+const dis = require('../../../dispatcher');
+const Modal = require("../../../Modal");
 
 module.exports = React.createClass({
     displayName: 'UserTile',
 
     propTypes: {
-        user: React.PropTypes.any.isRequired // User
+        user: React.PropTypes.any.isRequired, // User
     },
 
     render: function() {
-        var EntityTile = sdk.getComponent("rooms.EntityTile");
-        var user = this.props.user;
-        var name = user.displayName || user.userId;
-        var active = -1;
+        const EntityTile = sdk.getComponent("rooms.EntityTile");
+        const user = this.props.user;
+        const name = user.displayName || user.userId;
+        let active = -1;
 
         // FIXME: make presence data update whenever User.presence changes...
         active = user.lastActiveAgo ?
             (Date.now() - (user.lastPresenceTs - user.lastActiveAgo)) : -1;
 
-        var BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
-        var avatarJsx = (
+        const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
+        const avatarJsx = (
             <BaseAvatar width={36} height={36} name={name} idName={user.userId}
-                        url={ Avatar.avatarUrlForUser(user, 36, 36, "crop") } />
+                        url={Avatar.avatarUrlForUser(user, 36, 36, "crop")} />
         );
 
         return (
             <EntityTile {...this.props} presenceState={user.presence} presenceActiveAgo={active}
-                presenceCurrentlyActive={ user.currentlyActive }
+                presenceCurrentlyActive={user.currentlyActive}
                 name={name} title={user.userId} avatarJsx={avatarJsx} />
         );
-    }
+    },
 });
diff --git a/src/components/views/settings/AddPhoneNumber.js b/src/components/views/settings/AddPhoneNumber.js
index 16e768a23f..10264c0d75 100644
--- a/src/components/views/settings/AddPhoneNumber.js
+++ b/src/components/views/settings/AddPhoneNumber.js
@@ -81,7 +81,7 @@ export default withMatrixClient(React.createClass({
             this._promptForMsisdnVerificationCode(resp.msisdn);
         }).catch((err) => {
             console.error("Unable to add phone number: " + err);
-            let msg = err.message;
+            const msg = err.message;
             Modal.createTrackedDialog('Add Phone Number Error', '', ErrorDialog, {
                 title: _t("Error"),
                 description: msg,
@@ -94,22 +94,22 @@ export default withMatrixClient(React.createClass({
         this.setState({msisdn_add_pending: true});
     },
 
-    _promptForMsisdnVerificationCode:function (msisdn, err) {
+    _promptForMsisdnVerificationCode: function(msisdn, err) {
         if (this._unmounted) return;
         const TextInputDialog = sdk.getComponent("dialogs.TextInputDialog");
-        let msgElements = [
-            <div key="_static" >{ _t("A text message has been sent to +%(msisdn)s. Please enter the verification code it contains", { msisdn: msisdn} ) }</div>
+        const msgElements = [
+            <div key="_static" >{ _t("A text message has been sent to +%(msisdn)s. Please enter the verification code it contains", { msisdn: msisdn} ) }</div>,
         ];
         if (err) {
             let msg = err.error;
             if (err.errcode == 'M_THREEPID_AUTH_FAILED') {
                 msg = _t("Incorrect verification code");
             }
-            msgElements.push(<div key="_error" className="error">{msg}</div>);
+            msgElements.push(<div key="_error" className="error">{ msg }</div>);
         }
         Modal.createTrackedDialog('Prompt for MSISDN Verification Code', '', TextInputDialog, {
             title: _t("Enter Code"),
-            description: <div>{msgElements}</div>,
+            description: <div>{ msgElements }</div>,
             button: _t("Submit"),
             onFinished: (should_verify, token) => {
                 if (!should_verify) {
@@ -128,7 +128,7 @@ export default withMatrixClient(React.createClass({
                     if (this._unmounted) return;
                     this.setState({msisdn_add_pending: false});
                 }).done();
-            }
+            },
         });
     },
 
@@ -146,7 +146,7 @@ export default withMatrixClient(React.createClass({
         return (
             <form className="mx_UserSettings_profileTableRow" onSubmit={this._onAddMsisdnSubmit}>
                 <div className="mx_UserSettings_profileLabelCell">
-                    <label>{_t('Phone')}</label>
+                    <label>{ _t('Phone') }</label>
                 </div>
                 <div className="mx_UserSettings_profileInputCell">
                     <div className="mx_UserSettings_phoneSection">
@@ -158,7 +158,7 @@ export default withMatrixClient(React.createClass({
                         <input type="text"
                             ref={this._collectAddMsisdnInput}
                             className="mx_UserSettings_phoneNumberField"
-                            placeholder={ _t('Add phone number') }
+                            placeholder={_t('Add phone number')}
                             value={this.state.phoneNumber}
                             onChange={this._onPhoneNumberChange}
                         />
@@ -169,5 +169,5 @@ export default withMatrixClient(React.createClass({
                 </div>
             </form>
         );
-    }
-}))
+    },
+}));
diff --git a/src/components/views/settings/ChangeAvatar.js b/src/components/views/settings/ChangeAvatar.js
index ae6f1957b8..b3204ab86e 100644
--- a/src/components/views/settings/ChangeAvatar.js
+++ b/src/components/views/settings/ChangeAvatar.js
@@ -14,9 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-var React = require('react');
-var MatrixClientPeg = require("../../../MatrixClientPeg");
-var sdk = require('../../../index');
+const React = require('react');
+const MatrixClientPeg = require("../../../MatrixClientPeg");
+const sdk = require('../../../index');
 import { _t } from '../../../languageHandler';
 
 module.exports = React.createClass({
@@ -28,7 +28,7 @@ module.exports = React.createClass({
         showUploadSection: React.PropTypes.bool,
         width: React.PropTypes.number,
         height: React.PropTypes.number,
-        className: React.PropTypes.string
+        className: React.PropTypes.string,
     },
 
     Phases: {
@@ -59,25 +59,25 @@ module.exports = React.createClass({
             return;
         }
         this.setState({
-            avatarUrl: newProps.initialAvatarUrl
+            avatarUrl: newProps.initialAvatarUrl,
         });
     },
 
     setAvatarFromFile: function(file) {
-        var newUrl = null;
+        let newUrl = null;
 
         this.setState({
-            phase: this.Phases.Uploading
+            phase: this.Phases.Uploading,
         });
-        var self = this;
-        var httpPromise = MatrixClientPeg.get().uploadContent(file).then(function(url) {
+        const self = this;
+        const httpPromise = MatrixClientPeg.get().uploadContent(file).then(function(url) {
             newUrl = url;
             if (self.props.room) {
                 return MatrixClientPeg.get().sendStateEvent(
                     self.props.room.roomId,
                     'm.room.avatar',
                     {url: url},
-                    ''
+                    '',
                 );
             } else {
                 return MatrixClientPeg.get().setAvatarUrl(url);
@@ -87,11 +87,11 @@ module.exports = React.createClass({
         httpPromise.done(function() {
             self.setState({
                 phase: self.Phases.Display,
-                avatarUrl: MatrixClientPeg.get().mxcUrlToHttp(newUrl)
+                avatarUrl: MatrixClientPeg.get().mxcUrlToHttp(newUrl),
             });
         }, function(error) {
             self.setState({
-                phase: self.Phases.Error
+                phase: self.Phases.Error,
             });
             self.onError(error);
         });
@@ -106,31 +106,31 @@ module.exports = React.createClass({
 
     onError: function(error) {
         this.setState({
-            errorText: _t("Failed to upload profile picture!")
+            errorText: _t("Failed to upload profile picture!"),
         });
     },
 
     render: function() {
-        var avatarImg;
+        let avatarImg;
         // Having just set an avatar we just display that since it will take a little
         // time to propagate through to the RoomAvatar.
         if (this.props.room && !this.avatarSet) {
-            var RoomAvatar = sdk.getComponent('avatars.RoomAvatar');
-            avatarImg = <RoomAvatar room={this.props.room} width={ this.props.width } height={ this.props.height } resizeMethod='crop' />;
+            const RoomAvatar = sdk.getComponent('avatars.RoomAvatar');
+            avatarImg = <RoomAvatar room={this.props.room} width={this.props.width} height={this.props.height} resizeMethod='crop' />;
         } else {
-            var BaseAvatar = sdk.getComponent("avatars.BaseAvatar");
+            const BaseAvatar = sdk.getComponent("avatars.BaseAvatar");
             // XXX: FIXME: once we track in the JS what our own displayname is(!) then use it here rather than ?
             avatarImg = <BaseAvatar width={this.props.width} height={this.props.height} resizeMethod='crop'
-                        name='?' idName={ MatrixClientPeg.get().getUserIdLocalpart() } url={this.state.avatarUrl} />;
+                        name='?' idName={MatrixClientPeg.get().getUserIdLocalpart()} url={this.state.avatarUrl} />;
         }
 
-        var uploadSection;
+        let uploadSection;
         if (this.props.showUploadSection) {
             uploadSection = (
                 <div className={this.props.className}>
-                    {_t("Upload new:")}
-                    <input type="file" accept="image/*" onChange={this.onFileSelected}/>
-                    {this.state.errorText}
+                    { _t("Upload new:") }
+                    <input type="file" accept="image/*" onChange={this.onFileSelected} />
+                    { this.state.errorText }
                 </div>
             );
         }
@@ -141,9 +141,9 @@ module.exports = React.createClass({
                 return (
                     <div>
                         <div className={this.props.className}>
-                            {avatarImg}
+                            { avatarImg }
                         </div>
-                        {uploadSection}
+                        { uploadSection }
                     </div>
                 );
             case this.Phases.Uploading:
@@ -152,5 +152,5 @@ module.exports = React.createClass({
                     <Loader />
                 );
         }
-    }
+    },
 });
diff --git a/src/components/views/settings/ChangeDisplayName.js b/src/components/views/settings/ChangeDisplayName.js
index 36865c37b0..a74e223349 100644
--- a/src/components/views/settings/ChangeDisplayName.js
+++ b/src/components/views/settings/ChangeDisplayName.js
@@ -15,23 +15,22 @@ limitations under the License.
 */
 
 'use strict';
-var React = require('react');
-var sdk = require('../../../index');
-var MatrixClientPeg = require("../../../MatrixClientPeg");
+const React = require('react');
+const sdk = require('../../../index');
+const MatrixClientPeg = require("../../../MatrixClientPeg");
 import { _t } from '../../../languageHandler';
 
 module.exports = React.createClass({
     displayName: 'ChangeDisplayName',
 
     _getDisplayName: function() {
-        var cli = MatrixClientPeg.get();
+        const cli = MatrixClientPeg.get();
         return cli.getProfileInfo(cli.credentials.userId).then(function(result) {
-            var displayname = result.displayname;
+            let displayname = result.displayname;
             if (!displayname) {
                 if (MatrixClientPeg.get().isGuest()) {
                     displayname = "Guest " + MatrixClientPeg.get().getUserIdLocalpart();
-                }
-                else {
+                } else {
                     displayname = MatrixClientPeg.get().getUserIdLocalpart();
                 }
             }
@@ -42,14 +41,14 @@ module.exports = React.createClass({
     },
 
     _changeDisplayName: function(new_displayname) {
-        var cli = MatrixClientPeg.get();
+        const cli = MatrixClientPeg.get();
         return cli.setDisplayName(new_displayname).catch(function(e) {
             throw new Error("Failed to set display name");
         });
     },
 
     render: function() {
-        var EditableTextContainer = sdk.getComponent('elements.EditableTextContainer');
+        const EditableTextContainer = sdk.getComponent('elements.EditableTextContainer');
         return (
             <EditableTextContainer
                 getInitialValue={this._getDisplayName}
@@ -57,5 +56,5 @@ module.exports = React.createClass({
                 blurToSubmit={true}
                 onSubmit={this._changeDisplayName} />
         );
-    }
+    },
 });
diff --git a/src/components/views/settings/ChangePassword.js b/src/components/views/settings/ChangePassword.js
index 4fbae4b263..cb49048a3b 100644
--- a/src/components/views/settings/ChangePassword.js
+++ b/src/components/views/settings/ChangePassword.js
@@ -16,10 +16,10 @@ limitations under the License.
 
 'use strict';
 
-var React = require('react');
-var MatrixClientPeg = require("../../../MatrixClientPeg");
-var Modal = require("../../../Modal");
-var sdk = require("../../../index");
+const React = require('react');
+const MatrixClientPeg = require("../../../MatrixClientPeg");
+const Modal = require("../../../Modal");
+const sdk = require("../../../index");
 
 import Promise from 'bluebird';
 import AccessibleButton from '../elements/AccessibleButton';
@@ -45,7 +45,7 @@ module.exports = React.createClass({
     Phases: {
         Edit: "edit",
         Uploading: "uploading",
-        Error: "error"
+        Error: "error",
     },
 
     getDefaultProps: function() {
@@ -55,11 +55,11 @@ module.exports = React.createClass({
             onCheckPassword: function(oldPass, newPass, confirmPass) {
                 if (newPass !== confirmPass) {
                     return {
-                        error: _t("New passwords don't match")
+                        error: _t("New passwords don't match"),
                     };
                 } else if (!newPass || newPass.length === 0) {
                     return {
-                        error: _t("Passwords can't be empty")
+                        error: _t("Passwords can't be empty"),
                     };
                 }
             },
@@ -112,7 +112,7 @@ module.exports = React.createClass({
                         'Changing password will currently reset any end-to-end encryption keys on all devices, ' +
                         'making encrypted chat history unreadable, unless you first export your room keys ' +
                         'and re-import them afterwards. ' +
-                        'In future this will be improved.'
+                        'In future this will be improved.',
                     ) } (<a href="https://github.com/vector-im/riot-web/issues/2671">https://github.com/vector-im/riot-web/issues/2671</a>)
                 </div>,
             button: _t("Continue"),
@@ -120,7 +120,7 @@ module.exports = React.createClass({
                 <button className="mx_Dialog_primary"
                         onClick={this._onExportE2eKeysClicked}>
                     { _t('Export E2E room keys') }
-                </button>
+                </button>,
             ],
             onFinished: (confirmed) => {
                 if (confirmed) {
@@ -254,5 +254,5 @@ module.exports = React.createClass({
                     </div>
                 );
         }
-    }
+    },
 });
diff --git a/src/components/views/settings/DevicesPanel.js b/src/components/views/settings/DevicesPanel.js
index d10f17a40e..1484dd98ba 100644
--- a/src/components/views/settings/DevicesPanel.js
+++ b/src/components/views/settings/DevicesPanel.js
@@ -52,7 +52,7 @@ export default class DevicesPanel extends React.Component {
             },
             (error) => {
                 if (this._unmounted) { return; }
-                var errtxt;
+                let errtxt;
                 if (error.httpStatus == 404) {
                     // 404 probably means the HS doesn't yet support the API.
                     errtxt = _t("Your home server does not support device management.");
@@ -61,7 +61,7 @@ export default class DevicesPanel extends React.Component {
                     errtxt = _t("Unable to load device list");
                 }
                 this.setState({deviceLoadError: errtxt});
-            }
+            },
         );
     }
 
@@ -89,14 +89,14 @@ export default class DevicesPanel extends React.Component {
         const removed_id = device.device_id;
         this.setState((state, props) => {
             const newDevices = state.devices.filter(
-                d => { return d.device_id != removed_id; }
+                (d) => { return d.device_id != removed_id; },
             );
             return { devices: newDevices };
         });
     }
 
     _renderDevice(device) {
-        var DevicesPanelEntry = sdk.getComponent('settings.DevicesPanelEntry');
+        const DevicesPanelEntry = sdk.getComponent('settings.DevicesPanelEntry');
         return (
             <DevicesPanelEntry key={device.device_id} device={device}
                onDeleted={()=>{this._onDeviceDeleted(device);}} />
@@ -110,7 +110,7 @@ export default class DevicesPanel extends React.Component {
             const classes = classNames(this.props.className, "error");
             return (
                 <div className={classes}>
-                    {this.state.deviceLoadError}
+                    { this.state.deviceLoadError }
                 </div>
             );
         }
@@ -119,7 +119,7 @@ export default class DevicesPanel extends React.Component {
         if (devices === undefined) {
             // still loading
             const classes = this.props.className;
-            return <Spinner className={classes}/>;
+            return <Spinner className={classes} />;
         }
 
         devices.sort(this._deviceCompare);
@@ -128,12 +128,12 @@ export default class DevicesPanel extends React.Component {
         return (
             <div className={classes}>
                 <div className="mx_DevicesPanel_header">
-                    <div className="mx_DevicesPanel_deviceId">{_t("Device ID")}</div>
-                    <div className="mx_DevicesPanel_deviceName">{_t("Device Name")}</div>
-                    <div className="mx_DevicesPanel_deviceLastSeen">{_t("Last seen")}</div>
+                    <div className="mx_DevicesPanel_deviceId">{ _t("Device ID") }</div>
+                    <div className="mx_DevicesPanel_deviceName">{ _t("Device Name") }</div>
+                    <div className="mx_DevicesPanel_deviceLastSeen">{ _t("Last seen") }</div>
                     <div className="mx_DevicesPanel_deviceButtons"></div>
                 </div>
-                {devices.map(this._renderDevice)}
+                { devices.map(this._renderDevice) }
             </div>
         );
     }
diff --git a/src/components/views/settings/DevicesPanelEntry.js b/src/components/views/settings/DevicesPanelEntry.js
index aa5a4f88a3..b8bef2649e 100644
--- a/src/components/views/settings/DevicesPanelEntry.js
+++ b/src/components/views/settings/DevicesPanelEntry.js
@@ -69,7 +69,7 @@ export default class DevicesPanelEntry extends React.Component {
             }
 
             // pop up an interactive auth dialog
-            var InteractiveAuthDialog = sdk.getComponent("dialogs.InteractiveAuthDialog");
+            const InteractiveAuthDialog = sdk.getComponent("dialogs.InteractiveAuthDialog");
 
             Modal.createTrackedDialog('Delete Device Dialog', '', InteractiveAuthDialog, {
                 title: _t("Authentication"),
@@ -101,7 +101,7 @@ export default class DevicesPanelEntry extends React.Component {
                 this.props.onDeleted();
                 if (this._unmounted) { return; }
                 this.setState({ deleting: false });
-            }
+            },
         );
     }
 
@@ -129,7 +129,7 @@ export default class DevicesPanelEntry extends React.Component {
 
         let deleteButton;
         if (this.state.deleteError) {
-            deleteButton = <div className="error">{this.state.deleteError}</div>;
+            deleteButton = <div className="error">{ this.state.deleteError }</div>;
         } else {
             deleteButton = (
                 <div className="mx_textButton"
@@ -139,15 +139,15 @@ export default class DevicesPanelEntry extends React.Component {
             );
         }
 
-        var myDeviceClass = '';
+        let myDeviceClass = '';
         if (device.device_id === MatrixClientPeg.get().getDeviceId()) {
             myDeviceClass = " mx_DevicesPanel_myDevice";
         }
 
         return (
-            <div className={ "mx_DevicesPanel_device" + myDeviceClass }>
+            <div className={"mx_DevicesPanel_device" + myDeviceClass}>
                 <div className="mx_DevicesPanel_deviceId">
-                    {device.device_id}
+                    { device.device_id }
                 </div>
                 <div className="mx_DevicesPanel_deviceName">
                     <EditableTextContainer initialValue={device.display_name}
@@ -156,10 +156,10 @@ export default class DevicesPanelEntry extends React.Component {
                     />
                 </div>
                 <div className="mx_DevicesPanel_lastSeen">
-                    {lastSeen}
+                    { lastSeen }
                 </div>
                 <div className="mx_DevicesPanel_deviceButtons">
-                    {deleteButton}
+                    { deleteButton }
                 </div>
             </div>
         );
diff --git a/src/components/views/settings/EnableNotificationsButton.js b/src/components/views/settings/EnableNotificationsButton.js
index f1b1f12c2a..c2f801b60a 100644
--- a/src/components/views/settings/EnableNotificationsButton.js
+++ b/src/components/views/settings/EnableNotificationsButton.js
@@ -15,9 +15,9 @@ limitations under the License.
 */
 
 'use strict';
-var React = require("react");
-var Notifier = require("../../../Notifier");
-var dis = require("../../../dispatcher");
+const React = require("react");
+const Notifier = require("../../../Notifier");
+const dis = require("../../../dispatcher");
 import { _t } from '../../../languageHandler';
 
 module.exports = React.createClass({
@@ -43,7 +43,7 @@ module.exports = React.createClass({
     },
 
     onClick: function() {
-        var self = this;
+        const self = this;
         if (!Notifier.supportsDesktopNotifications()) {
             return;
         }
@@ -61,15 +61,15 @@ module.exports = React.createClass({
         if (this.enabled()) {
             return (
                 <button className="mx_EnableNotificationsButton" onClick={this.onClick}>
-                    {_t("Disable Notifications")}
+                    { _t("Disable Notifications") }
                 </button>
             );
         } else {
             return (
                 <button className="mx_EnableNotificationsButton" onClick={this.onClick}>
-                    {_t("Enable Notifications")}
+                    { _t("Enable Notifications") }
                 </button>
             );
         }
-    }
+    },
 });
diff --git a/src/languageHandler.js b/src/languageHandler.js
index 12242a2e15..b2fc65c46d 100644
--- a/src/languageHandler.js
+++ b/src/languageHandler.js
@@ -100,26 +100,26 @@ export function _tJsx(jsxText, patterns, subs) {
         throw new Error(`_tJsx: programmer error. expected number of RegExps == number of Functions: ${subs.length} != ${patterns.length}`);
     }
     for (let i = 0; i < subs.length; i++) {
-        if (!patterns[i] instanceof RegExp) {
+        if (!(patterns[i] instanceof RegExp)) {
             throw new Error(`_tJsx: programmer error. expected RegExp for text: ${jsxText}`);
         }
-        if (!subs[i] instanceof Function) {
+        if (!(subs[i] instanceof Function)) {
             throw new Error(`_tJsx: programmer error. expected Function for text: ${jsxText}`);
         }
     }
 
     // The translation returns text so there's no XSS vector here (no unsafe HTML, no code execution)
     const tJsxText = _t(jsxText);
-    let output = [tJsxText];
+    const output = [tJsxText];
     for (let i = 0; i < patterns.length; i++) {
         // convert the last element in 'output' into 3 elements (pre-text, sub function, post-text).
         // Rinse and repeat for other patterns (using post-text).
-        let inputText = output.pop();
-        let match = inputText.match(patterns[i]);
+        const inputText = output.pop();
+        const match = inputText.match(patterns[i]);
         if (!match) {
             throw new Error(`_tJsx: translator error. expected translation to match regexp: ${patterns[i]}`);
         }
-        let capturedGroups = match.slice(1);
+        const capturedGroups = match.slice(1);
 
         // Return the raw translation before the *match* followed by the return value of sub() followed
         // by the raw translation after the *match* (not captured group).
@@ -159,7 +159,7 @@ export function setLanguage(preferredLangs) {
         }
         if (!langToUse) {
             // Fallback to en_EN if none is found
-            langToUse = 'en'
+            langToUse = 'en';
             console.error("Unable to find an appropriate language");
         }
 
@@ -177,16 +177,16 @@ export function setLanguage(preferredLangs) {
     }).then((langData) => {
         if (langData) counterpart.registerTranslations('en', langData);
     });
-};
+}
 
 export function getAllLanguagesFromJson() {
     return getLangsJson().then((langsObject) => {
-        var langs = [];
-        for (var langKey in langsObject) {
+        const langs = [];
+        for (const langKey in langsObject) {
             if (langsObject.hasOwnProperty(langKey)) {
                 langs.push({
                     'value': langKey,
-                    'label': langsObject[langKey].label
+                    'label': langsObject[langKey].label,
                 });
             }
         }
@@ -222,15 +222,15 @@ export function getNormalizedLanguageKeys(language) {
         }
     }
     return languageKeys;
-};
+}
 
 /**
  * Returns a language string with underscores replaced with
  * hyphens, and lowercased.
  */
 export function normalizeLanguageKey(language) {
-    return language.toLowerCase().replace("_","-");
-};
+    return language.toLowerCase().replace("_", "-");
+}
 
 export function getCurrentLanguage() {
     return counterpart.getLocale();
@@ -246,7 +246,7 @@ function getLangsJson() {
                     return;
                 }
                 resolve(JSON.parse(body));
-            }
+            },
         );
     });
 }
@@ -261,7 +261,7 @@ function getLanguage(langPath) {
                     return;
                 }
                 resolve(JSON.parse(body));
-            }
+            },
         );
     });
 }
diff --git a/src/linkify-matrix.js b/src/linkify-matrix.js
index e395b7986e..74489a09ea 100644
--- a/src/linkify-matrix.js
+++ b/src/linkify-matrix.js
@@ -16,31 +16,31 @@ limitations under the License.
 
 function matrixLinkify(linkify) {
     // Text tokens
-    var TT = linkify.scanner.TOKENS;
+    const TT = linkify.scanner.TOKENS;
     // Multi tokens
-    var MT = linkify.parser.TOKENS;
-    var MultiToken = MT.Base;
-    var S_START = linkify.parser.start;
+    const MT = linkify.parser.TOKENS;
+    const MultiToken = MT.Base;
+    const S_START = linkify.parser.start;
 
     if (TT.UNDERSCORE === undefined) {
         throw new Error("linkify-matrix requires linkifyjs 2.1.1: this version is too old.");
     }
 
-    var ROOMALIAS = function(value) {
+    const ROOMALIAS = function(value) {
         MultiToken.call(this, value);
         this.type = 'roomalias';
         this.isLink = true;
     };
     ROOMALIAS.prototype = new MultiToken();
 
-    var S_HASH = new linkify.parser.State();
-    var S_HASH_NAME = new linkify.parser.State();
-    var S_HASH_NAME_COLON = new linkify.parser.State();
-    var S_HASH_NAME_COLON_DOMAIN = new linkify.parser.State();
-    var S_HASH_NAME_COLON_DOMAIN_DOT = new linkify.parser.State();
-    var S_ROOMALIAS = new linkify.parser.State(ROOMALIAS);
+    const S_HASH = new linkify.parser.State();
+    const S_HASH_NAME = new linkify.parser.State();
+    const S_HASH_NAME_COLON = new linkify.parser.State();
+    const S_HASH_NAME_COLON_DOMAIN = new linkify.parser.State();
+    const S_HASH_NAME_COLON_DOMAIN_DOT = new linkify.parser.State();
+    const S_ROOMALIAS = new linkify.parser.State(ROOMALIAS);
 
-    var roomname_tokens = [
+    const roomname_tokens = [
         TT.DOT,
         TT.PLUS,
         TT.NUM,
@@ -69,21 +69,21 @@ function matrixLinkify(linkify) {
     S_HASH_NAME_COLON_DOMAIN_DOT.on(TT.TLD, S_ROOMALIAS);
 
 
-    var USERID = function(value) {
+    const USERID = function(value) {
         MultiToken.call(this, value);
         this.type = 'userid';
         this.isLink = true;
     };
     USERID.prototype = new MultiToken();
 
-    var S_AT = new linkify.parser.State();
-    var S_AT_NAME = new linkify.parser.State();
-    var S_AT_NAME_COLON = new linkify.parser.State();
-    var S_AT_NAME_COLON_DOMAIN = new linkify.parser.State();
-    var S_AT_NAME_COLON_DOMAIN_DOT = new linkify.parser.State();
-    var S_USERID = new linkify.parser.State(USERID);
+    const S_AT = new linkify.parser.State();
+    const S_AT_NAME = new linkify.parser.State();
+    const S_AT_NAME_COLON = new linkify.parser.State();
+    const S_AT_NAME_COLON_DOMAIN = new linkify.parser.State();
+    const S_AT_NAME_COLON_DOMAIN_DOT = new linkify.parser.State();
+    const S_USERID = new linkify.parser.State(USERID);
 
-    var username_tokens = [
+    const username_tokens = [
         TT.DOT,
         TT.UNDERSCORE,
         TT.PLUS,
@@ -110,21 +110,21 @@ function matrixLinkify(linkify) {
     S_AT_NAME_COLON_DOMAIN_DOT.on(TT.TLD, S_USERID);
 
 
-    var GROUPID = function(value) {
+    const GROUPID = function(value) {
         MultiToken.call(this, value);
         this.type = 'groupid';
         this.isLink = true;
     };
     GROUPID.prototype = new MultiToken();
 
-    var S_PLUS = new linkify.parser.State();
-    var S_PLUS_NAME = new linkify.parser.State();
-    var S_PLUS_NAME_COLON = new linkify.parser.State();
-    var S_PLUS_NAME_COLON_DOMAIN = new linkify.parser.State();
-    var S_PLUS_NAME_COLON_DOMAIN_DOT = new linkify.parser.State();
-    var S_GROUPID = new linkify.parser.State(GROUPID);
+    const S_PLUS = new linkify.parser.State();
+    const S_PLUS_NAME = new linkify.parser.State();
+    const S_PLUS_NAME_COLON = new linkify.parser.State();
+    const S_PLUS_NAME_COLON_DOMAIN = new linkify.parser.State();
+    const S_PLUS_NAME_COLON_DOMAIN_DOT = new linkify.parser.State();
+    const S_GROUPID = new linkify.parser.State(GROUPID);
 
-    var groupid_tokens = [
+    const groupid_tokens = [
         TT.DOT,
         TT.UNDERSCORE,
         TT.PLUS,
@@ -156,7 +156,7 @@ matrixLinkify.onUserClick = function(e, userId) { e.preventDefault(); };
 matrixLinkify.onAliasClick = function(e, roomAlias) { e.preventDefault(); };
 matrixLinkify.onGroupClick = function(e, groupId) { e.preventDefault(); };
 
-var escapeRegExp = function(string) {
+const escapeRegExp = function(string) {
     return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 };
 
@@ -179,19 +179,19 @@ matrixLinkify.options = {
                 return {
                     click: function(e) {
                         matrixLinkify.onUserClick(e, href);
-                    }
+                    },
                 };
             case "roomalias":
                 return {
                     click: function(e) {
                         matrixLinkify.onAliasClick(e, href);
-                    }
+                    },
                 };
             case "groupid":
                 return {
                     click: function(e) {
                         matrixLinkify.onGroupClick(e, href);
-                    }
+                    },
                 };
         }
     },
@@ -211,11 +211,10 @@ matrixLinkify.options = {
                 }
                 m = href.match(matrixLinkify.MATRIXTO_URL_PATTERN);
                 if (m) {
-                    var entity = m[1];
+                    const entity = m[1];
                     if (entity[0] === '@') {
                         return '#/user/' + entity;
-                    }
-                    else if (entity[0] === '#' || entity[0] === '!') {
+                    } else if (entity[0] === '#' || entity[0] === '!') {
                         return '#/room/' + entity;
                     }
                 }
@@ -231,11 +230,9 @@ matrixLinkify.options = {
     target: function(href, type) {
         if (type === 'url') {
             if (href.match(matrixLinkify.VECTOR_URL_PATTERN) ||
-                href.match(matrixLinkify.MATRIXTO_URL_PATTERN))
-            {
+                href.match(matrixLinkify.MATRIXTO_URL_PATTERN)) {
                 return null;
-            }
-            else {
+            } else {
                 return '_blank';
             }
         }
diff --git a/src/ratelimitedfunc.js b/src/ratelimitedfunc.js
index a9e8a4cab2..d8c30f5d03 100644
--- a/src/ratelimitedfunc.js
+++ b/src/ratelimitedfunc.js
@@ -29,9 +29,9 @@ module.exports = function(f, minIntervalMs) {
     this.lastCall = 0;
     this.scheduledCall = undefined;
 
-    var self = this;
-    var wrapper = function() {
-        var now = Date.now();
+    const self = this;
+    const wrapper = function() {
+        const now = Date.now();
 
         if (self.lastCall < now - minIntervalMs) {
             f.apply(this);
@@ -43,7 +43,7 @@ module.exports = function(f, minIntervalMs) {
                     f.apply(this);
                     self.lastCall = now;
                 },
-                (self.lastCall + minIntervalMs) - now
+                (self.lastCall + minIntervalMs) - now,
             );
         }
     };
@@ -58,9 +58,9 @@ module.exports = function(f, minIntervalMs) {
 
     // make sure that cancelPendingCall is copied when react rebinds the
     // wrapper
-    var _bind = wrapper.bind;
+    const _bind = wrapper.bind;
     wrapper.bind = function() {
-        var rebound = _bind.apply(this, arguments);
+        const rebound = _bind.apply(this, arguments);
         rebound.cancelPendingCall = wrapper.cancelPendingCall;
         return rebound;
     };
diff --git a/src/utils/DecryptFile.js b/src/utils/DecryptFile.js
index 04496e4204..cb5e407407 100644
--- a/src/utils/DecryptFile.js
+++ b/src/utils/DecryptFile.js
@@ -28,8 +28,8 @@ import Promise from 'bluebird';
  * @return {Promise} A promise that resolves with the data:// URI.
  */
 export function readBlobAsDataUri(file) {
-    var deferred = Promise.defer();
-    var reader = new FileReader();
+    const deferred = Promise.defer();
+    const reader = new FileReader();
     reader.onload = function(e) {
         deferred.resolve(e.target.result);
     };
@@ -61,7 +61,7 @@ export function decryptFile(file) {
         return encrypt.decryptAttachment(responseData, file);
     }).then(function(dataArray) {
         // Turn the array into a Blob and give it the correct MIME-type.
-        var blob = new Blob([dataArray], {type: file.mimetype});
+        const blob = new Blob([dataArray], {type: file.mimetype});
         return blob;
     });
 }
diff --git a/src/utils/Receipt.js b/src/utils/Receipt.js
index 549a0fd8b3..04bd4a4d8f 100644
--- a/src/utils/Receipt.js
+++ b/src/utils/Receipt.js
@@ -20,9 +20,9 @@ limitations under the License.
  * receipt exists.
  */
 export function findReadReceiptFromUserId(receiptEvent, userId) {
-    var receiptKeys = Object.keys(receiptEvent.getContent());
-    for (var i = 0; i < receiptKeys.length; ++i) {
-        var rcpt = receiptEvent.getContent()[receiptKeys[i]];
+    const receiptKeys = Object.keys(receiptEvent.getContent());
+    for (let i = 0; i < receiptKeys.length; ++i) {
+        const rcpt = receiptEvent.getContent()[receiptKeys[i]];
         if (rcpt['m.read'] && rcpt['m.read'][userId]) {
             return rcpt;
         }
diff --git a/test/all-tests.js b/test/all-tests.js
index 6e604f84ad..1d4d36ebfd 100644
--- a/test/all-tests.js
+++ b/test/all-tests.js
@@ -3,5 +3,5 @@
 // Our master test file: uses the webpack require API to find our test files
 // and run them
 
-var context = require.context('.', true, /-test\.jsx?$/);
+const context = require.context('.', true, /-test\.jsx?$/);
 context.keys().forEach(context);
diff --git a/test/components/structures/MessagePanel-test.js b/test/components/structures/MessagePanel-test.js
index 8254dd4126..4de3b7626d 100644
--- a/test/components/structures/MessagePanel-test.js
+++ b/test/components/structures/MessagePanel-test.js
@@ -14,22 +14,22 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-var React = require('react');
-var ReactDOM = require("react-dom");
-var TestUtils = require('react-addons-test-utils');
-var expect = require('expect');
+const React = require('react');
+const ReactDOM = require("react-dom");
+const TestUtils = require('react-addons-test-utils');
+const expect = require('expect');
 import sinon from 'sinon';
 
-var sdk = require('matrix-react-sdk');
+const sdk = require('matrix-react-sdk');
 
-var MessagePanel = sdk.getComponent('structures.MessagePanel');
+const MessagePanel = sdk.getComponent('structures.MessagePanel');
 import UserSettingsStore from '../../../src/UserSettingsStore';
 import MatrixClientPeg from '../../../src/MatrixClientPeg';
 
-var test_utils = require('test-utils');
-var mockclock = require('mock-clock');
+const test_utils = require('test-utils');
+const mockclock = require('mock-clock');
 
-var client;
+let client;
 
 // wrap MessagePanel with a component which provides the MatrixClient in the context.
 const WrappedMessagePanel = React.createClass({
@@ -48,11 +48,11 @@ const WrappedMessagePanel = React.createClass({
     },
 });
 
-describe('MessagePanel', function () {
-    var clock = mockclock.clock();
-    var realSetTimeout = window.setTimeout;
-    var events = mkEvents();
-    var sandbox = null;
+describe('MessagePanel', function() {
+    const clock = mockclock.clock();
+    const realSetTimeout = window.setTimeout;
+    const events = mkEvents();
+    let sandbox = null;
 
     beforeEach(function() {
         test_utils.beforeEach(this);
@@ -68,9 +68,9 @@ describe('MessagePanel', function () {
     });
 
     function mkEvents() {
-        var events = [];
-        var ts0 = Date.now();
-        for (var i = 0; i < 10; i++) {
+        const events = [];
+        const ts0 = Date.now();
+        for (let i = 0; i < 10; i++) {
             events.push(test_utils.mkMessage(
                 {
                     event: true, room: "!room:id", user: "@user:id",
@@ -81,30 +81,30 @@ describe('MessagePanel', function () {
     }
 
     it('should show the events', function() {
-        var res = TestUtils.renderIntoDocument(
-                <WrappedMessagePanel className="cls" events={events} />
+        const res = TestUtils.renderIntoDocument(
+                <WrappedMessagePanel className="cls" events={events} />,
         );
 
         // just check we have the right number of tiles for now
-        var tiles = TestUtils.scryRenderedComponentsWithType(
+        const tiles = TestUtils.scryRenderedComponentsWithType(
             res, sdk.getComponent('rooms.EventTile'));
         expect(tiles.length).toEqual(10);
     });
 
     it('should show the read-marker in the right place', function() {
-        var res = TestUtils.renderIntoDocument(
+        const res = TestUtils.renderIntoDocument(
                 <WrappedMessagePanel className="cls" events={events} readMarkerEventId={events[4].getId()}
-                    readMarkerVisible={true} />
+                    readMarkerVisible={true} />,
         );
 
-        var tiles = TestUtils.scryRenderedComponentsWithType(
+        const tiles = TestUtils.scryRenderedComponentsWithType(
             res, sdk.getComponent('rooms.EventTile'));
 
         // find the <li> which wraps the read marker
-        var rm = TestUtils.findRenderedDOMComponentWithClass(res, 'mx_RoomView_myReadMarker_container');
+        const rm = TestUtils.findRenderedDOMComponentWithClass(res, 'mx_RoomView_myReadMarker_container');
 
         // it should follow the <li> which wraps the event tile for event 4
-        var eventContainer = ReactDOM.findDOMNode(tiles[4]).parentNode;
+        const eventContainer = ReactDOM.findDOMNode(tiles[4]).parentNode;
         expect(rm.previousSibling).toEqual(eventContainer);
     });
 
@@ -113,22 +113,22 @@ describe('MessagePanel', function () {
         clock.install();
         clock.mockDate();
 
-        var parentDiv = document.createElement('div');
+        const parentDiv = document.createElement('div');
 
         // first render with the RM in one place
-        var mp = ReactDOM.render(
+        let mp = ReactDOM.render(
                 <WrappedMessagePanel className="cls" events={events} readMarkerEventId={events[4].getId()}
                     readMarkerVisible={true}
                 />, parentDiv);
 
-        var tiles = TestUtils.scryRenderedComponentsWithType(
+        const tiles = TestUtils.scryRenderedComponentsWithType(
             mp, sdk.getComponent('rooms.EventTile'));
-        var tileContainers = tiles.map(function (t) {
+        const tileContainers = tiles.map(function(t) {
             return ReactDOM.findDOMNode(t).parentNode;
         });
 
         // find the <li> which wraps the read marker
-        var rm = TestUtils.findRenderedDOMComponentWithClass(mp, 'mx_RoomView_myReadMarker_container');
+        const rm = TestUtils.findRenderedDOMComponentWithClass(mp, 'mx_RoomView_myReadMarker_container');
         expect(rm.previousSibling).toEqual(tileContainers[4]);
 
         // now move the RM
@@ -138,12 +138,12 @@ describe('MessagePanel', function () {
                 />, parentDiv);
 
         // now there should be two RM containers
-        var found = TestUtils.scryRenderedDOMComponentsWithClass(mp, 'mx_RoomView_myReadMarker_container');
+        const found = TestUtils.scryRenderedDOMComponentsWithClass(mp, 'mx_RoomView_myReadMarker_container');
         expect(found.length).toEqual(2);
 
         // the first should be the ghost
         expect(found[0].previousSibling).toEqual(tileContainers[4]);
-        var hr = found[0].children[0];
+        const hr = found[0].children[0];
 
         // the second should be the real thing
         expect(found[1].previousSibling).toEqual(tileContainers[6]);
@@ -164,17 +164,17 @@ describe('MessagePanel', function () {
     });
 
     it('shows only one ghost when the RM moves twice', function() {
-        var parentDiv = document.createElement('div');
+        const parentDiv = document.createElement('div');
 
         // first render with the RM in one place
-        var mp = ReactDOM.render(
+        let mp = ReactDOM.render(
                 <WrappedMessagePanel className="cls" events={events} readMarkerEventId={events[4].getId()}
                     readMarkerVisible={true}
                 />, parentDiv);
 
-        var tiles = TestUtils.scryRenderedComponentsWithType(
+        const tiles = TestUtils.scryRenderedComponentsWithType(
             mp, sdk.getComponent('rooms.EventTile'));
-        var tileContainers = tiles.map(function (t) {
+        const tileContainers = tiles.map(function(t) {
             return ReactDOM.findDOMNode(t).parentNode;
         });
 
@@ -185,7 +185,7 @@ describe('MessagePanel', function () {
                 />, parentDiv);
 
         // now there should be two RM containers
-        var found = TestUtils.scryRenderedDOMComponentsWithClass(mp, 'mx_RoomView_myReadMarker_container');
+        let found = TestUtils.scryRenderedDOMComponentsWithClass(mp, 'mx_RoomView_myReadMarker_container');
         expect(found.length).toEqual(2);
 
         // the first should be the ghost
diff --git a/test/components/structures/ScrollPanel-test.js b/test/components/structures/ScrollPanel-test.js
index e7d3d7b0e6..0e091cdddf 100644
--- a/test/components/structures/ScrollPanel-test.js
+++ b/test/components/structures/ScrollPanel-test.js
@@ -14,18 +14,18 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-var React = require('react');
-var ReactDOM = require("react-dom");
-var ReactTestUtils = require('react-addons-test-utils');
-var expect = require('expect');
+const React = require('react');
+const ReactDOM = require("react-dom");
+const ReactTestUtils = require('react-addons-test-utils');
+const expect = require('expect');
 import Promise from 'bluebird';
 
-var sdk = require('matrix-react-sdk');
+const sdk = require('matrix-react-sdk');
 
-var ScrollPanel = sdk.getComponent('structures.ScrollPanel');
-var test_utils = require('test-utils');
+const ScrollPanel = sdk.getComponent('structures.ScrollPanel');
+const test_utils = require('test-utils');
 
-var Tester = React.createClass({
+const Tester = React.createClass({
     getInitialState: function() {
         return {
             tileKeys: [],
@@ -43,18 +43,18 @@ var Tester = React.createClass({
     },
 
     _onFillRequest: function(back) {
-        var dir = back ? 'b': 'f';
+        const dir = back ? 'b': 'f';
         console.log("FillRequest: " + dir);
         this.fillCounts[dir]++;
 
-        var handler = this._fillHandlers[dir];
-        var defer = this._fillDefers[dir];
+        const handler = this._fillHandlers[dir];
+        const defer = this._fillDefers[dir];
 
         // don't use the same handler twice
         this._fillHandlers[dir] = null;
         this._fillDefers[dir] = null;
 
-        var res;
+        let res;
         if (handler) {
             res = handler();
         } else {
@@ -74,17 +74,17 @@ var Tester = React.createClass({
     /* returns a promise which will resolve when the fill happens */
     awaitFill: function(dir) {
         console.log("ScrollPanel Tester: awaiting " + dir + " fill");
-        var defer = Promise.defer();
+        const defer = Promise.defer();
         this._fillDefers[dir] = defer;
         return defer.promise;
     },
 
     _onScroll: function(ev) {
-        var st = ev.target.scrollTop;
+        const st = ev.target.scrollTop;
         console.log("ScrollPanel Tester: scroll event; scrollTop: " + st);
         this.lastScrollEvent = st;
 
-        var d = this._scrollDefer;
+        const d = this._scrollDefer;
         if (d) {
             this._scrollDefer = null;
             d.resolve();
@@ -118,29 +118,29 @@ var Tester = React.createClass({
             <li key={key} data-scroll-tokens={key}>
                 <div style={{height: '98px', margin: '50px', border: '1px solid black',
                              backgroundColor: '#fff8dc' }}>
-                   {key}
+                   { key }
                 </div>
              </li>
          );
     },
 
     render: function() {
-        var tiles = this.state.tileKeys.map(this._mkTile);
+        const tiles = this.state.tileKeys.map(this._mkTile);
         console.log("rendering with " + tiles.length + " tiles");
         return (
             <ScrollPanel ref="sp"
-                onScroll={ this._onScroll }
-                onFillRequest={ this._onFillRequest }>
-                    {tiles}
+                onScroll={this._onScroll}
+                onFillRequest={this._onFillRequest}>
+                    { tiles }
             </ScrollPanel>
         );
     },
 });
 
 describe('ScrollPanel', function() {
-    var parentDiv;
-    var tester;
-    var scrollingDiv;
+    let parentDiv;
+    let tester;
+    let scrollingDiv;
 
     beforeEach(function(done) {
         test_utils.beforeEach(this);
@@ -153,7 +153,7 @@ describe('ScrollPanel', function() {
         parentDiv.style.overflow = 'hidden';
         document.body.appendChild(parentDiv);
 
-        tester = ReactDOM.render(<Tester/>, parentDiv);
+        tester = ReactDOM.render(<Tester />, parentDiv);
         expect(tester.fillCounts.b).toEqual(1);
         expect(tester.fillCounts.f).toEqual(1);
 
@@ -226,10 +226,10 @@ describe('ScrollPanel', function() {
     });
 
     it('should not get stuck in #528 workaround', function(done) {
-        var events = [];
+        let events = [];
         Promise.resolve().then(() => {
             // initialise with a bunch of events
-            for (var i = 0; i < 40; i++) {
+            for (let i = 0; i < 40; i++) {
                 events.push(i);
             }
             tester.setTileKeys(events);
@@ -259,7 +259,7 @@ describe('ScrollPanel', function() {
         }).then(() => {
             // Now, simulate hitting "scroll to bottom".
             events = [];
-            for (var i = 100; i < 120; i++) {
+            for (let i = 100; i < 120; i++) {
                 events.push(i);
             }
             tester.setTileKeys(events);
diff --git a/test/components/structures/TimelinePanel-test.js b/test/components/structures/TimelinePanel-test.js
index 98ec65b8e8..74037d2926 100644
--- a/test/components/structures/TimelinePanel-test.js
+++ b/test/components/structures/TimelinePanel-test.js
@@ -14,24 +14,24 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-var React = require('react');
-var ReactDOM = require('react-dom');
-var ReactTestUtils = require('react-addons-test-utils');
-var expect = require('expect');
+const React = require('react');
+const ReactDOM = require('react-dom');
+const ReactTestUtils = require('react-addons-test-utils');
+const expect = require('expect');
 import Promise from 'bluebird';
-var sinon = require('sinon');
+const sinon = require('sinon');
 
-var jssdk = require('matrix-js-sdk');
-var EventTimeline = jssdk.EventTimeline;
+const jssdk = require('matrix-js-sdk');
+const EventTimeline = jssdk.EventTimeline;
 
-var sdk = require('matrix-react-sdk');
-var TimelinePanel = sdk.getComponent('structures.TimelinePanel');
-var peg = require('../../../src/MatrixClientPeg');
+const sdk = require('matrix-react-sdk');
+const TimelinePanel = sdk.getComponent('structures.TimelinePanel');
+const peg = require('../../../src/MatrixClientPeg');
 
-var test_utils = require('test-utils');
+const test_utils = require('test-utils');
 
-var ROOM_ID = '!room:localhost';
-var USER_ID = '@me:localhost';
+const ROOM_ID = '!room:localhost';
+const USER_ID = '@me:localhost';
 
 // wrap TimelinePanel with a component which provides the MatrixClient in the context.
 const WrappedTimelinePanel = React.createClass({
@@ -52,12 +52,12 @@ const WrappedTimelinePanel = React.createClass({
 
 
 describe('TimelinePanel', function() {
-    var sandbox;
-    var timelineSet;
-    var room;
-    var client;
-    var timeline;
-    var parentDiv;
+    let sandbox;
+    let timelineSet;
+    let room;
+    let client;
+    let timeline;
+    let parentDiv;
 
     // make a dummy message. eventNum is put in the message text to help
     // identification during debugging, and also in the timestamp so that we
@@ -68,14 +68,14 @@ describe('TimelinePanel', function() {
                 event: true, room: ROOM_ID, user: USER_ID,
                 ts: Date.now() + eventNum,
                 msg: "Event " + eventNum,
-                ... opts,
+                ...opts,
             });
     }
 
     function scryEventTiles(panel) {
         return ReactTestUtils.scryRenderedComponentsWithType(
             panel, sdk.getComponent('rooms.EventTile'));
-    };
+    }
 
     beforeEach(function() {
         test_utils.beforeEach(this);
@@ -121,8 +121,8 @@ describe('TimelinePanel', function() {
         // this is https://github.com/vector-im/vector-web/issues/1367
 
         // enough events to allow us to scroll back
-        var N_EVENTS = 30;
-        for (var i = 0; i < N_EVENTS; i++) {
+        const N_EVENTS = 30;
+        for (let i = 0; i < N_EVENTS; i++) {
             timeline.addEvent(mkMessage(i));
         }
 
@@ -133,26 +133,23 @@ describe('TimelinePanel', function() {
                 scrollDefer.resolve();
             }
         };
-        var rendered = ReactDOM.render(
+        const rendered = ReactDOM.render(
                 <WrappedTimelinePanel timelineSet={timelineSet} onScroll={onScroll} />,
                 parentDiv,
         );
-        var panel = rendered.refs.panel;
-        var scrollingDiv = ReactTestUtils.findRenderedDOMComponentWithClass(
+        const panel = rendered.refs.panel;
+        const scrollingDiv = ReactTestUtils.findRenderedDOMComponentWithClass(
             panel, "gm-scroll-view");
 
         // helper function which will return a promise which resolves when the
         // panel isn't paginating
         var awaitPaginationCompletion = function() {
-            if(!panel.state.forwardPaginating)
-                return Promise.resolve();
-            else
-                return Promise.delay(0).then(awaitPaginationCompletion);
+            if(!panel.state.forwardPaginating) {return Promise.resolve();} else {return Promise.delay(0).then(awaitPaginationCompletion);}
         };
 
         // helper function which will return a promise which resolves when
         // the TimelinePanel fires a scroll event
-        var awaitScroll = function() {
+        const awaitScroll = function() {
             scrollDefer = Promise.defer();
             return scrollDefer.promise;
         };
@@ -181,7 +178,7 @@ describe('TimelinePanel', function() {
             console.log("adding event");
 
             // a new event!
-            var ev = mkMessage(N_EVENTS+1);
+            const ev = mkMessage(N_EVENTS+1);
             timeline.addEvent(ev);
             panel.onRoomTimeline(ev, room, false, false, {
                 liveEvent: true,
@@ -204,8 +201,8 @@ describe('TimelinePanel', function() {
     it('should not paginate forever if there are no events', function(done) {
         // start with a handful of events in the timeline, as would happen when
         // joining a room
-        var d = Date.now();
-        for (var i = 0; i < 3; i++) {
+        const d = Date.now();
+        for (let i = 0; i < 3; i++) {
             timeline.addEvent(mkMessage(i));
         }
         timeline.setPaginationToken('tok', EventTimeline.BACKWARDS);
@@ -217,13 +214,13 @@ describe('TimelinePanel', function() {
             return Promise.resolve(true);
         });
 
-        var rendered = ReactDOM.render(
-            <WrappedTimelinePanel timelineSet={timelineSet}/>,
-            parentDiv
+        const rendered = ReactDOM.render(
+            <WrappedTimelinePanel timelineSet={timelineSet} />,
+            parentDiv,
         );
-        var panel = rendered.refs.panel;
+        const panel = rendered.refs.panel;
 
-        var messagePanel = ReactTestUtils.findRenderedComponentWithType(
+        const messagePanel = ReactTestUtils.findRenderedComponentWithType(
             panel, sdk.getComponent('structures.MessagePanel'));
 
         expect(messagePanel.props.backPaginating).toBe(true);
@@ -249,7 +246,7 @@ describe('TimelinePanel', function() {
     });
 
     it("should let you scroll down to the bottom after you've scrolled up", function(done) {
-        var N_EVENTS = 120; // the number of events to simulate being added to the timeline
+        const N_EVENTS = 120; // the number of events to simulate being added to the timeline
 
         // sadly, loading all those events takes a while
         this.timeout(N_EVENTS * 50);
@@ -259,26 +256,26 @@ describe('TimelinePanel', function() {
         client.getRoom = function(id) { return null; };
 
         // fill the timeline with lots of events
-        for (var i = 0; i < N_EVENTS; i++) {
+        for (let i = 0; i < N_EVENTS; i++) {
             timeline.addEvent(mkMessage(i));
         }
         console.log("added events to timeline");
 
-        var scrollDefer;
-        var rendered = ReactDOM.render(
-            <WrappedTimelinePanel timelineSet={timelineSet} onScroll={() => {scrollDefer.resolve()}}/>,
-            parentDiv
+        let scrollDefer;
+        const rendered = ReactDOM.render(
+            <WrappedTimelinePanel timelineSet={timelineSet} onScroll={() => {scrollDefer.resolve();}} />,
+            parentDiv,
         );
         console.log("TimelinePanel rendered");
-        var panel = rendered.refs.panel;
-        var messagePanel = ReactTestUtils.findRenderedComponentWithType(
+        const panel = rendered.refs.panel;
+        const messagePanel = ReactTestUtils.findRenderedComponentWithType(
             panel, sdk.getComponent('structures.MessagePanel'));
-        var scrollingDiv = ReactTestUtils.findRenderedDOMComponentWithClass(
+        const scrollingDiv = ReactTestUtils.findRenderedDOMComponentWithClass(
             panel, "gm-scroll-view");
 
         // helper function which will return a promise which resolves when
         // the TimelinePanel fires a scroll event
-        var awaitScroll = function() {
+        const awaitScroll = function() {
             scrollDefer = Promise.defer();
 
             return scrollDefer.promise.then(() => {
@@ -299,8 +296,8 @@ describe('TimelinePanel', function() {
             console.log("back paginating...");
             setScrollTop(0);
             return awaitScroll().then(() => {
-                let eventTiles = scryEventTiles(panel);
-                let firstEvent = eventTiles[0].props.mxEvent;
+                const eventTiles = scryEventTiles(panel);
+                const firstEvent = eventTiles[0].props.mxEvent;
 
                 console.log("TimelinePanel contains " + eventTiles.length +
                             " events; first is " +
@@ -319,12 +316,11 @@ describe('TimelinePanel', function() {
             setScrollTop(scrollingDiv.scrollHeight - scrollingDiv.clientHeight);
             console.log("scrolling down... " + scrollingDiv.scrollTop);
             return awaitScroll().delay(0).then(() => {
+                const eventTiles = scryEventTiles(panel);
+                const events = timeline.getEvents();
 
-                let eventTiles = scryEventTiles(panel);
-                let events = timeline.getEvents();
-
-                let lastEventInPanel = eventTiles[eventTiles.length - 1].props.mxEvent;
-                let lastEventInTimeline = events[events.length - 1];
+                const lastEventInPanel = eventTiles[eventTiles.length - 1].props.mxEvent;
+                const lastEventInTimeline = events[events.length - 1];
 
                 // Scroll until the last event in the panel = the last event in the timeline
                 if(lastEventInPanel.getId() !== lastEventInTimeline.getId()) {
@@ -348,7 +344,7 @@ describe('TimelinePanel', function() {
             expect(messagePanel.props.backPaginating).toBe(false);
 
             expect(messagePanel.props.suppressFirstDateSeparator).toBe(false);
-            var events = scryEventTiles(panel);
+            const events = scryEventTiles(panel);
             expect(events[0].props.mxEvent).toBe(timeline.getEvents()[0]);
 
             // At this point, we make no assumption that unpagination has happened. This doesn't
@@ -361,11 +357,11 @@ describe('TimelinePanel', function() {
             expect(messagePanel.props.backPaginating).toBe(false);
             expect(messagePanel.props.forwardPaginating).toBe(false);
 
-            var events = scryEventTiles(panel);
+            const events = scryEventTiles(panel);
 
             // Expect to be able to see the most recent event
-            var lastEventInPanel = events[events.length - 1].props.mxEvent;
-            var lastEventInTimeline = timeline.getEvents()[timeline.getEvents().length - 1];
+            const lastEventInPanel = events[events.length - 1].props.mxEvent;
+            const lastEventInTimeline = timeline.getEvents()[timeline.getEvents().length - 1];
             expect(lastEventInPanel.getContent()).toBe(lastEventInTimeline.getContent());
 
             console.log("done");
diff --git a/test/components/stub-component.js b/test/components/stub-component.js
index ba37850ec6..308b183719 100644
--- a/test/components/stub-component.js
+++ b/test/components/stub-component.js
@@ -2,7 +2,7 @@
  */
 'use strict';
 
-var React = require('react');
+const React = require('react');
 
 module.exports = function(opts) {
     opts = opts || {};
@@ -12,8 +12,8 @@ module.exports = function(opts) {
 
     if (!opts.render) {
         opts.render = function() {
-            return <div>{this.displayName}</div>;
-        }
+            return <div>{ this.displayName }</div>;
+        };
     }
 
     return React.createClass(opts);
diff --git a/test/components/views/dialogs/InteractiveAuthDialog-test.js b/test/components/views/dialogs/InteractiveAuthDialog-test.js
index f606793132..36894fbd21 100644
--- a/test/components/views/dialogs/InteractiveAuthDialog-test.js
+++ b/test/components/views/dialogs/InteractiveAuthDialog-test.js
@@ -28,12 +28,12 @@ import MatrixClientPeg from '../../../../src/MatrixClientPeg';
 import * as test_utils from '../../../test-utils';
 
 const InteractiveAuthDialog = sdk.getComponent(
-    'views.dialogs.InteractiveAuthDialog'
+    'views.dialogs.InteractiveAuthDialog',
 );
 
-describe('InteractiveAuthDialog', function () {
-    var parentDiv;
-    var sandbox;
+describe('InteractiveAuthDialog', function() {
+    let parentDiv;
+    let sandbox;
 
     beforeEach(function() {
         test_utils.beforeEach(this);
@@ -50,10 +50,10 @@ describe('InteractiveAuthDialog', function () {
 
     it('Should successfully complete a password flow', function() {
         const onFinished = sinon.spy();
-        const doRequest = sinon.stub().returns(Promise.resolve({a:1}));
+        const doRequest = sinon.stub().returns(Promise.resolve({a: 1}));
 
         // tell the stub matrixclient to return a real userid
-        var client = MatrixClientPeg.get();
+        const client = MatrixClientPeg.get();
         client.credentials = {userId: "@user:id"};
 
         const dlg = ReactDOM.render(
@@ -62,8 +62,8 @@ describe('InteractiveAuthDialog', function () {
                 authData={{
                     session: "sess",
                     flows: [
-                        {"stages":["m.login.password"]}
-                    ]
+                        {"stages": ["m.login.password"]},
+                    ],
                 }}
                 makeRequest={doRequest}
                 onFinished={onFinished}
@@ -72,7 +72,7 @@ describe('InteractiveAuthDialog', function () {
         // wait for a password box and a submit button
         return MatrixReactTestUtils.waitForRenderedDOMComponentWithTag(dlg, "form", 2).then((formNode) => {
             const inputNodes = ReactTestUtils.scryRenderedDOMComponentsWithTag(
-                dlg, "input"
+                dlg, "input",
             );
             let passwordNode;
             let submitNode;
@@ -113,7 +113,7 @@ describe('InteractiveAuthDialog', function () {
             return Promise.delay(1);
         }).then(() => {
             expect(onFinished.callCount).toEqual(1);
-            expect(onFinished.calledWithExactly(true, {a:1})).toBe(true);
+            expect(onFinished.calledWithExactly(true, {a: 1})).toBe(true);
         });
     });
 });
diff --git a/test/components/views/elements/MemberEventListSummary-test.js b/test/components/views/elements/MemberEventListSummary-test.js
index a93e38b50c..1618fe4cfe 100644
--- a/test/components/views/elements/MemberEventListSummary-test.js
+++ b/test/components/views/elements/MemberEventListSummary-test.js
@@ -155,10 +155,10 @@ describe('MemberEventListSummary', function() {
         };
 
         const instance = ReactTestUtils.renderIntoDocument(
-            <MemberEventListSummary {...props} />
+            <MemberEventListSummary {...props} />,
         );
         const summary = ReactTestUtils.findRenderedDOMComponentWithClass(
-            instance, "mx_MemberEventListSummary_summary"
+            instance, "mx_MemberEventListSummary_summary",
         );
         const summaryText = summary.innerText;
 
@@ -191,10 +191,10 @@ describe('MemberEventListSummary', function() {
         };
 
         const instance = ReactTestUtils.renderIntoDocument(
-            <MemberEventListSummary {...props} />
+            <MemberEventListSummary {...props} />,
         );
         const summary = ReactTestUtils.findRenderedDOMComponentWithClass(
-            instance, "mx_MemberEventListSummary_summary"
+            instance, "mx_MemberEventListSummary_summary",
         );
         const summaryText = summary.innerText;
 
@@ -239,15 +239,15 @@ describe('MemberEventListSummary', function() {
         };
 
         const instance = ReactTestUtils.renderIntoDocument(
-            <MemberEventListSummary {...props} />
+            <MemberEventListSummary {...props} />,
         );
         const summary = ReactTestUtils.findRenderedDOMComponentWithClass(
-            instance, "mx_MemberEventListSummary_summary"
+            instance, "mx_MemberEventListSummary_summary",
         );
         const summaryText = summary.innerText;
 
         expect(summaryText).toBe(
-            "user_1 was unbanned, joined and left 7 times and was invited"
+            "user_1 was unbanned, joined and left 7 times and was invited",
         );
     });
 
@@ -292,16 +292,16 @@ describe('MemberEventListSummary', function() {
         };
 
         const instance = ReactTestUtils.renderIntoDocument(
-            <MemberEventListSummary {...props} />
+            <MemberEventListSummary {...props} />,
         );
         const summary = ReactTestUtils.findRenderedDOMComponentWithClass(
-            instance, "mx_MemberEventListSummary_summary"
+            instance, "mx_MemberEventListSummary_summary",
         );
         const summaryText = summary.innerText;
 
         expect(summaryText).toBe(
             "user_1 was unbanned, joined and left 2 times, was banned, " +
-            "joined and left 3 times and was invited"
+            "joined and left 3 times and was invited",
         );
     });
 
@@ -351,15 +351,15 @@ describe('MemberEventListSummary', function() {
         };
 
         const instance = ReactTestUtils.renderIntoDocument(
-            <MemberEventListSummary {...props} />
+            <MemberEventListSummary {...props} />,
         );
         const summary = ReactTestUtils.findRenderedDOMComponentWithClass(
-            instance, "mx_MemberEventListSummary_summary"
+            instance, "mx_MemberEventListSummary_summary",
         );
         const summaryText = summary.innerText;
 
         expect(summaryText).toBe(
-            "user_1 and one other were unbanned, joined and left 2 times and were banned"
+            "user_1 and one other were unbanned, joined and left 2 times and were banned",
         );
     });
 
@@ -389,15 +389,15 @@ describe('MemberEventListSummary', function() {
         };
 
         const instance = ReactTestUtils.renderIntoDocument(
-            <MemberEventListSummary {...props} />
+            <MemberEventListSummary {...props} />,
         );
         const summary = ReactTestUtils.findRenderedDOMComponentWithClass(
-            instance, "mx_MemberEventListSummary_summary"
+            instance, "mx_MemberEventListSummary_summary",
         );
         const summaryText = summary.innerText;
 
         expect(summaryText).toBe(
-            "user_0 and 19 others were unbanned, joined and left 2 times and were banned"
+            "user_0 and 19 others were unbanned, joined and left 2 times and were banned",
         );
     });
 
@@ -440,16 +440,16 @@ describe('MemberEventListSummary', function() {
         };
 
         const instance = ReactTestUtils.renderIntoDocument(
-            <MemberEventListSummary {...props} />
+            <MemberEventListSummary {...props} />,
         );
         const summary = ReactTestUtils.findRenderedDOMComponentWithClass(
-            instance, "mx_MemberEventListSummary_summary"
+            instance, "mx_MemberEventListSummary_summary",
         );
         const summaryText = summary.innerText;
 
         expect(summaryText).toBe(
             "user_2 was unbanned and joined and left 2 times, user_1 was unbanned, " +
-            "joined and left 2 times and was banned"
+            "joined and left 2 times and was banned",
         );
     });
 
@@ -507,16 +507,16 @@ describe('MemberEventListSummary', function() {
         };
 
         const instance = ReactTestUtils.renderIntoDocument(
-            <MemberEventListSummary {...props} />
+            <MemberEventListSummary {...props} />,
         );
         const summary = ReactTestUtils.findRenderedDOMComponentWithClass(
-            instance, "mx_MemberEventListSummary_summary"
+            instance, "mx_MemberEventListSummary_summary",
         );
         const summaryText = summary.innerText;
 
         expect(summaryText).toBe(
             "user_1 was invited, was banned, joined, rejected their invitation, left, " +
-            "had their invitation withdrawn, was unbanned, was kicked and left"
+            "had their invitation withdrawn, was unbanned, was kicked and left",
         );
     });
 
@@ -554,16 +554,16 @@ describe('MemberEventListSummary', function() {
         };
 
         const instance = ReactTestUtils.renderIntoDocument(
-            <MemberEventListSummary {...props} />
+            <MemberEventListSummary {...props} />,
         );
         const summary = ReactTestUtils.findRenderedDOMComponentWithClass(
-            instance, "mx_MemberEventListSummary_summary"
+            instance, "mx_MemberEventListSummary_summary",
         );
         const summaryText = summary.innerText;
 
         expect(summaryText).toBe(
             "user_1 and one other rejected their invitations and " +
-            "had their invitations withdrawn"
+            "had their invitations withdrawn",
         );
     });
 
@@ -590,15 +590,15 @@ describe('MemberEventListSummary', function() {
         };
 
         const instance = ReactTestUtils.renderIntoDocument(
-            <MemberEventListSummary {...props} />
+            <MemberEventListSummary {...props} />,
         );
         const summary = ReactTestUtils.findRenderedDOMComponentWithClass(
-            instance, "mx_MemberEventListSummary_summary"
+            instance, "mx_MemberEventListSummary_summary",
         );
         const summaryText = summary.innerText;
 
         expect(summaryText).toBe(
-            "user_1 rejected their invitation 2 times"
+            "user_1 rejected their invitation 2 times",
         );
     });
 
@@ -618,15 +618,15 @@ describe('MemberEventListSummary', function() {
         };
 
         const instance = ReactTestUtils.renderIntoDocument(
-            <MemberEventListSummary {...props} />
+            <MemberEventListSummary {...props} />,
         );
         const summary = ReactTestUtils.findRenderedDOMComponentWithClass(
-            instance, "mx_MemberEventListSummary_summary"
+            instance, "mx_MemberEventListSummary_summary",
         );
         const summaryText = summary.innerText;
 
         expect(summaryText).toBe(
-            "user_1 and user_2 joined 2 times"
+            "user_1 and user_2 joined 2 times",
         );
     });
 
@@ -645,15 +645,15 @@ describe('MemberEventListSummary', function() {
         };
 
         const instance = ReactTestUtils.renderIntoDocument(
-            <MemberEventListSummary {...props} />
+            <MemberEventListSummary {...props} />,
         );
         const summary = ReactTestUtils.findRenderedDOMComponentWithClass(
-            instance, "mx_MemberEventListSummary_summary"
+            instance, "mx_MemberEventListSummary_summary",
         );
         const summaryText = summary.innerText;
 
         expect(summaryText).toBe(
-            "user_1, user_2 and one other joined"
+            "user_1, user_2 and one other joined",
         );
     });
 
@@ -670,15 +670,15 @@ describe('MemberEventListSummary', function() {
         };
 
         const instance = ReactTestUtils.renderIntoDocument(
-            <MemberEventListSummary {...props} />
+            <MemberEventListSummary {...props} />,
         );
         const summary = ReactTestUtils.findRenderedDOMComponentWithClass(
-            instance, "mx_MemberEventListSummary_summary"
+            instance, "mx_MemberEventListSummary_summary",
         );
         const summaryText = summary.innerText;
 
         expect(summaryText).toBe(
-            "user_0, user_1 and 18 others joined"
+            "user_0, user_1 and 18 others joined",
         );
     });
 });
diff --git a/test/components/views/rooms/MessageComposerInput-test.js b/test/components/views/rooms/MessageComposerInput-test.js
index e5d98e26c6..faf3f0f804 100644
--- a/test/components/views/rooms/MessageComposerInput-test.js
+++ b/test/components/views/rooms/MessageComposerInput-test.js
@@ -57,7 +57,7 @@ describe('MessageComposerInput', () => {
             }
             sandbox.restore();
             done();
-        })
+        });
     });
 
     // XXX this fails
diff --git a/test/mock-clock.js b/test/mock-clock.js
index a99b01a0fb..103e186c1f 100644
--- a/test/mock-clock.js
+++ b/test/mock-clock.js
@@ -37,28 +37,28 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  *    mock_clock.uninstall();
  *
- *  
+ *
  * The reason for C&Ping jasmine's clock here is that jasmine itself is
  * difficult to webpack, and we don't really want all of it. Sinon also has a
  * mock-clock implementation, but again, it is difficult to webpack.
  */
 
-var j$ = {};
+const j$ = {};
 
-j$.Clock = function () {
+j$.Clock = function() {
   function Clock(global, delayedFunctionSchedulerFactory, mockDate) {
-    var self = this,
+    let self = this,
       realTimingFunctions = {
         setTimeout: global.setTimeout,
         clearTimeout: global.clearTimeout,
         setInterval: global.setInterval,
-        clearInterval: global.clearInterval
+        clearInterval: global.clearInterval,
       },
       fakeTimingFunctions = {
         setTimeout: setTimeout,
         clearTimeout: clearTimeout,
         setInterval: setInterval,
-        clearInterval: clearInterval
+        clearInterval: clearInterval,
       },
       installed = false,
       delayedFunctionScheduler,
@@ -151,7 +151,7 @@ j$.Clock = function () {
     }
 
     function replace(dest, source) {
-      for (var prop in source) {
+      for (const prop in source) {
         dest[prop] = source[prop];
       }
     }
@@ -183,22 +183,22 @@ j$.Clock = function () {
 
 j$.DelayedFunctionScheduler = function() {
   function DelayedFunctionScheduler() {
-    var self = this;
-    var scheduledLookup = [];
-    var scheduledFunctions = {};
-    var currentTime = 0;
-    var delayedFnCount = 0;
+    const self = this;
+    const scheduledLookup = [];
+    const scheduledFunctions = {};
+    let currentTime = 0;
+    let delayedFnCount = 0;
 
     self.tick = function(millis) {
       millis = millis || 0;
-      var endTime = currentTime + millis;
+      const endTime = currentTime + millis;
 
       runScheduledFunctions(endTime);
       currentTime = endTime;
     };
 
     self.scheduleFunction = function(funcToCall, millis, params, recurring, timeoutKey, runAtMillis) {
-      var f;
+      let f;
       if (typeof(funcToCall) === 'string') {
         /* jshint evil: true */
         f = function() { return eval(funcToCall); };
@@ -211,13 +211,13 @@ j$.DelayedFunctionScheduler = function() {
       timeoutKey = timeoutKey || ++delayedFnCount;
       runAtMillis = runAtMillis || (currentTime + millis);
 
-      var funcToSchedule = {
+      const funcToSchedule = {
         runAtMillis: runAtMillis,
         funcToCall: f,
         recurring: recurring,
         params: params,
         timeoutKey: timeoutKey,
-        millis: millis
+        millis: millis,
       };
 
       if (runAtMillis in scheduledFunctions) {
@@ -225,7 +225,7 @@ j$.DelayedFunctionScheduler = function() {
       } else {
         scheduledFunctions[runAtMillis] = [funcToSchedule];
         scheduledLookup.push(runAtMillis);
-        scheduledLookup.sort(function (a, b) {
+        scheduledLookup.sort(function(a, b) {
           return a - b;
         });
       }
@@ -234,9 +234,9 @@ j$.DelayedFunctionScheduler = function() {
     };
 
     self.removeFunctionWithId = function(timeoutKey) {
-      for (var runAtMillis in scheduledFunctions) {
-        var funcs = scheduledFunctions[runAtMillis];
-        var i = indexOfFirstToPass(funcs, function (func) {
+      for (const runAtMillis in scheduledFunctions) {
+        const funcs = scheduledFunctions[runAtMillis];
+        const i = indexOfFirstToPass(funcs, function(func) {
           return func.timeoutKey === timeoutKey;
         });
 
@@ -258,9 +258,9 @@ j$.DelayedFunctionScheduler = function() {
     return self;
 
     function indexOfFirstToPass(array, testFn) {
-      var index = -1;
+      let index = -1;
 
-      for (var i = 0; i < array.length; ++i) {
+      for (let i = 0; i < array.length; ++i) {
         if (testFn(array[i])) {
           index = i;
           break;
@@ -271,8 +271,8 @@ j$.DelayedFunctionScheduler = function() {
     }
 
     function deleteFromLookup(key) {
-      var value = Number(key);
-      var i = indexOfFirstToPass(scheduledLookup, function (millis) {
+      const value = Number(key);
+      const i = indexOfFirstToPass(scheduledLookup, function(millis) {
         return millis === value;
       });
 
@@ -291,7 +291,7 @@ j$.DelayedFunctionScheduler = function() {
     }
 
     function forEachFunction(funcsToRun, callback) {
-      for (var i = 0; i < funcsToRun.length; ++i) {
+      for (let i = 0; i < funcsToRun.length; ++i) {
         callback(funcsToRun[i]);
       }
     }
@@ -304,7 +304,7 @@ j$.DelayedFunctionScheduler = function() {
       do {
         currentTime = scheduledLookup.shift();
 
-        var funcsToRun = scheduledFunctions[currentTime];
+        const funcsToRun = scheduledFunctions[currentTime];
         delete scheduledFunctions[currentTime];
 
         forEachFunction(funcsToRun, function(funcToRun) {
@@ -319,7 +319,7 @@ j$.DelayedFunctionScheduler = function() {
       } while (scheduledLookup.length > 0 &&
               // checking first if we're out of time prevents setTimeout(0)
               // scheduled in a funcToRun from forcing an extra iteration
-                 currentTime !== endTime  &&
+                 currentTime !== endTime &&
                  scheduledLookup[0] <= endTime);
     }
   }
@@ -330,8 +330,8 @@ j$.DelayedFunctionScheduler = function() {
 
 j$.MockDate = function() {
   function MockDate(global) {
-    var self = this;
-    var currentTime = 0;
+    const self = this;
+    let currentTime = 0;
 
     if (!global || !global.Date) {
       self.install = function() {};
@@ -340,7 +340,7 @@ j$.MockDate = function() {
       return self;
     }
 
-    var GlobalDate = global.Date;
+    const GlobalDate = global.Date;
 
     self.install = function(mockDate) {
       if (mockDate instanceof GlobalDate) {
@@ -411,10 +411,10 @@ j$.MockDate = function() {
   return MockDate;
 }();
 
-var clock = new j$.Clock(global, function () { return new j$.DelayedFunctionScheduler(); }, new j$.MockDate(global));
+const clock = new j$.Clock(global, function() { return new j$.DelayedFunctionScheduler(); }, new j$.MockDate(global));
 
 module.exports.clock = function() {
     return clock;
-}
+};
 
 
diff --git a/test/skinned-sdk.js b/test/skinned-sdk.js
index d4e178ef2c..1ad361d59d 100644
--- a/test/skinned-sdk.js
+++ b/test/skinned-sdk.js
@@ -13,12 +13,12 @@
 // default
 require('babel-polyfill');
 
-var sdk = require("../src/index");
+const sdk = require("../src/index");
 
-var skin = require('../src/component-index.js');
-var stubComponent = require('./components/stub-component.js');
+const skin = require('../src/component-index.js');
+const stubComponent = require('./components/stub-component.js');
 
-var components = skin.components;
+const components = skin.components;
 components['structures.LeftPanel'] = stubComponent();
 components['structures.RightPanel'] = stubComponent();
 components['structures.RoomDirectory'] = stubComponent();
diff --git a/test/test-utils.js b/test/test-utils.js
index 06d3c03c49..0b536f5766 100644
--- a/test/test-utils.js
+++ b/test/test-utils.js
@@ -14,7 +14,7 @@ const MatrixEvent = jssdk.MatrixEvent;
  * @param {Mocha.Context} context  The test context
  */
 export function beforeEach(context) {
-    var desc = context.currentTest.fullTitle();
+    const desc = context.currentTest.fullTitle();
 
     console.log();
 
@@ -26,7 +26,7 @@ export function beforeEach(context) {
 
     console.log(desc);
     console.log(new Array(1 + desc.length).join("="));
-};
+}
 
 
 /**
@@ -40,16 +40,16 @@ export function beforeEach(context) {
  * @returns {sinon.Sandbox}; remember to call sandbox.restore afterwards.
  */
 export function stubClient() {
-    var sandbox = sinon.sandbox.create();
+    const sandbox = sinon.sandbox.create();
 
-    var client = createTestClient();
+    const client = createTestClient();
 
     // stub out the methods in MatrixClientPeg
     //
     // 'sandbox.restore()' doesn't work correctly on inherited methods,
     // so we do this for each method
-    var methods = ['get', 'unset', 'replaceUsingCreds'];
-    for (var i = 0; i < methods.length; i++) {
+    const methods = ['get', 'unset', 'replaceUsingCreds'];
+    for (let i = 0; i < methods.length; i++) {
         sandbox.stub(peg, methods[i]);
     }
     // MatrixClientPeg.get() is called a /lot/, so implement it with our own
@@ -128,7 +128,7 @@ export function mkEvent(opts) {
     if (!opts.type || !opts.content) {
         throw new Error("Missing .type or .content =>" + JSON.stringify(opts));
     }
-    var event = {
+    const event = {
         type: opts.type,
         room_id: opts.room,
         sender: opts.user,
@@ -139,14 +139,13 @@ export function mkEvent(opts) {
     };
     if (opts.skey) {
         event.state_key = opts.skey;
-    }
-    else if (["m.room.name", "m.room.topic", "m.room.create", "m.room.join_rules",
+    } else if (["m.room.name", "m.room.topic", "m.room.create", "m.room.join_rules",
          "m.room.power_levels", "m.room.topic",
          "com.example.state"].indexOf(opts.type) !== -1) {
         event.state_key = "";
     }
     return opts.event ? new MatrixEvent(event) : event;
-};
+}
 
 /**
  * Create an m.presence event.
@@ -157,7 +156,7 @@ export function mkPresence(opts) {
     if (!opts.user) {
         throw new Error("Missing user");
     }
-    var event = {
+    const event = {
         event_id: "$" + Math.random() + "-" + Math.random(),
         type: "m.presence",
         sender: opts.user,
@@ -165,11 +164,11 @@ export function mkPresence(opts) {
             avatar_url: opts.url,
             displayname: opts.name,
             last_active_ago: opts.ago,
-            presence: opts.presence || "offline"
-        }
+            presence: opts.presence || "offline",
+        },
     };
     return opts.event ? new MatrixEvent(event) : event;
-};
+}
 
 /**
  * Create an m.room.member event.
@@ -195,19 +194,19 @@ export function mkMembership(opts) {
         throw new Error("Missing .mship => " + JSON.stringify(opts));
     }
     opts.content = {
-        membership: opts.mship
+        membership: opts.mship,
     };
     if (opts.prevMship) {
         opts.prev_content = { membership: opts.prevMship };
     }
     if (opts.name) { opts.content.displayname = opts.name; }
     if (opts.url) { opts.content.avatar_url = opts.url; }
-    let e = mkEvent(opts);
+    const e = mkEvent(opts);
     if (opts.target) {
         e.target = opts.target;
     }
     return e;
-};
+}
 
 /**
  * Create an m.room.message event.
@@ -228,13 +227,13 @@ export function mkMessage(opts) {
     }
     opts.content = {
         msgtype: "m.text",
-        body: opts.msg
+        body: opts.msg,
     };
     return mkEvent(opts);
 }
 
 export function mkStubRoom(roomId = null) {
-    var stubTimeline = { getEvents: () => [] };
+    const stubTimeline = { getEvents: () => [] };
     return {
         roomId,
         getReceiptsForEvent: sinon.stub().returns([]),

From 73e752eda3b95d2af61309cea8a452a4de7df26b Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Wed, 11 Oct 2017 18:32:40 +0100
Subject: [PATCH 095/123] Regenerate .eslintignore.errorfiles

Which has now shrunk by 34 files due to linting with eslint --fix
---
 .eslintignore.errorfiles | 34 ----------------------------------
 1 file changed, 34 deletions(-)

diff --git a/.eslintignore.errorfiles b/.eslintignore.errorfiles
index 50350f983a..f66d2c69d3 100644
--- a/.eslintignore.errorfiles
+++ b/.eslintignore.errorfiles
@@ -1,10 +1,7 @@
 # autogenerated file: run scripts/generate-eslint-error-ignore-file to update.
 
-src/async-components/views/dialogs/EncryptedEventDialog.js
 src/autocomplete/AutocompleteProvider.js
 src/autocomplete/Autocompleter.js
-src/autocomplete/Components.js
-src/autocomplete/DuckDuckGoProvider.js
 src/autocomplete/EmojiProvider.js
 src/autocomplete/UserProvider.js
 src/CallHandler.js
@@ -12,11 +9,9 @@ src/component-index.js
 src/components/structures/ContextualMenu.js
 src/components/structures/CreateRoom.js
 src/components/structures/FilePanel.js
-src/components/structures/InteractiveAuth.js
 src/components/structures/LoggedInView.js
 src/components/structures/login/ForgotPassword.js
 src/components/structures/login/Login.js
-src/components/structures/login/PostRegistration.js
 src/components/structures/login/Registration.js
 src/components/structures/MessagePanel.js
 src/components/structures/NotificationPanel.js
@@ -27,51 +22,32 @@ src/components/structures/TimelinePanel.js
 src/components/structures/UploadBar.js
 src/components/views/avatars/BaseAvatar.js
 src/components/views/avatars/MemberAvatar.js
-src/components/views/avatars/RoomAvatar.js
-src/components/views/create_room/CreateRoomButton.js
-src/components/views/create_room/Presets.js
 src/components/views/create_room/RoomAlias.js
 src/components/views/dialogs/ChatCreateOrReuseDialog.js
 src/components/views/dialogs/DeactivateAccountDialog.js
-src/components/views/dialogs/InteractiveAuthDialog.js
 src/components/views/dialogs/UnknownDeviceDialog.js
-src/components/views/elements/AccessibleButton.js
-src/components/views/elements/ActionButton.js
 src/components/views/elements/AddressSelector.js
-src/components/views/elements/AddressTile.js
 src/components/views/elements/CreateRoomButton.js
 src/components/views/elements/DeviceVerifyButtons.js
 src/components/views/elements/DirectorySearchBox.js
-src/components/views/elements/Dropdown.js
 src/components/views/elements/EditableText.js
-src/components/views/elements/EditableTextContainer.js
 src/components/views/elements/HomeButton.js
-src/components/views/elements/LanguageDropdown.js
 src/components/views/elements/MemberEventListSummary.js
 src/components/views/elements/PowerSelector.js
-src/components/views/elements/ProgressBar.js
 src/components/views/elements/RoomDirectoryButton.js
 src/components/views/elements/SettingsButton.js
 src/components/views/elements/StartChatButton.js
 src/components/views/elements/TintableSvg.js
 src/components/views/elements/UserSelector.js
-src/components/views/login/CaptchaForm.js
-src/components/views/login/CasLogin.js
 src/components/views/login/CountryDropdown.js
-src/components/views/login/CustomServerDialog.js
 src/components/views/login/InteractiveAuthEntryComponents.js
-src/components/views/login/LoginHeader.js
 src/components/views/login/PasswordLogin.js
 src/components/views/login/RegistrationForm.js
 src/components/views/login/ServerConfig.js
-src/components/views/messages/MAudioBody.js
-src/components/views/messages/MessageEvent.js
 src/components/views/messages/MFileBody.js
 src/components/views/messages/MImageBody.js
-src/components/views/messages/MVideoBody.js
 src/components/views/messages/RoomAvatarEvent.js
 src/components/views/messages/TextualBody.js
-src/components/views/messages/TextualEvent.js
 src/components/views/room_settings/AliasSettings.js
 src/components/views/room_settings/ColorSettings.js
 src/components/views/room_settings/UrlPreviewSettings.js
@@ -86,14 +62,11 @@ src/components/views/rooms/MemberList.js
 src/components/views/rooms/MemberTile.js
 src/components/views/rooms/MessageComposer.js
 src/components/views/rooms/MessageComposerInput.js
-src/components/views/rooms/PresenceLabel.js
 src/components/views/rooms/ReadReceiptMarker.js
 src/components/views/rooms/RoomList.js
-src/components/views/rooms/RoomNameEditor.js
 src/components/views/rooms/RoomPreviewBar.js
 src/components/views/rooms/RoomSettings.js
 src/components/views/rooms/RoomTile.js
-src/components/views/rooms/RoomTopicEditor.js
 src/components/views/rooms/SearchableEntityList.js
 src/components/views/rooms/SearchResultTile.js
 src/components/views/rooms/TopUnreadMessagesBar.js
@@ -103,8 +76,6 @@ src/components/views/settings/ChangeAvatar.js
 src/components/views/settings/ChangeDisplayName.js
 src/components/views/settings/ChangePassword.js
 src/components/views/settings/DevicesPanel.js
-src/components/views/settings/DevicesPanelEntry.js
-src/components/views/settings/EnableNotificationsButton.js
 src/ContentMessages.js
 src/HtmlUtils.js
 src/ImageUtils.js
@@ -122,7 +93,6 @@ src/RichText.js
 src/Roles.js
 src/Rooms.js
 src/ScalarAuthClient.js
-src/ScalarMessaging.js
 src/Tinter.js
 src/UiEffects.js
 src/Unread.js
@@ -135,17 +105,13 @@ src/Velociraptor.js
 src/VelocityBounce.js
 src/WhoIsTyping.js
 src/wrappers/withMatrixClient.js
-test/all-tests.js
 test/components/structures/login/Registration-test.js
 test/components/structures/MessagePanel-test.js
 test/components/structures/ScrollPanel-test.js
 test/components/structures/TimelinePanel-test.js
-test/components/stub-component.js
 test/components/views/dialogs/InteractiveAuthDialog-test.js
 test/components/views/elements/MemberEventListSummary-test.js
 test/components/views/login/RegistrationForm-test.js
 test/components/views/rooms/MessageComposerInput-test.js
 test/mock-clock.js
-test/skinned-sdk.js
 test/stores/RoomViewStore-test.js
-test/test-utils.js

From 6ce7eb952a5e21677e232e597b693b20b32106f1 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 11 Oct 2017 18:43:24 -0600
Subject: [PATCH 096/123] Don't send RR or RM when peeking at a room

Fixes vector-im/riot-web#696

Signed-off-by: Travis Ralston <travpc@gmail.com>
---
 src/components/structures/RoomView.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 14273fc95f..f9af4801dc 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -117,6 +117,7 @@ module.exports = React.createClass({
             guestsCanJoin: false,
             canPeek: false,
             showApps: false,
+            isPeeking: false,
 
             // error object, as from the matrix client/server API
             // If we failed to load information about the room,
@@ -266,6 +267,7 @@ module.exports = React.createClass({
                 console.log("Attempting to peek into room %s", roomId);
                 this.setState({
                     peekLoading: true,
+                    isPeeking: true, // this will change to false if peeking fails
                 });
                 MatrixClientPeg.get().peekInRoom(roomId).then((room) => {
                     this.setState({
@@ -290,6 +292,7 @@ module.exports = React.createClass({
         } else if (room) {
             // Stop peeking because we have joined this room previously
             MatrixClientPeg.get().stopPeeking();
+            this.setState({isPeeking: false});
         }
     },
 
@@ -1728,8 +1731,8 @@ module.exports = React.createClass({
             <TimelinePanel ref={this._gatherTimelinePanelRef}
                 timelineSet={this.state.room.getUnfilteredTimelineSet()}
                 showReadReceipts={!UserSettingsStore.getSyncedSetting('hideReadReceipts', false)}
-                manageReadReceipts={true}
-                manageReadMarkers={true}
+                manageReadReceipts={!this.state.isPeeking}
+                manageReadMarkers={!this.state.isPeeking}
                 hidden={hideMessagePanel}
                 highlightedEventId={highlightedEventId}
                 eventId={this.state.initialEventId}

From f3b1baa3c0f021c458b5bc3937171b1e462c505b Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 11 Oct 2017 21:15:00 -0600
Subject: [PATCH 097/123] Suggest to invite people when speaking in an empty
 room

Adds vector-im/riot-web#1053

Signed-off-by: Travis Ralston <travpc@gmail.com>
---
 src/components/structures/RoomStatusBar.js | 30 +++++++++++++++++-
 src/components/structures/RoomView.js      | 36 ++++++++++++++++++++++
 src/i18n/strings/en_EN.json                |  1 +
 3 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/RoomStatusBar.js b/src/components/structures/RoomStatusBar.js
index 3a2ab33db8..cad55351d1 100644
--- a/src/components/structures/RoomStatusBar.js
+++ b/src/components/structures/RoomStatusBar.js
@@ -43,6 +43,10 @@ module.exports = React.createClass({
         // the end of the live timeline.
         atEndOfLiveTimeline: React.PropTypes.bool,
 
+        // This is true when the user is alone in the room, but has also sent a message.
+        // Used to suggest to the user to invite someone
+        sentMessageAndIsAlone: React.PropTypes.bool,
+
         // true if there is an active call in this room (means we show
         // the 'Active Call' text in the status bar if there is nothing
         // more interesting)
@@ -60,6 +64,14 @@ module.exports = React.createClass({
         // 'unsent messages' bar
         onCancelAllClick: React.PropTypes.func,
 
+        // callback for when the user clicks on the 'invite others' button in the
+        // 'you are alone' bar
+        onInviteClick: React.PropTypes.func,
+
+        // callback for when the user clicks on the 'stop warning me' button in the
+        // 'you are alone' bar
+        onStopWarningClick: React.PropTypes.func,
+
         // callback for when the user clicks on the 'scroll to bottom' button
         onScrollToBottomClick: React.PropTypes.func,
 
@@ -140,7 +152,8 @@ module.exports = React.createClass({
             (this.state.usersTyping.length > 0) ||
             this.props.numUnreadMessages ||
             !this.props.atEndOfLiveTimeline ||
-            this.props.hasActiveCall
+            this.props.hasActiveCall ||
+            this.props.sentMessageAndIsAlone
         ) {
             return STATUS_BAR_EXPANDED;
         } else if (this.props.unsentMessageError) {
@@ -305,6 +318,21 @@ module.exports = React.createClass({
             );
         }
 
+        // If you're alone in the room, and have sent a message, suggest to invite someone
+        if (this.props.sentMessageAndIsAlone) {
+            return (
+                <div className="mx_RoomStatusBar_isAlone">
+                    { _tJsx("There's no one else here! Would you like to <a>invite others</a> or <a>stop warning about the empty room</a>?",
+                        [/<a>(.*?)<\/a>/, /<a>(.*?)<\/a>/],
+                        [
+                            (sub) => <a className="mx_RoomStatusBar_resend_link" key="invite" onClick={this.props.onInviteClick}>{ sub }</a>,
+                            (sub) => <a className="mx_RoomStatusBar_resend_link" key="nowarn" onClick={this.props.onStopWarningClick}>{ sub }</a>,
+                        ],
+                    ) }
+                </div>
+            );
+        }
+
         return null;
     },
 
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 14273fc95f..c75b0f61b0 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -117,6 +117,7 @@ module.exports = React.createClass({
             guestsCanJoin: false,
             canPeek: false,
             showApps: false,
+            isAlone: false,
 
             // error object, as from the matrix client/server API
             // If we failed to load information about the room,
@@ -453,6 +454,8 @@ module.exports = React.createClass({
         switch (payload.action) {
             case 'message_send_failed':
             case 'message_sent':
+                this._checkIfAlone(this.state.room);
+                // no break; to intentionally fall through
             case 'message_send_cancelled':
                 this.setState({
                     unsentMessageError: this._getUnsentMessageError(this.state.room),
@@ -732,6 +735,20 @@ module.exports = React.createClass({
         }
     }, 500),
 
+    _checkIfAlone: function(room) {
+        let warnedAboutLonelyRoom = false;
+        if (localStorage) {
+            warnedAboutLonelyRoom = localStorage.getItem('mx_user_alone_warned_' + this.state.room.roomId);
+        }
+        if (warnedAboutLonelyRoom) {
+            if (this.state.isAlone) this.setState({isAlone: false});
+            return;
+        }
+
+        const joinedMembers = room.currentState.getMembers().filter(m => m.membership === "join" || m.membership === "invite");
+        this.setState({isAlone: joinedMembers.length === 1});
+    },
+
     _getUnsentMessageError: function(room) {
         const unsentMessages = this._getUnsentMessages(room);
         if (!unsentMessages.length) return "";
@@ -813,6 +830,22 @@ module.exports = React.createClass({
         Resend.cancelUnsentEvents(this.state.room);
     },
 
+    onInviteButtonClick: function() {
+        // call AddressPickerDialog
+        dis.dispatch({
+            action: 'view_invite',
+            roomId: this.state.room.roomId,
+        });
+        this.setState({isAlone: false}); // there's a good chance they'll invite someone
+    },
+
+    onStopAloneWarningClick: function() {
+        if (localStorage) {
+            localStorage.setItem('mx_user_alone_warned_' + this.state.room.roomId, true);
+        }
+        this.setState({isAlone: false});
+    },
+
     onJoinButtonClicked: function(ev) {
         const cli = MatrixClientPeg.get();
 
@@ -1573,9 +1606,12 @@ module.exports = React.createClass({
                 numUnreadMessages={this.state.numUnreadMessages}
                 unsentMessageError={this.state.unsentMessageError}
                 atEndOfLiveTimeline={this.state.atEndOfLiveTimeline}
+                sentMessageAndIsAlone={this.state.isAlone}
                 hasActiveCall={inCall}
                 onResendAllClick={this.onResendAllClick}
                 onCancelAllClick={this.onCancelAllClick}
+                onInviteClick={this.onInviteButtonClick}
+                onStopWarningClick={this.onStopAloneWarningClick}
                 onScrollToBottomClick={this.jumpToLiveTimeline}
                 onResize={this.onChildResize}
                 onVisible={this.onStatusBarVisible}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index e542253641..7226b5fcd5 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -609,6 +609,7 @@
     "Room": "Room",
     "Copied!": "Copied!",
     "Failed to copy": "Failed to copy",
+    "There's no one else here! Would you like to <a>invite others</a> or <a>stop warning about the empty room</a>?": "There's no one else here! Would you like to <a>invite others</a> or <a>stop warning about the empty room</a>?",
     "Connectivity to the server has been lost.": "Connectivity to the server has been lost.",
     "Sent messages will be stored until your connection has returned.": "Sent messages will be stored until your connection has returned.",
     "<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.": "<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.",

From 36bb8b7dc46a96d12d1df9834d02f541aa55c537 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Thu, 12 Oct 2017 11:31:31 +0100
Subject: [PATCH 098/123] Fix bug that inserted emoji when typing

This was quite simple in the end -- the mouse doens't move, but on some browsers, the autocomplete appearing beneath the mouse would cause the `onMouseOver`, which is not `onMouseMove`.

The fix was to use `onMouseMove`.

Fixes vector-im/riot-web#4974
---
 src/components/views/rooms/Autocomplete.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/Autocomplete.js b/src/components/views/rooms/Autocomplete.js
index beeecf5430..ecc908a02c 100644
--- a/src/components/views/rooms/Autocomplete.js
+++ b/src/components/views/rooms/Autocomplete.js
@@ -233,7 +233,7 @@ export default class Autocomplete extends React.Component {
                 const componentPosition = position;
                 position++;
 
-                const onMouseOver = () => this.setSelection(componentPosition);
+                const onMouseMove = () => this.setSelection(componentPosition);
                 const onClick = () => {
                     this.setSelection(componentPosition);
                     this.onCompletionClicked();
@@ -243,7 +243,7 @@ export default class Autocomplete extends React.Component {
                     key: i,
                     ref: `completion${position - 1}`,
                     className,
-                    onMouseOver,
+                    onMouseMove,
                     onClick,
                 });
             });

From 5955eab29abd3408f3ba6523e7c092f903038e40 Mon Sep 17 00:00:00 2001
From: Carlos Marques <marques.carlos@hotmail.com>
Date: Wed, 11 Oct 2017 17:59:18 +0000
Subject: [PATCH 099/123] Translated using Weblate (Portuguese)

Currently translated at 100.0% (855 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt/
---
 src/i18n/strings/pt.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index 7edd67b0a9..3ff8aa52df 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -5,7 +5,7 @@
     "Account": "Conta",
     "Add email address": "Adicionar endereço de email",
     "Add phone number": "Adicionar número de telefone",
-    "Admin": "Administrador/a",
+    "Admin": "Administrador",
     "Advanced": "Avançado",
     "Algorithm": "Algoritmo",
     "all room members, from the point they are invited.": "todos os membros da sala, a partir de quando foram convidados",
@@ -21,7 +21,7 @@
     "Anyone who knows the room's link, including guests": "Qualquer pessoa que tenha o link da sala, incluindo visitantes",
     "Are you sure you want to leave the room?": "Você tem certeza que deseja sair da sala?",
     "Are you sure you want to reject the invitation?": "Você tem certeza que deseja rejeitar este convite?",
-    "Are you sure you want to upload the following files?": "Você tem certeza que deseja enviar os seguintes arquivos?",
+    "Are you sure you want to upload the following files?": "Tem a certeza que quer enviar os seguintes ficheiros?",
     "banned": "baniu",
     "Banned users": "Usuárias/os banidas/os",
     "Bans user with given id": "Banir usuários com o identificador informado",
@@ -88,7 +88,7 @@
     "Failed to send email: ": "Falha ao tentar enviar email",
     "Failed to set avatar.": "Falha ao tentar definir foto do perfil.",
     "Failed to unban": "Não foi possível desfazer o banimento",
-    "Failed to upload file": "Falha ao enviar o arquivo",
+    "Failed to upload file": "Falha ao enviar o ficheiro",
     "favourite": "favoritar",
     "Favourite": "Favorito",
     "Favourites": "Favoritos",
@@ -329,7 +329,7 @@
     "%(senderName)s ended the call.": "%(senderName)s finalizou a chamada.",
     "Existing Call": "Chamada em andamento",
     "Failed to lookup current room": "Não foi possível buscar na sala atual",
-    "Failed to send email": "Não foi possível enviar email",
+    "Failed to send email": "Falha ao enviar email",
     "Failed to send request.": "Não foi possível mandar requisição.",
     "Failed to set up conference call": "Não foi possível montar a chamada de conferência",
     "Failed to verify email address: make sure you clicked the link in the email": "Não foi possível verificar o endereço de email: verifique se você realmente clicou no link que está no seu email",
@@ -438,7 +438,7 @@
     "Friday": "Sexta-feira",
     "Saturday": "Sábado",
     "%(oneUser)schanged their avatar": "%(oneUser)salterou sua imagem pública",
-    "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Uma mensagem de texto foi enviada para +%(msisdn)s. Gentileza entrar com o código de verificação que contém",
+    "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Uma mensagem de texto foi enviada para +%(msisdn)s. Introduza o código de verificação nela contido",
     "%(items)s and %(remaining)s others": "%(items)s e %(remaining)s outros",
     "%(items)s and one other": "%(items)s e um outro",
     "%(items)s and %(lastItem)s": "%(items)s e %(lastItem)s",
@@ -465,7 +465,7 @@
     "Devices": "Dispositivos",
     "Direct chats": "Conversas pessoais",
     "Disinvite": "Desconvidar",
-    "Don't send typing notifications": "Não enviar notificação de estar digitando",
+    "Don't send typing notifications": "Não enviar notificação de escrita",
     "Download %(text)s": "Baixar %(text)s",
     "Enable encryption": "Habilitar criptografia",
     "Enter Code": "Entre com o código",
@@ -729,9 +729,9 @@
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s alterou a imagem da sala %(roomName)s",
     "$senderDisplayName changed the room avatar to <img/>": "$senderDisplayName alterou a imagem da sala para <img/>",
     "Missing Media Permissions, click here to request.": "Faltam permissões para uso de mídia no seu computador. Clique aqui para solicitá-las.",
-    "No Microphones detected": "Não foi detectado nenhum microfone",
-    "No Webcams detected": "Não foi detectada nenhuma Webcam",
-    "No media permissions": "Não há permissões de uso de vídeo/áudio no seu navegador",
+    "No Microphones detected": "Não foi detetado nenhum microfone",
+    "No Webcams detected": "Não foi detetada nenhuma Webcam",
+    "No media permissions": "Não há permissões para o uso de vídeo/áudio no seu navegador",
     "You may need to manually permit Riot to access your microphone/webcam": "Você talvez precise autorizar manualmente que o Riot acesse seu microfone e webcam",
     "Default Device": "Dispositivo padrão",
     "Microphone": "Microfone",

From f1032bb1150db5e20b6979fe8e52ad52b052db5a Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 12 Oct 2017 07:05:09 -0600
Subject: [PATCH 100/123] Set isPeeking to false if peeking failed

Signed-off-by: Travis Ralston <travpc@gmail.com>
---
 src/components/structures/RoomView.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index f9af4801dc..6ecd7cbf2e 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -283,6 +283,7 @@ module.exports = React.createClass({
                         // This is fine: the room just isn't peekable (we assume).
                         this.setState({
                             peekLoading: false,
+                            isPeeking: false,
                         });
                     } else {
                         throw err;

From df7f1b46bf29141fd4ac60cfcf7fccff2cf9c3a7 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 12 Oct 2017 07:24:20 -0600
Subject: [PATCH 101/123] Stop peeking if anything went wrong, not just
 explicit failure

Signed-off-by: Travis Ralston <travpc@gmail.com>
---
 src/components/structures/RoomView.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 6ecd7cbf2e..3d3537e067 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -276,6 +276,11 @@ module.exports = React.createClass({
                     });
                     this._onRoomLoaded(room);
                 }, (err) => {
+                    // Stop peeking if anything went wrong
+                    this.setState({
+                        isPeeking: false,
+                    });
+                    
                     // This won't necessarily be a MatrixError, but we duck-type
                     // here and say if it's got an 'errcode' key with the right value,
                     // it means we can't peek.
@@ -283,7 +288,6 @@ module.exports = React.createClass({
                         // This is fine: the room just isn't peekable (we assume).
                         this.setState({
                             peekLoading: false,
-                            isPeeking: false,
                         });
                     } else {
                         throw err;

From 55cdbe6655b47441f02d0932e6ec4bd68ac38974 Mon Sep 17 00:00:00 2001
From: Kevin Brubeck Unhammer <unhammer+dill@mm.st>
Date: Thu, 12 Oct 2017 10:49:48 +0000
Subject: [PATCH 102/123] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 0.1% (1 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nb_NO/
---
 src/i18n/strings/nb_NO.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/nb_NO.json b/src/i18n/strings/nb_NO.json
index 0967ef424b..4d52e606eb 100644
--- a/src/i18n/strings/nb_NO.json
+++ b/src/i18n/strings/nb_NO.json
@@ -1 +1,3 @@
-{}
+{
+    "Room directory": "Romkatalog"
+}

From e50478aa1d8d2d8cd7358a1c0c8d2ae323f1fe98 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 12 Oct 2017 17:03:38 +0100
Subject: [PATCH 103/123] enable/disable features in config.json

As per https://docs.google.com/document/d/1Kn-mz2dDce9Cqc4oUTl5yJXGvmTlky1_KezuwUg58x0/edit#

Replaces:
 * enableLabs setting
 * 'override' flag in labs
 * 'default' flag in labs

Un-feature-flags matrix apps since this was now overidden to be
enabled.
---
 src/UserSettingsStore.js                      | 91 ++++++++++---------
 src/components/structures/LoggedInView.js     |  2 +-
 src/components/structures/UserSettings.js     | 28 ++----
 src/components/views/rooms/AuxPanel.js        | 16 ++--
 src/components/views/rooms/MessageComposer.js | 23 +++--
 5 files changed, 76 insertions(+), 84 deletions(-)

diff --git a/src/UserSettingsStore.js b/src/UserSettingsStore.js
index 9b7554bda2..ef111c5c62 100644
--- a/src/UserSettingsStore.js
+++ b/src/UserSettingsStore.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2017 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -17,33 +18,42 @@ limitations under the License.
 import Promise from 'bluebird';
 import MatrixClientPeg from './MatrixClientPeg';
 import Notifier from './Notifier';
-import { _t } from './languageHandler';
+import { _t, _td } from './languageHandler';
+import SdkConfig from './SdkConfig';
 
 /*
  * TODO: Make things use this. This is all WIP - see UserSettings.js for usage.
  */
 
+const FEATURES = [
+    {
+        id: 'feature_groups',
+        name: _td("Groups"),
+    },
+];
+
 export default {
-    LABS_FEATURES: [
-        {
-            name: "-",
-            id: 'matrix_apps',
-            default: true,
+    getLabsFeatures() {
+        const featuresConfig = SdkConfig.get()['features'] || {};
 
-            // XXX: Always use default, ignore localStorage and remove from labs
-            override: true,
-        },
-        {
-            name: "-",
-            id: 'feature_groups',
-            default: false,
-        },
-    ],
+        return FEATURES.filter((f) => {
+            const sdkConfigValue = featuresConfig[f.id];
+            if (!['enable', 'disable'].includes(sdkConfigValue)) {
+                return true;
+            }
+        }).map((f) => {
+            return f.id;
+        });
+    },
 
-    // horrible but it works. The locality makes this somewhat more palatable.
-    doTranslations: function() {
-        this.LABS_FEATURES[0].name = _t("Matrix Apps");
-        this.LABS_FEATURES[1].name = _t("Groups");
+    translatedNameForFeature(featureId) {
+        const feature = FEATURES.filter((f) => {
+            return f.id === featureId;
+        })[0];
+
+        if (feature === undefined) return null;
+
+        return _t(feature.name);
     },
 
     loadProfileInfo: function() {
@@ -180,33 +190,30 @@ export default {
         localStorage.setItem('mx_local_settings', JSON.stringify(settings));
     },
 
-    getFeatureById(feature: string) {
-        for (let i = 0; i < this.LABS_FEATURES.length; i++) {
-            const f = this.LABS_FEATURES[i];
-            if (f.id === feature) {
-                return f;
-            }
-        }
-        return null;
-    },
-
     isFeatureEnabled: function(featureId: string): boolean {
-        // Disable labs for guests.
-        if (MatrixClientPeg.get().isGuest()) return false;
+        const featuresConfig = SdkConfig.get()['features'];
 
-        const feature = this.getFeatureById(featureId);
-        if (!feature) {
-            console.warn(`Unknown feature "${featureId}"`);
+        let sdkConfigValue = 'labs';
+        if (featuresConfig && featuresConfig[featureId] !== undefined) {
+            sdkConfigValue = featuresConfig[featureId];
+        }
+
+        if (sdkConfigValue === 'enable') {
+            return true;
+        } else if (sdkConfigValue === 'enable') {
+            return false;
+        } else if (sdkConfigValue === 'labs') {
+            if (!MatrixClientPeg.get().isGuest()) {
+                const userValue = localStorage.getItem(`mx_labs_feature_${featureId}`);
+                if (userValue !== null) {
+                    return userValue === 'true';
+                }
+            }
+            return false;
+        } else {
+            console.warn(`Unknown features config for ${featureId}: ${sdkConfigValue}`);
             return false;
         }
-        // Return the default if this feature has an override to be the default value or
-        // if the feature has never been toggled and is therefore not in localStorage
-        if (Object.keys(feature).includes('override') ||
-            localStorage.getItem(`mx_labs_feature_${featureId}`) === null
-        ) {
-            return feature.default;
-        }
-        return localStorage.getItem(`mx_labs_feature_${featureId}`) === 'true';
     },
 
     setFeatureEnabled: function(featureId: string, enabled: boolean) {
diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index 49522747cd..7e6fc05599 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -1,6 +1,7 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2017 Vector Creations Ltd
+Copyright 2017 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -250,7 +251,6 @@ export default React.createClass({
                 page_element = <UserSettings
                     onClose={this.props.onUserSettingsClose}
                     brand={this.props.config.brand}
-                    enableLabs={this.props.config.enableLabs}
                     referralBaseUrl={this.props.config.referralBaseUrl}
                     teamToken={this.props.teamToken}
                 />;
diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 171a0dd0fd..d83434f5a8 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -1,6 +1,7 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2017 Vector Creations Ltd
+Copyright 2017 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -212,9 +213,6 @@ module.exports = React.createClass({
         // The brand string given when creating email pushers
         brand: React.PropTypes.string,
 
-        // True to show the 'labs' section of experimental features
-        enableLabs: React.PropTypes.bool,
-
         // The base URL to use in the referral link. Defaults to window.location.origin.
         referralBaseUrl: React.PropTypes.string,
 
@@ -226,7 +224,6 @@ module.exports = React.createClass({
     getDefaultProps: function() {
         return {
             onClose: function() {},
-            enableLabs: true,
         };
     },
 
@@ -923,34 +920,25 @@ module.exports = React.createClass({
     },
 
     _renderLabs: function() {
-        // default to enabled if undefined
-        if (this.props.enableLabs === false) return null;
-        UserSettingsStore.doTranslations();
-
         const features = [];
-        UserSettingsStore.LABS_FEATURES.forEach((feature) => {
-            // This feature has an override and will be set to the default, so do not
-            // show it here.
-            if (feature.override) {
-                return;
-            }
+        UserSettingsStore.getLabsFeatures().forEach((featureId) => {
             // TODO: this ought to be a separate component so that we don't need
             // to rebind the onChange each time we render
             const onChange = (e) => {
-                UserSettingsStore.setFeatureEnabled(feature.id, e.target.checked);
+                UserSettingsStore.setFeatureEnabled(featureId, e.target.checked);
                 this.forceUpdate();
             };
 
             features.push(
-                <div key={feature.id} className="mx_UserSettings_toggle">
+                <div key={featureId} className="mx_UserSettings_toggle">
                     <input
                         type="checkbox"
-                        id={feature.id}
-                        name={feature.id}
-                        defaultChecked={UserSettingsStore.isFeatureEnabled(feature.id)}
+                        id={featureId}
+                        name={featureId}
+                        defaultChecked={UserSettingsStore.isFeatureEnabled(featureId)}
                         onChange={onChange}
                     />
-                    <label htmlFor={feature.id}>{ feature.name }</label>
+                    <label htmlFor={featureId}>{ UserSettingsStore.translatedNameForFeature(featureId) }</label>
                 </div>);
         });
 
diff --git a/src/components/views/rooms/AuxPanel.js b/src/components/views/rooms/AuxPanel.js
index 726ec7ff1d..271b0e48db 100644
--- a/src/components/views/rooms/AuxPanel.js
+++ b/src/components/views/rooms/AuxPanel.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2017 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -128,15 +129,12 @@ module.exports = React.createClass({
             />
         );
 
-        let appsDrawer = null;
-        if(UserSettingsStore.isFeatureEnabled('matrix_apps')) {
-            appsDrawer = <AppsDrawer ref="appsDrawer"
-                room={this.props.room}
-                userId={this.props.userId}
-                maxHeight={this.props.maxHeight}
-                showApps={this.props.showApps}
-            />;
-        }
+        const appsDrawer = <AppsDrawer ref="appsDrawer"
+            room={this.props.room}
+            userId={this.props.userId}
+            maxHeight={this.props.maxHeight}
+            showApps={this.props.showApps}
+        />;
 
         return (
             <div className="mx_RoomView_auxPanel" style={{maxHeight: this.props.maxHeight}} >
diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 00659520c3..8e27520d89 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2017 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -285,18 +286,16 @@ export default class MessageComposer extends React.Component {
         }
 
         // Apps
-        if (UserSettingsStore.isFeatureEnabled('matrix_apps')) {
-            if (this.props.showApps) {
-                hideAppsButton =
-                    <div key="controls_hide_apps" className="mx_MessageComposer_apps" onClick={this.onHideAppsClick} title={_t("Hide Apps")}>
-                        <TintableSvg src="img/icons-hide-apps.svg" width="35" height="35" />
-                    </div>;
-            } else {
-                showAppsButton =
-                    <div key="show_apps" className="mx_MessageComposer_apps" onClick={this.onShowAppsClick} title={_t("Show Apps")}>
-                        <TintableSvg src="img/icons-show-apps.svg" width="35" height="35" />
-                    </div>;
-            }
+        if (this.props.showApps) {
+            hideAppsButton =
+                <div key="controls_hide_apps" className="mx_MessageComposer_apps" onClick={this.onHideAppsClick} title={_t("Hide Apps")}>
+                    <TintableSvg src="img/icons-hide-apps.svg" width="35" height="35" />
+                </div>;
+        } else {
+            showAppsButton =
+                <div key="show_apps" className="mx_MessageComposer_apps" onClick={this.onShowAppsClick} title={_t("Show Apps")}>
+                    <TintableSvg src="img/icons-show-apps.svg" width="35" height="35" />
+                </div>;
         }
 
         const canSendMessages = this.props.room.currentState.maySendMessage(

From 20f9d71782fb237c06bea9f400c0545d26914b21 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 12 Oct 2017 17:27:09 +0100
Subject: [PATCH 104/123] oops

---
 src/UserSettingsStore.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/UserSettingsStore.js b/src/UserSettingsStore.js
index ef111c5c62..02b9b649b5 100644
--- a/src/UserSettingsStore.js
+++ b/src/UserSettingsStore.js
@@ -200,7 +200,7 @@ export default {
 
         if (sdkConfigValue === 'enable') {
             return true;
-        } else if (sdkConfigValue === 'enable') {
+        } else if (sdkConfigValue === 'disable') {
             return false;
         } else if (sdkConfigValue === 'labs') {
             if (!MatrixClientPeg.get().isGuest()) {

From ef3df3e3fafe2397b2157b081f80eda8f4d8896a Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 12 Oct 2017 17:28:14 +0100
Subject: [PATCH 105/123] comment

---
 src/UserSettingsStore.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/UserSettingsStore.js b/src/UserSettingsStore.js
index 02b9b649b5..0e9d58b270 100644
--- a/src/UserSettingsStore.js
+++ b/src/UserSettingsStore.js
@@ -204,6 +204,8 @@ export default {
             return false;
         } else if (sdkConfigValue === 'labs') {
             if (!MatrixClientPeg.get().isGuest()) {
+                // Make it explicit that guests get the defaults (although they shouldn't
+                // have been able to ever toggle the flags anyway)
                 const userValue = localStorage.getItem(`mx_labs_feature_${featureId}`);
                 if (userValue !== null) {
                     return userValue === 'true';

From 65eacff3d3fbe3b30c9cba8812af5fbb7193132f Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 12 Oct 2017 17:28:53 +0100
Subject: [PATCH 106/123] redundant code is redundant

---
 src/UserSettingsStore.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/UserSettingsStore.js b/src/UserSettingsStore.js
index 0e9d58b270..050e28e5b7 100644
--- a/src/UserSettingsStore.js
+++ b/src/UserSettingsStore.js
@@ -207,9 +207,7 @@ export default {
                 // Make it explicit that guests get the defaults (although they shouldn't
                 // have been able to ever toggle the flags anyway)
                 const userValue = localStorage.getItem(`mx_labs_feature_${featureId}`);
-                if (userValue !== null) {
-                    return userValue === 'true';
-                }
+                return userValue === 'true';
             }
             return false;
         } else {

From ff3a2c1807363f50c8360eaebfe7347b1274d4e2 Mon Sep 17 00:00:00 2001
From: David Baker <github@dbkr.co.uk>
Date: Thu, 12 Oct 2017 16:36:41 +0000
Subject: [PATCH 107/123] Translated using Weblate (English (United States))

Currently translated at 99.6% (852 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/en_US/
---
 src/i18n/strings/en_US.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index 88e7c64184..5236e959d4 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -861,6 +861,6 @@
     "Verifies a user, device, and pubkey tuple": "Verifies a user, device, and pubkey tuple",
     "It is currently only possible to create groups on your own home server: use a group ID ending with %(domain)s": "It is currently only possible to create groups on your own home server: use a group ID ending with %(domain)s",
     "To join an existing group you'll have to know its group identifier; this will look something like <i>+example:matrix.org</i>.": "To join an existing group you'll have to know its group identifier; this will look something like <i>+example:matrix.org</i>.",
-    "%(weekDayName)s, %(monthName)s %(day)s": "print \"<i>fdsafsdsad\"",
+    "%(weekDayName)s, %(monthName)s %(day)s": "%(weekDayName)s, %(monthName)s %(day)s",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s"
 }

From 710c952428fff4682dfb51174d643695c46c6432 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 12 Oct 2017 18:45:04 +0100
Subject: [PATCH 108/123] Make features disabled by default

So we can then put them in labs on /develop & others can enable
them as desired.
---
 src/UserSettingsStore.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/UserSettingsStore.js b/src/UserSettingsStore.js
index 050e28e5b7..1071448b5b 100644
--- a/src/UserSettingsStore.js
+++ b/src/UserSettingsStore.js
@@ -193,7 +193,7 @@ export default {
     isFeatureEnabled: function(featureId: string): boolean {
         const featuresConfig = SdkConfig.get()['features'];
 
-        let sdkConfigValue = 'labs';
+        let sdkConfigValue = 'disable';
         if (featuresConfig && featuresConfig[featureId] !== undefined) {
             sdkConfigValue = featuresConfig[featureId];
         }

From cd64c9bcbbd171c8cf0784d148e174d719837150 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 13 Oct 2017 11:48:44 +0100
Subject: [PATCH 109/123] Don't show labs features by default

Previous PR disabled them but still showed the (broken) option
---
 src/UserSettingsStore.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/UserSettingsStore.js b/src/UserSettingsStore.js
index 1071448b5b..0acc6e5634 100644
--- a/src/UserSettingsStore.js
+++ b/src/UserSettingsStore.js
@@ -38,7 +38,8 @@ export default {
 
         return FEATURES.filter((f) => {
             const sdkConfigValue = featuresConfig[f.id];
-            if (!['enable', 'disable'].includes(sdkConfigValue)) {
+
+            if (sdkConfigValue === 'labs') {
                 return true;
             }
         }).map((f) => {

From f94873bd5dad0eed04f7d70786b7bf265a9f57d2 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 13 Oct 2017 13:58:24 +0100
Subject: [PATCH 110/123] Honour the (now legacy) enableLabs flag

---
 src/UserSettingsStore.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/UserSettingsStore.js b/src/UserSettingsStore.js
index 1071448b5b..7bcef8b7be 100644
--- a/src/UserSettingsStore.js
+++ b/src/UserSettingsStore.js
@@ -36,9 +36,16 @@ export default {
     getLabsFeatures() {
         const featuresConfig = SdkConfig.get()['features'] || {};
 
+        // The old flag: honourned for backwards compat
+        const enableLabs = SdkConfig.get()['enableLabs'];
+
         return FEATURES.filter((f) => {
+            if (enableLabs) {
+                return true;
+            }
+
             const sdkConfigValue = featuresConfig[f.id];
-            if (!['enable', 'disable'].includes(sdkConfigValue)) {
+            if (sdkConfigValue === 'labs') {
                 return true;
             }
         }).map((f) => {

From 4e793d4f68ad5c02af02330cef16cedb210b82de Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 13 Oct 2017 14:11:21 +0100
Subject: [PATCH 111/123] skip unnecessary filter

---
 src/UserSettingsStore.js | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/UserSettingsStore.js b/src/UserSettingsStore.js
index 7bcef8b7be..0a992dfbad 100644
--- a/src/UserSettingsStore.js
+++ b/src/UserSettingsStore.js
@@ -39,16 +39,18 @@ export default {
         // The old flag: honourned for backwards compat
         const enableLabs = SdkConfig.get()['enableLabs'];
 
-        return FEATURES.filter((f) => {
-            if (enableLabs) {
-                return true;
-            }
-
-            const sdkConfigValue = featuresConfig[f.id];
-            if (sdkConfigValue === 'labs') {
-                return true;
-            }
-        }).map((f) => {
+        let labsFeatures;
+        if (enableLabs) {
+            labsFeatures = FEATURES;
+        } else {
+            labsFeatures.filter((f) => {
+                const sdkConfigValue = featuresConfig[f.id];
+                if (sdkConfigValue === 'labs') {
+                    return true;
+                }
+            });
+        }
+        return labsFeatures.map((f) => {
             return f.id;
         });
     },

From 5214a867db5902491f90cbb5e34d97447363e5ca Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 13 Oct 2017 14:43:26 +0100
Subject: [PATCH 112/123] Fix labs again

---
 src/UserSettingsStore.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/UserSettingsStore.js b/src/UserSettingsStore.js
index 0a992dfbad..d6b32fab5e 100644
--- a/src/UserSettingsStore.js
+++ b/src/UserSettingsStore.js
@@ -43,7 +43,7 @@ export default {
         if (enableLabs) {
             labsFeatures = FEATURES;
         } else {
-            labsFeatures.filter((f) => {
+            labsFeatures = FEATURES.filter((f) => {
                 const sdkConfigValue = featuresConfig[f.id];
                 if (sdkConfigValue === 'labs') {
                     return true;

From d0759a537bfdde4095ba0955cee8d5d1a7824176 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 13 Oct 2017 16:06:17 +0100
Subject: [PATCH 113/123] Fix the enableLabs flag, again

We were showing the options but ignoring them
---
 src/UserSettingsStore.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/UserSettingsStore.js b/src/UserSettingsStore.js
index d6b32fab5e..6f689735a7 100644
--- a/src/UserSettingsStore.js
+++ b/src/UserSettingsStore.js
@@ -202,7 +202,10 @@ export default {
     isFeatureEnabled: function(featureId: string): boolean {
         const featuresConfig = SdkConfig.get()['features'];
 
-        let sdkConfigValue = 'disable';
+        // The old flag: honourned for backwards compat
+        const enableLabs = SdkConfig.get()['enableLabs'];
+
+        let sdkConfigValue = enableLabs ? 'labs' : 'disable';
         if (featuresConfig && featuresConfig[featureId] !== undefined) {
             sdkConfigValue = featuresConfig[featureId];
         }

From e5c8e3e7ad32794ad244f56cbffad9d76546f4b5 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 13 Oct 2017 20:57:15 -0600
Subject: [PATCH 114/123] Add option to unset room avatar

Signed-off-by: Travis Ralston <travpc@gmail.com>
---
 src/components/views/rooms/RoomHeader.js      | 12 ++++++++--
 src/components/views/settings/ChangeAvatar.js | 22 +++++++++++++++++++
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/RoomHeader.js b/src/components/views/rooms/RoomHeader.js
index 42cbb90cd9..3d2dee9e64 100644
--- a/src/components/views/rooms/RoomHeader.js
+++ b/src/components/views/rooms/RoomHeader.js
@@ -129,6 +129,10 @@ module.exports = React.createClass({
         }).done();
     },
 
+    onAvatarRemoveClick: function() {
+        MatrixClientPeg.get().sendStateEvent(this.props.room.roomId, 'm.room.avatar', {url: null}, '');
+    },
+
     onShowRhsClick: function(ev) {
         dis.dispatch({ action: 'show_right_panel' });
     },
@@ -268,11 +272,15 @@ module.exports = React.createClass({
                     <div className="mx_RoomHeader_avatarPicker_edit">
                         <label htmlFor="avatarInput" ref="file_label">
                             <img src="img/camera.svg"
-                                alt={_t("Upload avatar")} title={_t("Upload avatar")}
-                                width="17" height="15" />
+                                 alt={_t("Upload avatar")} title={_t("Upload avatar")}
+                                 width="17" height="15" />
                         </label>
                         <input id="avatarInput" type="file" onChange={this.onAvatarSelected} />
                     </div>
+                    <div className="mx_RoomHeader_avatarPicker_remove" onClick={this.onAvatarRemoveClick}>
+                        <img src="img/cancel.svg" width="10"
+                             alt={_t("Remove avatar")} title={_t("Remove avatar")} />
+                    </div>
                 </div>
             );
         } else if (this.props.room || (this.props.oobData && this.props.oobData.name)) {
diff --git a/src/components/views/settings/ChangeAvatar.js b/src/components/views/settings/ChangeAvatar.js
index b3204ab86e..7d8b1d9534 100644
--- a/src/components/views/settings/ChangeAvatar.js
+++ b/src/components/views/settings/ChangeAvatar.js
@@ -53,6 +53,10 @@ module.exports = React.createClass({
         };
     },
 
+    componentWillMount: function() {
+        MatrixClientPeg.get().on("RoomState.events", this.onRoomStateEvents);
+    },
+
     componentWillReceiveProps: function(newProps) {
         if (this.avatarSet) {
             // don't clobber what the user has just set
@@ -63,6 +67,24 @@ module.exports = React.createClass({
         });
     },
 
+    componentWillUnmount: function() {
+        if (MatrixClientPeg.get()) {
+            MatrixClientPeg.get().removeListener("RoomState.events", this.onRoomStateEvents);
+        }
+    },
+
+    onRoomStateEvents: function(ev) {
+        if (ev.getRoomId() !== this.props.room.roomId || ev.getType() !== 'm.room.avatar'
+            || ev.getSender() !== MatrixClientPeg.get().getUserId()) {
+            return;
+        }
+
+        if (!ev.getContent().url) {
+            this.avatarSet = false;
+            this.setState({}); // force update
+        }
+    },
+
     setAvatarFromFile: function(file) {
         let newUrl = null;
 

From 6e7f0d649b17cbd9150d2c37976b9253e6027a10 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 13 Oct 2017 21:13:32 -0600
Subject: [PATCH 115/123] Add option to unset your own avatar

Signed-off-by: Travis Ralston <travpc@gmail.com>
---
 src/components/structures/UserSettings.js     | 11 ++++++++++-
 src/components/views/settings/ChangeAvatar.js |  4 ++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index d83434f5a8..d24ff5ad4c 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -423,6 +423,11 @@ module.exports = React.createClass({
         });
     },
 
+    onAvatarRemoveClick: function() {
+        MatrixClientPeg.get().setAvatarUrl(null);
+        this.setState({avatarUrl: null}); // the avatar update will complete async for us
+    },
+
     onLogoutClicked: function(ev) {
         const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
         Modal.createTrackedDialog('Logout E2E Export', '', QuestionDialog, {
@@ -1318,7 +1323,11 @@ module.exports = React.createClass({
                     </div>
 
                     <div className="mx_UserSettings_avatarPicker">
-                        <div onClick={this.onAvatarPickerClick}>
+                        <div className="mx_UserSettings_avatarPicker_remove" onClick={this.onAvatarRemoveClick}>
+                            <img src="img/cancel.svg" width="15"
+                                 alt={_t("Remove avatar")} title={_t("Remove avatar")} />
+                        </div>
+                        <div onClick={this.onAvatarPickerClick} className="mx_UserSettings_avatarPicker_imgContainer">
                             <ChangeAvatar ref="changeAvatar" initialAvatarUrl={avatarUrl}
                                 showUploadSection={false} className="mx_UserSettings_avatarPicker_img" />
                         </div>
diff --git a/src/components/views/settings/ChangeAvatar.js b/src/components/views/settings/ChangeAvatar.js
index 7d8b1d9534..a363dc2c60 100644
--- a/src/components/views/settings/ChangeAvatar.js
+++ b/src/components/views/settings/ChangeAvatar.js
@@ -74,6 +74,10 @@ module.exports = React.createClass({
     },
 
     onRoomStateEvents: function(ev) {
+        if (!this.props.room) {
+            return;
+        }
+
         if (ev.getRoomId() !== this.props.room.roomId || ev.getType() !== 'm.room.avatar'
             || ev.getSender() !== MatrixClientPeg.get().getUserId()) {
             return;

From 97ebd271751b8c61778d7b040f417b416abfb9b9 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 13 Oct 2017 23:08:41 -0600
Subject: [PATCH 116/123] Add missing translation

Signed-off-by: Travis Ralston <travpc@gmail.com>
---
 src/i18n/strings/en_EN.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index ed07e503ce..abb5cf40a0 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -632,6 +632,7 @@
     "quote": "quote",
     "bullet": "bullet",
     "numbullet": "numbullet",
+    "Remove avatar": "Remove avatar",
     "%(severalUsers)sjoined %(repeats)s times": "%(severalUsers)sjoined %(repeats)s times",
     "%(oneUser)sjoined %(repeats)s times": "%(oneUser)sjoined %(repeats)s times",
     "%(severalUsers)sjoined": "%(severalUsers)sjoined",

From a0004399480cffcab14377534ce5f47743bf7b55 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 14 Oct 2017 17:09:30 +0100
Subject: [PATCH 117/123] pass search query to filter fn in _updateList

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/MemberList.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/MemberList.js b/src/components/views/rooms/MemberList.js
index 0713a4ae8a..781126c543 100644
--- a/src/components/views/rooms/MemberList.js
+++ b/src/components/views/rooms/MemberList.js
@@ -146,8 +146,8 @@ module.exports = React.createClass({
         const newState = {
             members: this.roomMembers(),
         };
-        newState.filteredJoinedMembers = this._filterMembers(newState.members, 'join');
-        newState.filteredInvitedMembers = this._filterMembers(newState.members, 'invite');
+        newState.filteredJoinedMembers = this._filterMembers(newState.members, 'join', this.state.searchQuery);
+        newState.filteredInvitedMembers = this._filterMembers(newState.members, 'invite', this.state.searchQuery);
         this.setState(newState);
     }, 500),
 

From 6ad8532bedc5ef881a39770e4ff320f3384b85e0 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 14 Oct 2017 17:09:58 +0100
Subject: [PATCH 118/123] lowerCase query so that searching for `Erik` will
 actually find `Erik`..

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/MemberList.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/views/rooms/MemberList.js b/src/components/views/rooms/MemberList.js
index 781126c543..4789dda192 100644
--- a/src/components/views/rooms/MemberList.js
+++ b/src/components/views/rooms/MemberList.js
@@ -302,6 +302,7 @@ module.exports = React.createClass({
             const m = this.memberDict[userId];
 
             if (query) {
+                query = query.toLowerCase();
                 const matchesName = m.name.toLowerCase().indexOf(query) !== -1;
                 const matchesId = m.userId.toLowerCase().indexOf(query) !== -1;
 
@@ -399,7 +400,7 @@ module.exports = React.createClass({
             <form autoComplete="off">
                 <input className="mx_MemberList_query" id="mx_MemberList_query" type="text"
                         onChange={this.onSearchQueryChanged} value={this.state.searchQuery}
-                        placeholder={_t('Filter room members')} />
+                        placeholder={ _t('Filter room members') } />
             </form>
         );
 
@@ -412,9 +413,9 @@ module.exports = React.createClass({
                             getChildren={this._getChildrenJoined}
                             getChildCount={this._getChildCountJoined}
                     />
-                    { invitedSection }
+                    {invitedSection}
                 </GeminiScrollbar>
             </div>
         );
-    },
+    }
 });

From e79f9ef0115fcee0d078e8eb88c51d574587ed68 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 14 Oct 2017 17:10:51 +0100
Subject: [PATCH 119/123] === > ==

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/MemberList.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/MemberList.js b/src/components/views/rooms/MemberList.js
index 4789dda192..f4d81d19f0 100644
--- a/src/components/views/rooms/MemberList.js
+++ b/src/components/views/rooms/MemberList.js
@@ -187,7 +187,7 @@ module.exports = React.createClass({
             const user_id = all_user_ids[i];
             const m = all_members[user_id];
 
-            if (m.membership == 'join' || m.membership == 'invite') {
+            if (m.membership === 'join' || m.membership === 'invite') {
                 if ((ConferenceHandler && !ConferenceHandler.isConferenceUser(user_id)) || !ConferenceHandler) {
                     to_display.push(user_id);
                     ++count;
@@ -311,7 +311,7 @@ module.exports = React.createClass({
                 }
             }
 
-            return m.membership == membership;
+            return m.membership === membership;
         });
     },
 

From b0b7472901f8840599d86c21cb3fcb99887cc643 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 14 Oct 2017 17:14:17 +0100
Subject: [PATCH 120/123] undo bad merge

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/MemberList.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/views/rooms/MemberList.js b/src/components/views/rooms/MemberList.js
index f4d81d19f0..04b6089559 100644
--- a/src/components/views/rooms/MemberList.js
+++ b/src/components/views/rooms/MemberList.js
@@ -400,7 +400,7 @@ module.exports = React.createClass({
             <form autoComplete="off">
                 <input className="mx_MemberList_query" id="mx_MemberList_query" type="text"
                         onChange={this.onSearchQueryChanged} value={this.state.searchQuery}
-                        placeholder={ _t('Filter room members') } />
+                        placeholder={_t('Filter room members')} />
             </form>
         );
 
@@ -413,9 +413,9 @@ module.exports = React.createClass({
                             getChildren={this._getChildrenJoined}
                             getChildCount={this._getChildCountJoined}
                     />
-                    {invitedSection}
+                    { invitedSection }
                 </GeminiScrollbar>
             </div>
         );
-    }
+    },
 });

From c1edc0c32e72307669291370458f343861b3173c Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 14 Oct 2017 19:40:45 +0100
Subject: [PATCH 121/123] add option to disable BigEmoji

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/HtmlUtils.js                             | 7 +++----
 src/components/structures/UserSettings.js    | 4 ++++
 src/components/views/messages/TextualBody.js | 4 +++-
 src/i18n/strings/en_EN.json                  | 1 +
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/HtmlUtils.js b/src/HtmlUtils.js
index 5620bc06df..b8a1c63dfb 100644
--- a/src/HtmlUtils.js
+++ b/src/HtmlUtils.js
@@ -385,10 +385,9 @@ class TextHighlighter extends BaseHighlighter {
      * highlights: optional list of words to highlight, ordered by longest word first
      *
      * opts.highlightLink: optional href to add to highlighted words
+     * opts.disableBigEmoji: optional argument to disable the big emoji class.
      */
-export function bodyToHtml(content, highlights, opts) {
-    opts = opts || {};
-
+export function bodyToHtml(content, highlights, opts={}) {
     const isHtml = (content.format === "org.matrix.custom.html");
     const body = isHtml ? content.formatted_body : escape(content.body);
 
@@ -418,7 +417,7 @@ export function bodyToHtml(content, highlights, opts) {
     }
 
     let emojiBody = false;
-    if (bodyHasEmoji) {
+    if (!opts.disableBigEmoji && bodyHasEmoji) {
         EMOJI_REGEX.lastIndex = 0;
         const contentBodyTrimmed = content.body !== undefined ? content.body.trim() : '';
         const match = EMOJI_REGEX.exec(contentBodyTrimmed);
diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index d83434f5a8..25960f5182 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -114,6 +114,10 @@ const SETTINGS_LABELS = [
         id: 'Pill.shouldHidePillAvatar',
         label: _td('Hide avatars in user and room mentions'),
     },
+    {
+        id: 'TextualBody.disableBigEmoji',
+        label: _td('Disable big emoji in chat'),
+    }
 /*
     {
         id: 'useFixedWidthFont',
diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index c0468c38c2..64b23238e5 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -354,7 +354,9 @@ module.exports = React.createClass({
         const mxEvent = this.props.mxEvent;
         const content = mxEvent.getContent();
 
-        let body = HtmlUtils.bodyToHtml(content, this.props.highlights, {});
+        let body = HtmlUtils.bodyToHtml(content, this.props.highlights, {
+            disableBigEmoji: UserSettingsStore.getSyncedSetting('TextualBody.disableBigEmoji', false),
+        });
 
         if (this.props.highlightLink) {
             body = <a href={this.props.highlightLink}>{ body }</a>;
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index ed07e503ce..6f46fd3257 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -289,6 +289,7 @@
     "matrix-react-sdk version:": "matrix-react-sdk version:",
     "Matrix Apps": "Matrix Apps",
     "Members only": "Members only",
+    "Disable big emoji in chat": "Disable big emoji in chat",
     "Disable Emoji suggestions while typing": "Disable Emoji suggestions while typing",
     "Message not sent due to unknown devices being present": "Message not sent due to unknown devices being present",
     "Missing room_id in request": "Missing room_id in request",

From c7c28c7ad2e7cbebf805216441d889a85f592bb6 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 14 Oct 2017 19:53:08 +0100
Subject: [PATCH 122/123] make linter happy

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/UserSettings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 25960f5182..7e8dbeff76 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -117,7 +117,7 @@ const SETTINGS_LABELS = [
     {
         id: 'TextualBody.disableBigEmoji',
         label: _td('Disable big emoji in chat'),
-    }
+    },
 /*
     {
         id: 'useFixedWidthFont',

From 8d6f0db3e2737a165a29043dfd0b85da15459761 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@arasphere.net>
Date: Sat, 14 Oct 2017 22:13:00 +0100
Subject: [PATCH 123/123] be explicit in remove button height

---
 src/components/structures/UserSettings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index d24ff5ad4c..3b147104e1 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -1324,7 +1324,7 @@ module.exports = React.createClass({
 
                     <div className="mx_UserSettings_avatarPicker">
                         <div className="mx_UserSettings_avatarPicker_remove" onClick={this.onAvatarRemoveClick}>
-                            <img src="img/cancel.svg" width="15"
+                            <img src="img/cancel.svg" width="15" height="15"
                                  alt={_t("Remove avatar")} title={_t("Remove avatar")} />
                         </div>
                         <div onClick={this.onAvatarPickerClick} className="mx_UserSettings_avatarPicker_imgContainer">